diff --git a/generated/org.hl7.security.ds4p.contentprofile/.classpath b/generated/org.hl7.security.ds4p.contentprofile/.classpath
index 55b215eec8..2035d8e135 100644
--- a/generated/org.hl7.security.ds4p.contentprofile/.classpath
+++ b/generated/org.hl7.security.ds4p.contentprofile/.classpath
@@ -2,5 +2,6 @@
 <classpath>
 	<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/generated/org.hl7.security.ds4p.contentprofile/.project b/generated/org.hl7.security.ds4p.contentprofile/.project
index 15bbf9636c..ec01256214 100644
--- a/generated/org.hl7.security.ds4p.contentprofile/.project
+++ b/generated/org.hl7.security.ds4p.contentprofile/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -25,10 +30,18 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/generated/org.hl7.security.ds4p.contentprofile/.settings/org.eclipse.jdt.core.prefs b/generated/org.hl7.security.ds4p.contentprofile/.settings/org.eclipse.jdt.core.prefs
index c17667ae9d..37a26a3ad3 100644
--- a/generated/org.hl7.security.ds4p.contentprofile/.settings/org.eclipse.jdt.core.prefs
+++ b/generated/org.hl7.security.ds4p.contentprofile/.settings/org.eclipse.jdt.core.prefs
@@ -85,6 +85,7 @@ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=36
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -92,16 +93,19 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=36
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=36
 org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=49
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=32
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -183,11 +187,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
 org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -217,6 +222,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -240,12 +247,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
 org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -291,6 +302,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -326,8 +339,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser
 org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -353,5 +369,9 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=false
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/generated/org.hl7.security.ds4p.contentprofile/.settings/org.eclipse.wst.common.component b/generated/org.hl7.security.ds4p.contentprofile/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000000..8e46cd5120
--- /dev/null
+++ b/generated/org.hl7.security.ds4p.contentprofile/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="org.hl7.security.ds4p.contentprofile">
+        <wb-resource deploy-path="/" source-path="/src"/>
+    </wb-module>
+</project-modules>
diff --git a/generated/org.hl7.security.ds4p.contentprofile/.settings/org.eclipse.wst.common.project.facet.core.xml b/generated/org.hl7.security.ds4p.contentprofile/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000000..1b22d705a5
--- /dev/null
+++ b/generated/org.hl7.security.ds4p.contentprofile/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.7"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/generated/org.hl7.security.ds4p.contentprofile/src/META-INF/MANIFEST.MF b/generated/org.hl7.security.ds4p.contentprofile/src/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..5e9495128c
--- /dev/null
+++ b/generated/org.hl7.security.ds4p.contentprofile/src/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol.ecore b/generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol.ecore
index 4f54c05b4f..9c28415f4e 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol.ecore
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol.ecore
@@ -106315,7 +106315,7 @@
     </eOperations>
     <eOperations name="LotOrBatchNumberObservationValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/1.1.0/GenModel">
-        <details key="body" value="(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::ST)))"/>
+        <details key="body" value="(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::ED)))"/>
       </eAnnotations>
       <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">
         <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol_Ecore.uml b/generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol_Ecore.uml
index 36d5c48e02..77e10f26b5 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol_Ecore.uml
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/model/consol_Ecore.uml
@@ -44,404 +44,404 @@ CDA R2 states that LOINC is the preferred vocabulary for document type codes, wh
           <body>not self.versionNumber.oclIsUndefined() implies not self.setId.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pZ6XYF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pZ6XYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_BvMS8H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_BvM6AH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pZ-o0F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRealmCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pZ-o0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_BvUOwH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRealmCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_BvUOwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.realmCode->isEmpty() or self.realmCode->exists(element | element.isNullFlavorUndefined())) implies (self.realmCode->size() = 1 and self.realmCode->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = element.oclAsType(datatypes::CS) in 
 value.code = 'US'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_paBFEF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsTypeId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_paBFEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_BvX5IH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsTypeId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_BvX5IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.typeId.oclIsUndefined() or self.typeId.isNullFlavorUndefined()) implies (not self.typeId.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_paCTMF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_paCTMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_BvZuUH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_BvZuUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id.oclIsUndefined() or self.id.isNullFlavorUndefined()) implies (not self.id.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_paF9kF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_paF9kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_BvcKkH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_BvcKkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_paHywF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsTitle" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_paHywV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Bvd_wH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsTitle" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Bvd_wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_paJA4F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsEffectiveTime" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_paJA4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Bvf08H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsEffectiveTime" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Bvf08X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pawE4F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsConfidentialityCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pawE4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_BwLKYH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsConfidentialityCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_BwLKYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.confidentialityCode.oclIsUndefined() or self.confidentialityCode.isNullFlavorUndefined()) implies (not self.confidentialityCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_paKPAF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsConfidentialityCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_paKPAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_BviRMH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsConfidentialityCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_BviRMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.confidentialityCode.oclIsUndefined() or self.confidentialityCode.isNullFlavorUndefined()) implies (not self.confidentialityCode.oclIsUndefined() and self.confidentialityCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.confidentialityCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.25' and (value.code = 'N' or value.code = 'R' or value.code = 'V'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pbUsoF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLanguageCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pbVTsF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Bw48EH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLanguageCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Bw48EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.languageCode.oclIsUndefined() or self.languageCode.isNullFlavorUndefined()) implies (not self.languageCode.oclIsUndefined() and self.languageCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.languageCode.oclAsType(datatypes::CS) in 
 not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pb2REF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLanguageCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pb2REV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_BxZSYH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLanguageCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_BxZSYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.languageCode.oclIsUndefined() or self.languageCode.isNullFlavorUndefined()) implies (not self.languageCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pcYckF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsSetId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pcYckV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Bx3zgH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsSetId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Bx3zgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.setId.oclIsUndefined() or self.setId.isNullFlavorUndefined()) implies (not self.setId.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pcaRwF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsVersionNumber" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pcaRwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Bx5osH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsVersionNumber" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Bx5osX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.versionNumber.oclIsUndefined() or self.versionNumber.isNullFlavorUndefined()) implies (not self.versionNumber.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ptlhUF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthor" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ptlhUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CDBN4H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthor" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CDB08H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(cda::Author))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_puGesF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEnterer" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_puGesV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CDd50H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEnterer" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CDd50X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->one(dataEnterer : cda::DataEnterer | not dataEnterer.oclIsUndefined() and dataEnterer.oclIsKindOf(cda::DataEnterer))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_puoDIF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodian" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_puoDIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CD-3MH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodian" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CD-3MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->one(custodian : cda::Custodian | not custodian.oclIsUndefined() and custodian.oclIsKindOf(cda::Custodian))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pvJAgF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformationRecipient" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pvJAgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CEcKMH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformationRecipient" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CEcKMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->exists(informationRecipient : cda::InformationRecipient | not informationRecipient.oclIsUndefined() and informationRecipient.oclIsKindOf(cda::InformationRecipient))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pvp94F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticator" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pvp94V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CE5dMH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticator" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CE5dMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->one(legalAuthenticator : cda::LegalAuthenticator | not legalAuthenticator.oclIsUndefined() and legalAuthenticator.oclIsKindOf(cda::LegalAuthenticator))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pwK7QF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticator" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pwK7QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CFViEH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticator" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CFViEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->exists(authenticator : cda::Authenticator | not authenticator.oclIsUndefined() and authenticator.oclIsKindOf(cda::Authenticator))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pwr4oF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTarget" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pwr4oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CF47sH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTarget" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CF47sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->exists(recordTarget : cda::RecordTarget | not recordTarget.oclIsUndefined() and recordTarget.oclIsKindOf(cda::RecordTarget))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pxM2AF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsComponentOf" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pxM2AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CGZ5EH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsComponentOf" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CGZ5EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->one(componentOf : cda::Component1 | not componentOf.oclIsUndefined() and componentOf.oclIsKindOf(cda::Component1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rv9owF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformant" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rv9owV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dyg1kn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformant" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dyg1k33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->exists(informant : cda::Informant12 | not informant.oclIsUndefined() and informant.oclIsKindOf(cda::Informant12))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rymtEF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsSupportParticipant" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rymtEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D0qKoX3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsSupportParticipant" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D0qKon3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->select(participant : cda::Participant1 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant1))->select(typeCode = vocab::ParticipationType::IND)->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rzHDYF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInFulfillmentOf" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rzHDYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D1EaUH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInFulfillmentOf" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D1EaUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->exists(inFulfillmentOf : cda::InFulfillmentOf | not inFulfillmentOf.oclIsUndefined() and inFulfillmentOf.oclIsKindOf(cda::InFulfillmentOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_u3SmEF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOf" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_u3SmEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GXKjoH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOf" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GXKjoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->exists(documentationOf : cda::DocumentationOf | not documentationOf.oclIsUndefined() and documentationOf.oclIsKindOf(cda::DocumentationOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_u5UmYF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorization" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_u5UmYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GYziYH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorization" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GYziYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->exists(authorization : cda::Authorization | not authorization.oclIsUndefined() and authorization.oclIsKindOf(cda::Authorization))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5H8WgF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheDayTS" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5H8WgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PP-XYH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheDayTS" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PP-XYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies (not value.oclIsUndefined() and value.size() >= 8))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5H89kF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheMinuteTS" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5H89kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PP-XYn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheMinuteTS" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PP-XY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies (not value.oclIsUndefined() and value.size() >= 12))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5H89kl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheSecondTS" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5H89k19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PP-XZH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheSecondTS" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PP-XZX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies (not value.oclIsUndefined() and value.size() >= 14))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5H89lF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsUSRealmDateAndTimeDTMIfMorePreciseThanDayIncludeTimeZoneOffsetTS" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5H89lV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PP--cH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsUSRealmDateAndTimeDTMIfMorePreciseThanDayIncludeTimeZoneOffsetTS" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PP--cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject(not value.oclIsUndefined() and value.size() > 8 implies value.size() >= 15)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5I-RQF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5I-RQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PQzd0H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PQzd0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ( streetAddressLine->size() >=1 and streetAddressLine->size() &lt;=4))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5I-4UF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5I-4UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PQ0E4H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PQ0E4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies state->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5I-4Ul9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5I-4U19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PQ0r8H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PQ0r8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies postalCode->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5I_fYF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5I_fYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PQ0r8n3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PQ0r833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::PostalAddressUse) and 
 let value : vocab::PostalAddressUse = element.oclAsType(vocab::PostalAddressUse) in 
 value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or value = vocab::PostalAddressUse::H or value = vocab::PostalAddressUse::HP or value = vocab::PostalAddressUse::HV or value = vocab::PostalAddressUse::PHYS or value = vocab::PostalAddressUse::PST or value = vocab::PostalAddressUse::PUB or value = vocab::PostalAddressUse::TMP or value = vocab::PostalAddressUse::WP) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5JAGcF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5JAGcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PQ1TAH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PQ1TAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5JAGcl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5JAGc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PQ1TAn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PQ1TA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((country->isEmpty() or country->exists(element | element.isNullFlavorUndefined())) implies (( not country->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5JAtgF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5JAtgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PQ16EH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PQ16EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((state->isEmpty() or state->exists(element | element.isNullFlavorUndefined())) implies (( not state->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5JAtgl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5JAtg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PQ2hIH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PQ2hIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((city->isEmpty() or city->exists(element | element.isNullFlavorUndefined())) implies (city->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5JBUkF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5JBUkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PQ2hIn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PQ2hI33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((postalCode->isEmpty() or postalCode->exists(element | element.isNullFlavorUndefined())) implies (( not postalCode->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5JB7oF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5JB7oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PQ3IMH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PQ3IMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((streetAddressLine->isEmpty() or streetAddressLine->exists(element | element.isNullFlavorUndefined())) implies (( not streetAddressLine->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5JCisF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleTELUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5JCisV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PQ3vQH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleTELUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PQ3vQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).telecom->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5JkHIF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameUSRealmPatientNameMixedContent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5JkHIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PRT0IH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameUSRealmPatientNameMixedContent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PRT0IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject(getText(true)='')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5JkuMF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5JkuMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PRT0In3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PRT0I33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::EntityNameUse) and 
 let value : vocab::EntityNameUse = element.oclAsType(vocab::EntityNameUse) in 
 value = vocab::EntityNameUse::A or value = vocab::EntityNameUse::ABC or value = vocab::EntityNameUse::ASGN or value = vocab::EntityNameUse::C or value = vocab::EntityNameUse::I or value = vocab::EntityNameUse::IDE or value = vocab::EntityNameUse::L or value = vocab::EntityNameUse::P or value = vocab::EntityNameUse::PHON or value = vocab::EntityNameUse::R or value = vocab::EntityNameUse::SNDX or value = vocab::EntityNameUse::SRCH or value = vocab::EntityNameUse::SYL) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5JkuMl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5JkuM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PRUbMH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PRUbMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5JlVQF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameFamily" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5JlVQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PRUbMn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameFamily" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PRUbM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((family->isEmpty() or family->exists(element | element.isNullFlavorUndefined())) implies (family->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5JlVQl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameGiven" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5JlVQ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PRVCQH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameGiven" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PRVCQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((given->isEmpty() or given->exists(element | element.isNullFlavorUndefined())) implies (( not given->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Jl8UF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNamePrefix" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Jl8UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PRVCQn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNamePrefix" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PRVCQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((prefix->isEmpty() or prefix->exists(element | element.isNullFlavorUndefined())) implies (not prefix->isEmpty()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Jl8Ul9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameSuffix" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Jl8U19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PRVpUH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameSuffix" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PRVpUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((suffix->isEmpty() or suffix->exists(element | element.isNullFlavorUndefined())) implies (( not suffix->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5JnKcF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToYear" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5JnKcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PRWQYH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToYear" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PRWQYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).birthTime->excluding(null)->select(isNullFlavorUndefined())->reject(not value.oclIsUndefined() and value.size() >= 4)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5JnxgF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToDay" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5JnxgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PRW3cH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToDay" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PRW3cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).birthTime->excluding(null)->select(isNullFlavorUndefined())->reject(not value.oclIsUndefined() and value.size() >= 8)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Jnxgl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientTSValue" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Jnxg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PRW3cn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientTSValue" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PRW3c33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).birthTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not value.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5KJ9AF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5KJ9AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PRy8UH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PRy8UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ( streetAddressLine->size() >=1 and streetAddressLine->size() &lt;=4))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5KJ9Al9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5KJ9A19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PRy8Un3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PRy8U33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies state->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5KKkEF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5KKkEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PRzjYH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PRzjYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies postalCode->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5KKkEl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5KLLIF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PR0KcH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PR0KcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::PostalAddressUse) and 
 let value : vocab::PostalAddressUse = element.oclAsType(vocab::PostalAddressUse) in 
 value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or value = vocab::PostalAddressUse::H or value = vocab::PostalAddressUse::HP or value = vocab::PostalAddressUse::HV or value = vocab::PostalAddressUse::PHYS or value = vocab::PostalAddressUse::PST or value = vocab::PostalAddressUse::PUB or value = vocab::PostalAddressUse::TMP or value = vocab::PostalAddressUse::WP) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5KLLIV9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5KLLIl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PR0Kcn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PR0xgH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5KLyMF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5KLyMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PR0xgX3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PR0xgn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((country->isEmpty() or country->exists(element | element.isNullFlavorUndefined())) implies (( not country->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5KLyMl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5KLyM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PR1YkH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PR1YkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((state->isEmpty() or state->exists(element | element.isNullFlavorUndefined())) implies (( not state->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5KMZQF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5KMZQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PR1Ykn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PR1Yk33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((city->isEmpty() or city->exists(element | element.isNullFlavorUndefined())) implies (city->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5KNAUF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5KNAUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PR1_oH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PR1_oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((postalCode->isEmpty() or postalCode->exists(element | element.isNullFlavorUndefined())) implies (( not postalCode->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5KNnYF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5KNnYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PR2msH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PR2msX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((streetAddressLine->isEmpty() or streetAddressLine->exists(element | element.isNullFlavorUndefined())) implies (( not streetAddressLine->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5KOOcF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTELUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5KOOcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PR3NwH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTELUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PR3NwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null).telecom->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5KxBAF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5KxoEF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PSTSoH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PSTSoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null).guardianPerson->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject((getText(true)&lt;>'' and ( family->isEmpty() and given->isEmpty() and suffix->isEmpty() and prefix->isEmpty()   )   ) xor (getText(true)='' and (not family->isEmpty() and not given->isEmpty()  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5KxoEV9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianPersonName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5KxoEl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PSTSon3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianPersonName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PSTSo33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null).guardianPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5KyPIF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCodeFromPersonalRelationshipOrResponsibleParty" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5KyPIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PSTSpH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCodeFromPersonalRelationshipOrResponsibleParty" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PSTSpX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null)->reject((not code.oclIsUndefined()) and code.isNullFlavorUndefined() implies&#xD;
 (code.oclIsKindOf(datatypes::CE) and &#xD;
@@ -449,1436 +449,1436 @@ let value : datatypes::CE = code.oclAsType(datatypes::CE) in &#xD;
 value.codeSystem = '2.16.840.1.113883.5.111' and (value.code = 'ADOPT' or value.code = 'AUNT' or value.code = 'CHILD' or value.code = 'CHLDINLAW' or value.code = 'COUSN' or value.code = 'DOMPART' or value.code = 'FAMMEMB' or value.code = 'CHLDFOST' or value.code = 'GRNDCHILD' or value.code = 'GPARNT' or value.code = 'GRPRN' or value.code = 'GGRPRN' or value.code = 'HSIB' or value.code = 'MAUNT' or value.code = 'MCOUSN' or value.code = 'MGRPRN' or value.code = 'MGGRPRN' or value.code = 'MUNCLE' or value.code = 'NCHILD' or value.code = 'NPRN' or value.code = 'NSIB' or value.code = 'NBOR' or value.code = 'NIENEPH' or value.code = 'PRN' or value.code = 'PRNINLAW' or value.code = 'PAUNT' or value.code = 'PCOUSN' or value.code = 'PGRPRN' or value.code = 'PGGRPRN' or value.code = 'PUNCLE' or value.code = 'ROOM' or value.code = 'SIB' or value.code = 'SIBINLAW' or value.code = 'SIGOTHR' or value.code = 'SPS' or value.code = 'STEP' or value.code = 'STPPRN' or value.code = 'STPSIB' or value.code = 'UNCLE' or value.code = 'FRND' or value.code = 'RESPRSN' or value.code = 'EXCEST' or value.code = 'GUADLTM' or value.code = 'GUARD' or value.code = 'POWATT' or value.code = 'DPOWATT' or value.code = 'HPOWATT' or value.code = 'SPOWATT')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5KyPIl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5KyPI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PST5sH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PST5sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Ky2MF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Ky2MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PST5sn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PST5s33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (not addr->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Ky2Ml9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTelecom" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Ky2M19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PST5tH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTelecom" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PST5tX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (not telecom->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5KzdQF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGuardianPerson" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5KzdQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PSUgwH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGuardianPerson" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PSUgwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null)->reject(guardianPerson->one(guardianPerson : cda::Person | not guardianPerson.oclIsUndefined() and guardianPerson.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5L1_EF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlaceHasState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5L1_EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTN4oH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlaceHasState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTN4oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).birthplace->excluding(null).place->excluding(null)->reject((addr.country->exists(curCountry | not curCountry.oclIsUndefined() and curCountry.getText() = 'US')) implies (addr.state->size() = 1) and ((addr.state->exists(curState | (curState.getText() = 'AL' or curState.getText() = 'AK' or curState.getText() = 'AS' or curState.getText() = 'AZ' or curState.getText() = 'AR' or curState.getText() = 'CA' or curState.getText() = 'CO' or curState.getText() = 'CT' or curState.getText() = 'DE' or curState.getText() = 'DC' or curState.getText() = 'FL' or curState.getText() = 'FM' or curState.getText() = 'GA' or curState.getText() = 'GU' or curState.getText() = 'HI' or curState.getText() = 'ID' or curState.getText() = 'IL' or curState.getText() = 'IN' or curState.getText() = 'IA' or curState.getText() = 'KS' or curState.getText() = 'KY' or curState.getText() = 'LA' or curState.getText() = 'ME' or curState.getText() = 'MH' or curState.getText() = 'MD' or curState.getText() = 'MA' or curState.getText() = 'MI' or curState.getText() = 'MN' or curState.getText() = 'MS' or curState.getText() = 'MO' or curState.getText() = 'MT' or curState.getText() = 'NE' or curState.getText() = 'NV' or curState.getText() = 'NH' or curState.getText() = 'NJ' or curState.getText() = 'NM' or curState.getText() = 'NY' or curState.getText() = 'NC' or curState.getText() = 'ND' or curState.getText() = 'MP' or curState.getText() = 'OH' or curState.getText() = 'OK' or curState.getText() = 'OR' or curState.getText() = 'PW' or curState.getText() = 'PA' or curState.getText() = 'PR' or curState.getText() = 'RI' or curState.getText() = 'SC' or curState.getText() = 'SD' or curState.getText() = 'TN' or curState.getText() = 'TX' or curState.getText() = 'UM' or curState.getText() = 'UT' or curState.getText() = 'VT' or curState.getText() = 'VA' or curState.getText() = 'VI' or curState.getText() = 'WA' or curState.getText() = 'WV' or curState.getText() = 'WI' or curState.getText() = 'WY' ))) or (addr.state->exists(curState | curState.isNullFlavorDefined()))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5L1_El9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlaceAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5L1_E19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTN4on3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlaceAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTN4o33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).birthplace->excluding(null).place->excluding(null)->reject((addr.oclIsUndefined() or addr.isNullFlavorUndefined()) implies (not addr.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5L2mIF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlace" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5L2mIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTN4pH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlace" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTN4pX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).birthplace->excluding(null)->reject(place->one(place : cda::Place | not place.oclIsUndefined() and place.oclIsKindOf(cda::Place)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5MXjgF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5MXjgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTovYH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTpWcH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).languageCommunication->excluding(null)->reject((languageCode.oclIsUndefined() or languageCode.isNullFlavorUndefined()) implies (not languageCode.oclIsUndefined() and languageCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = languageCode.oclAsType(datatypes::CS) in 
 not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5MYKkF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5MYKkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTpWcX3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTpWcn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).languageCommunication->excluding(null)->reject((languageCode.oclIsUndefined() or languageCode.isNullFlavorUndefined()) implies (not languageCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5MYxoF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationModeCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5MYxoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTpWc33sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationModeCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTpWdH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).languageCommunication->excluding(null)->reject((modeCode.oclIsUndefined() or modeCode.isNullFlavorUndefined()) implies (not modeCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5MYxol9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationModeCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5MYxo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTp9gH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationModeCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTp9gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).languageCommunication->excluding(null)->reject((modeCode.oclIsUndefined() or modeCode.isNullFlavorUndefined()) implies (not modeCode.oclIsUndefined() and modeCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = modeCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.60' and (value.code = 'ESGN' or value.code = 'ESP' or value.code = 'EWR' or value.code = 'RSGN' or value.code = 'RSP' or value.code = 'RWR')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5MZYsF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationProficiencyLevelCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5MZYsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTp9gn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationProficiencyLevelCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTp9g33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).languageCommunication->excluding(null)->reject((proficiencyLevelCode.oclIsUndefined() or proficiencyLevelCode.isNullFlavorUndefined()) implies (not proficiencyLevelCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5MZYsl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationProficiencyLevelCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5MZYs19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTqkkH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationProficiencyLevelCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTqkkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).languageCommunication->excluding(null)->reject((proficiencyLevelCode.oclIsUndefined() or proficiencyLevelCode.isNullFlavorUndefined()) implies (not proficiencyLevelCode.oclIsUndefined() and proficiencyLevelCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = proficiencyLevelCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.61' and (value.code = 'E' or value.code = 'F' or value.code = 'G' or value.code = 'P')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5MZ_wF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationPreferenceInd" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5MZ_wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTqkkn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationPreferenceInd" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTqkk33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).languageCommunication->excluding(null)->reject((preferenceInd.oclIsUndefined() or preferenceInd.isNullFlavorUndefined()) implies (not preferenceInd.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5MZ_wl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientIfSdtcEnforceRaceCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5MZ_w19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTqklH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientIfSdtcEnforceRaceCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTqklX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject(sDTCRaceCode->notEmpty() implies not raceCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Mam0F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Mam0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTrLoH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTrLoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Mam0l9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientAdministrativeGenderCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Mam019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTrLon3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientAdministrativeGenderCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTrLo33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((administrativeGenderCode.oclIsUndefined() or administrativeGenderCode.isNullFlavorUndefined()) implies (not administrativeGenderCode.oclIsUndefined() and administrativeGenderCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = administrativeGenderCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.1' and (value.code = 'F' or value.code = 'M' or value.code = 'UN')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Mam1F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthTime" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5MbN4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTrysH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthTime" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTrysX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((birthTime.oclIsUndefined() or birthTime.isNullFlavorUndefined()) implies (not birthTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5MbN4V9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientMaritalStatusCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5MbN4l9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTrysn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientMaritalStatusCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTrys33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((maritalStatusCode.oclIsUndefined() or maritalStatusCode.isNullFlavorUndefined()) implies (not maritalStatusCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5MbN419xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientMaritalStatusCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Mb08F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTrytH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientMaritalStatusCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTrytX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((maritalStatusCode.oclIsUndefined() or maritalStatusCode.isNullFlavorUndefined()) implies (not maritalStatusCode.oclIsUndefined() and maritalStatusCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = maritalStatusCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.2' and (value.code = 'A' or value.code = 'D' or value.code = 'I' or value.code = 'L' or value.code = 'M' or value.code = 'P' or value.code = 'S' or value.code = 'T' or value.code = 'W' or value.code = 'C' or value.code = 'U')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Mb08V9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientReligiousAffiliationCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Mb08l9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTsZwH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientReligiousAffiliationCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTsZwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((religiousAffiliationCode.oclIsUndefined() or religiousAffiliationCode.isNullFlavorUndefined()) implies (not religiousAffiliationCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5MccAF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientReligiousAffiliationCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5MccAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTsZwn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientReligiousAffiliationCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTsZw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((religiousAffiliationCode.oclIsUndefined() or religiousAffiliationCode.isNullFlavorUndefined()) implies (not religiousAffiliationCode.oclIsUndefined() and religiousAffiliationCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = religiousAffiliationCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.1076' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5MccAl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5MccA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTtA0H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTtA0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((raceCode.oclIsUndefined() or raceCode.isNullFlavorUndefined()) implies (not raceCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5MccBF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5MdDEF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTtA0n3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTtA033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((raceCode.oclIsUndefined() or raceCode.isNullFlavorUndefined()) implies (not raceCode.oclIsUndefined() and raceCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = raceCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.238' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5MdDEV9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientSDTCRaceCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5MdDEl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTtn4H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientSDTCRaceCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTtn4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((sDTCRaceCode->isEmpty() or sDTCRaceCode->exists(element | element.isNullFlavorUndefined())) implies (not sDTCRaceCode->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5MdDE19xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientSDTCRaceCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5MdqIF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTtn4n3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientSDTCRaceCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTtn433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((sDTCRaceCode->isEmpty() or sDTCRaceCode->exists(element | element.isNullFlavorUndefined())) implies (sDTCRaceCode->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = element.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.238' and not value.code.oclIsUndefined())))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5MdqIV9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5MdqIl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTtn5H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTtn5X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((ethnicGroupCode.oclIsUndefined() or ethnicGroupCode.isNullFlavorUndefined()) implies (not ethnicGroupCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5MeRMF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5MeRMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTuO8H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTuO8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((ethnicGroupCode.oclIsUndefined() or ethnicGroupCode.isNullFlavorUndefined()) implies (not ethnicGroupCode.oclIsUndefined() and ethnicGroupCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = ethnicGroupCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.238' and (value.code = '2135-2' or value.code = '2186-5')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5MeRMl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardian" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5MeRM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTuO8n3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardian" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTuO833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject(guardian->exists(guardian : cda::Guardian | not guardian.oclIsUndefined() and guardian.oclIsKindOf(cda::Guardian)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Me4QF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplace" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Me4QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTuO9H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplace" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTuO9X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject(birthplace->one(birthplace : cda::Birthplace | not birthplace.oclIsUndefined() and birthplace.oclIsKindOf(cda::Birthplace)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Me4Ql9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunication" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Me4Q19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PTu2AH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunication" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PTu2AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject(languageCommunication->exists(languageCommunication : cda::LanguageCommunication | not languageCommunication.oclIsUndefined() and languageCommunication.oclIsKindOf(cda::LanguageCommunication)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NBDwF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationTELUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NBq0F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUJswH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationTELUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUJswX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).providerOrganization->excluding(null).telecom->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NCR4F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NCR4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUKT0H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUKT0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).providerOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ( streetAddressLine->size() >=1 and streetAddressLine->size() &lt;=4))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NC48F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NC48V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUK64H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUK64X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).providerOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies state->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NDgAF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NDgAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUK64n3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUK6433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).providerOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies postalCode->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NEHEF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NEHEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PULh8H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PULh8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).providerOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::PostalAddressUse) and 
 let value : vocab::PostalAddressUse = element.oclAsType(vocab::PostalAddressUse) in 
 value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or value = vocab::PostalAddressUse::H or value = vocab::PostalAddressUse::HP or value = vocab::PostalAddressUse::HV or value = vocab::PostalAddressUse::PHYS or value = vocab::PostalAddressUse::PST or value = vocab::PostalAddressUse::PUB or value = vocab::PostalAddressUse::TMP or value = vocab::PostalAddressUse::WP) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NEHEl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NEHE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUMJAH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUMJAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).providerOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NEuIF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NEuIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUMJAn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUMJA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).providerOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((country->isEmpty() or country->exists(element | element.isNullFlavorUndefined())) implies (( not country->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NFVMF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NFVMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUMwEH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUMwEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).providerOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((state->isEmpty() or state->exists(element | element.isNullFlavorUndefined())) implies (( not state->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NF8QF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NF8QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUMwEn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUMwE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).providerOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((city->isEmpty() or city->exists(element | element.isNullFlavorUndefined())) implies (city->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NF8Ql9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NF8Q19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUNXIH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUNXIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).providerOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((postalCode->isEmpty() or postalCode->exists(element | element.isNullFlavorUndefined())) implies (( not postalCode->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NGjUF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NGjUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUNXIn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUNXI33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).providerOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((streetAddressLine->isEmpty() or streetAddressLine->exists(element | element.isNullFlavorUndefined())) implies (( not streetAddressLine->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NHKYF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationHasNationalProviderIdentifier" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NHKYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUN-MH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationHasNationalProviderIdentifier" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUN-MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).providerOrganization->excluding(null)->reject(id->exists( root='2.16.840.1.113883.4.6' ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NHKYl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NHKY19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUN-Mn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUN-M33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).providerOrganization->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NHxcF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NHxcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUOlQH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUOlQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).providerOrganization->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NHxcl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationTelecom" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NIYgF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUOlQn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationTelecom" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUOlQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).providerOrganization->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NIYgV9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NIYgl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUPMUH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUPMUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).providerOrganization->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (( not addr->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NI_kF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NI_kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUPMUn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUPMU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NI_kl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NI_k19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUPzYH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUPzYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (( not addr->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NJmoF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleTelecom" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NJmoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUPzYn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleTelecom" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUPzY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NJmol9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatient" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NJmo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUQacH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatient" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUQacX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null)->reject(patient->one(patient : cda::Patient | not patient.oclIsUndefined() and patient.oclIsKindOf(cda::Patient)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NKNsF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganization" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NKNsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PUQacn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganization" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PUQac33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null)->reject(providerOrganization->one(providerOrganization : cda::Organization | not providerOrganization.oclIsUndefined() and providerOrganization.oclIsKindOf(cda::Organization)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5NKNsl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRole" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5NKNs19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PURBgH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRole" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PURBgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null)->reject(patientRole->one(patientRole : cda::PatientRole | not patientRole.oclIsUndefined() and patientRole.oclIsKindOf(cda::PatientRole)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Oax8F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsComponentOfEncompassingEncounterId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Oax8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PVH9IH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsComponentOfEncompassingEncounterId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PVH9IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ObZAF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsComponentOfEncompassingEncounterEffectiveTime" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ObZAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PVIkMH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsComponentOfEncompassingEncounterEffectiveTime" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PVIkMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ObZAl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsComponentOfEncompassingEncounter" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ObZA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PVIkMn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsComponentOfEncompassingEncounter" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PVIkM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null)->reject(encompassingEncounter->one(encompassingEncounter : cda::EncompassingEncounter | not encompassingEncounter.oclIsUndefined() and encompassingEncounter.oclIsKindOf(cda::EncompassingEncounter)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5O-yoF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorGeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheDayTS" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5O-yoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PVlQIH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorGeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheDayTS" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PVlQIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).time->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies (not value.oclIsUndefined() and value.size() >= 8))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5O-yol9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorGeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheMinuteTS" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5O_ZsF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PVl3MH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorGeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheMinuteTS" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PVl3MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).time->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies (not value.oclIsUndefined() and value.size() >= 12))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5O_ZsV9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorGeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheSecondTS" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5O_Zsl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PVl3Mn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorGeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheSecondTS" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PVl3M33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).time->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies (not value.oclIsUndefined() and value.size() >= 14))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5PAAwF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorGeneralHeaderConstraintsUSRealmDateAndTimeDTMIfMorePreciseThanDayIncludeTimeZoneOffsetTS" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5PAAwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PVmeQH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorGeneralHeaderConstraintsUSRealmDateAndTimeDTMIfMorePreciseThanDayIncludeTimeZoneOffsetTS" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PVmeQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).time->excluding(null)->select(isNullFlavorUndefined())->reject(not value.oclIsUndefined() and value.size() > 8 implies value.size() >= 15)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Pg-IF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Pg-IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PWDKMH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PWDKMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ( streetAddressLine->size() >=1 and streetAddressLine->size() &lt;=4))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5PhlMF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5PhlMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PWDxQH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PWDxQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies state->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5PiMQF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5PiMQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PWDxQn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PWDxQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies postalCode->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5PiMQl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5PizUF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PWEYUH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PWEYUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::PostalAddressUse) and 
 let value : vocab::PostalAddressUse = element.oclAsType(vocab::PostalAddressUse) in 
 value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or value = vocab::PostalAddressUse::H or value = vocab::PostalAddressUse::HP or value = vocab::PostalAddressUse::HV or value = vocab::PostalAddressUse::PHYS or value = vocab::PostalAddressUse::PST or value = vocab::PostalAddressUse::PUB or value = vocab::PostalAddressUse::TMP or value = vocab::PostalAddressUse::WP) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5PjaYF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5PkBcF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PWE_YH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PWE_YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5PkBcV9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5PkBcl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PWFmcH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PWFmcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((country->isEmpty() or country->exists(element | element.isNullFlavorUndefined())) implies (( not country->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5PkogF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5PkogV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PWFmcn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PWFmc33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((state->isEmpty() or state->exists(element | element.isNullFlavorUndefined())) implies (( not state->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5PlPkF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5PlPkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PWGNgH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PWGNgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((city->isEmpty() or city->exists(element | element.isNullFlavorUndefined())) implies (city->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Pl2oF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Pl2oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PWG0kH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PWG0kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((postalCode->isEmpty() or postalCode->exists(element | element.isNullFlavorUndefined())) implies (( not postalCode->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Pl2ol9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Pl2o19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PWG0kn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PWG0k33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((streetAddressLine->isEmpty() or streetAddressLine->exists(element | element.isNullFlavorUndefined())) implies (( not streetAddressLine->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5PnEwF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorTELUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5PnEwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PWICsH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorTELUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PWICsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null).telecom->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5QLsgF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorAuthoringDeviceManufacturerModelName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5QLsgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PWjggH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorAuthoringDeviceManufacturerModelName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PWjggX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null).assignedAuthoringDevice->excluding(null)->reject((manufacturerModelName.oclIsUndefined() or manufacturerModelName.isNullFlavorUndefined()) implies (not manufacturerModelName.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5QMTkF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorAuthoringDeviceSoftwareName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5QMTkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PWkHkH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorAuthoringDeviceSoftwareName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PWkHkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null).assignedAuthoringDevice->excluding(null)->reject((softwareName.oclIsUndefined() or softwareName.isNullFlavorUndefined()) implies (not softwareName.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5QzXkF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5QzXkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PXDPwH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PXDPwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null).assignedPerson->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject((getText(true)&lt;>'' and ( family->isEmpty() and given->isEmpty() and suffix->isEmpty() and prefix->isEmpty()   )   ) xor (getText(true)='' and (not family->isEmpty() and not given->isEmpty()  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5QzXkl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorPersonName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5QzXk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PXD20H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorPersonName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PXD20X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null).assignedPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Qz-oF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorHasOneAssignedPersonOrOneAssignedAuthoringDevice" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Qz-oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PXD20n3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorHasOneAssignedPersonOrOneAssignedAuthoringDevice" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PXD2033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject(assignedPerson->one(element | not element.oclIsUndefined() implies (element.isNullFlavorDefined() or element->size() = 1) ) xor assignedAuthoringDevice->one(element | not element.oclIsUndefined() implies (element.isNullFlavorDefined() or element->size() = 1) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Qz-ol9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorHasNationalProviderIdentifier" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Qz-o19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PXEd4H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorHasNationalProviderIdentifier" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PXEd4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject((not assignedPerson.oclIsUndefined() and not id->isEmpty()) implies id->exists(id | (id.isNullFlavorDefined() and id.extension->isEmpty() and id.root->isEmpty()) or (id.isNullFlavorDefined() and id.root='2.16.840.1.113883.4.6') or (id.root='2.16.840.1.113883.4.6' and id.extension->size() = 1)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Q0lsF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Q0lsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PXEd4n3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PXEd433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Q1MwF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Q1MwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PXFE8H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PXFE8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Q1Mwl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Q1Mw19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PXFE8n3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PXFE833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Q1z0F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Q1z0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PXFsAH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PXFsAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (( not addr->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Q1z0l9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorTelecom" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Q1z019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PXFsAn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorTelecom" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PXFsA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Q2a4F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorTime" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Q2a4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PXGTEH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorTime" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PXGTEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null)->reject((time.oclIsUndefined() or time.isNullFlavorUndefined()) implies (not time.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Q2a4l9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthor" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Q2a419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PXGTEn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthor" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PXGTE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null)->reject(assignedAuthor->one(assignedAuthor : cda::AssignedAuthor | not assignedAuthor.oclIsUndefined() and assignedAuthor.oclIsKindOf(cda::AssignedAuthor)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5R48sF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5R5jwF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PX6ycH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PX6ycX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ( streetAddressLine->size() >=1 and streetAddressLine->size() &lt;=4))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5R5jwV9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5R5jwl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PX7ZgH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PX7ZgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies state->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5R6K0F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5R6K0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PX8AkH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PX8AkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies postalCode->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5R6x4F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5R6x4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PX8Akn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PX8Ak33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::PostalAddressUse) and 
 let value : vocab::PostalAddressUse = element.oclAsType(vocab::PostalAddressUse) in 
 value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or value = vocab::PostalAddressUse::H or value = vocab::PostalAddressUse::HP or value = vocab::PostalAddressUse::HV or value = vocab::PostalAddressUse::PHYS or value = vocab::PostalAddressUse::PST or value = vocab::PostalAddressUse::PUB or value = vocab::PostalAddressUse::TMP or value = vocab::PostalAddressUse::WP) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5R7Y8F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5R7Y8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PX8noH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PX8noX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5R8AAF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5R8AAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PX8non3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PX8no33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((country->isEmpty() or country->exists(element | element.isNullFlavorUndefined())) implies (( not country->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5R8nEF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5R8nEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PX9OsH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PX9OsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((state->isEmpty() or state->exists(element | element.isNullFlavorUndefined())) implies (( not state->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5R9OIF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5R9OIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PX91wH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PX91wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((city->isEmpty() or city->exists(element | element.isNullFlavorUndefined())) implies (city->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5R91MF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5R91MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PX91wn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PX91w33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((postalCode->isEmpty() or postalCode->exists(element | element.isNullFlavorUndefined())) implies (( not postalCode->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5R91Ml9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5R91M19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PX-c0H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PX-c0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((streetAddressLine->isEmpty() or streetAddressLine->exists(element | element.isNullFlavorUndefined())) implies (( not streetAddressLine->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5R_qYF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityTELUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5R_qYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PX_D4H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityTELUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PX_D4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null).telecom->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5SjEAF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5SjEAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PYYsgH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PYYsgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null).assignedPerson->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject((getText(true)&lt;>'' and ( family->isEmpty() and given->isEmpty() and suffix->isEmpty() and prefix->isEmpty()   )   ) xor (getText(true)='' and (not family->isEmpty() and not given->isEmpty()  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5SjEAl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityPersonName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5SjrEF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PYZTkH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityPersonName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PYZTkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null).assignedPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5SjrEV9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityHasNationalProviderIdentifier" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5SjrEl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PYZTkn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityHasNationalProviderIdentifier" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PYZ6oH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null)->reject(id->exists( root='2.16.840.1.113883.4.6' ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5SkSIF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5SkSIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PYZ6oX3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PYZ6on3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5SkSIl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5SkSI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PYZ6o33sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PYZ6pH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Sk5MF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Sk5MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PYahsH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PYahsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5SlgQF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5SlgQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PYahsn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PYahs33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (( not addr->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5SlgQl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityTelecom" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5SlgQ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PYbIwH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityTelecom" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PYbIwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5SmHUF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityAssignedPerson" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5SmHUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PYbv0H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityAssignedPerson" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PYbv0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null)->reject(assignedPerson->one(assignedPerson : cda::Person | not assignedPerson.oclIsUndefined() and assignedPerson.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5SmuYF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5SmuYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PYcW4H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PYcW4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5UKNkF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationTELUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5UKNkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PZp30H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationTELUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PZp30X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null).telecom->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ULbsF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ULbsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PZqe4H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PZqe4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ( streetAddressLine->size() >=1 and streetAddressLine->size() &lt;=4))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5UMCwF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5UMCwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PZrF8H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PZrF8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies state->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5UMp0F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5UMp0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PZrF8n3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PZrtAH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies postalCode->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5UNQ4F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5UNQ4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PZrtAX3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PZrtAn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::PostalAddressUse) and 
 let value : vocab::PostalAddressUse = element.oclAsType(vocab::PostalAddressUse) in 
 value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or value = vocab::PostalAddressUse::H or value = vocab::PostalAddressUse::HP or value = vocab::PostalAddressUse::HV or value = vocab::PostalAddressUse::PHYS or value = vocab::PostalAddressUse::PST or value = vocab::PostalAddressUse::PUB or value = vocab::PostalAddressUse::TMP or value = vocab::PostalAddressUse::WP) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5UN38F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5UN38V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PZsUEH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PZsUEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5UOfAF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5UOfAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PZsUEn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PZsUE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((country->isEmpty() or country->exists(element | element.isNullFlavorUndefined())) implies (( not country->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5UPGEF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5UPGEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PZs7IH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PZs7IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((state->isEmpty() or state->exists(element | element.isNullFlavorUndefined())) implies (( not state->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5UPGEl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5UPGE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PZtiMH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PZtiMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((city->isEmpty() or city->exists(element | element.isNullFlavorUndefined())) implies (city->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5UPtIF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5UPtIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PZtiMn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PZtiM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((postalCode->isEmpty() or postalCode->exists(element | element.isNullFlavorUndefined())) implies (( not postalCode->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5UQUMF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5UQUMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PZuJQH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PZuJQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((streetAddressLine->isEmpty() or streetAddressLine->exists(element | element.isNullFlavorUndefined())) implies (( not streetAddressLine->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5UQ7QF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationHasNationalProviderIdentifier" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5UQ7QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PZuJQn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationHasNationalProviderIdentifier" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PZuJQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null)->reject(id->exists( root='2.16.840.1.113883.4.6' ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5UQ7Ql9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5UQ7Q19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PZuwUH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PZuwUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5URiUF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5URiUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PZuwUn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PZuwU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null)->reject((name.oclIsUndefined() or name.isNullFlavorUndefined()) implies (not name.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5USJYF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationTelecom" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5USJYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PZvXYH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationTelecom" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PZvXYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null)->reject((telecom.oclIsUndefined() or telecom.isNullFlavorUndefined()) implies (not telecom.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5USJYl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5USJY19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PZvXYn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PZvXY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null)->reject((addr.oclIsUndefined() or addr.isNullFlavorUndefined()) implies (not addr.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5USwcF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodianAssignedCustodianRepresentedCustodianOrganization" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5USwcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PZv-cH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodianAssignedCustodianRepresentedCustodianOrganization" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PZv-cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null)->reject(representedCustodianOrganization->one(representedCustodianOrganization : cda::CustodianOrganization | not representedCustodianOrganization.oclIsUndefined() and representedCustodianOrganization.oclIsKindOf(cda::CustodianOrganization)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5UTXgF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodianAssignedCustodian" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5UTXgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PZv-cn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodianAssignedCustodian" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PZv-c33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null)->reject(assignedCustodian->one(assignedCustodian : cda::AssignedCustodian | not assignedCustodian.oclIsUndefined() and assignedCustodian.oclIsKindOf(cda::AssignedCustodian)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5VylQF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformationRecipientIntendedRecipientPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5VylQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PbE0IH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformationRecipientIntendedRecipientPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PbE0IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null).informationRecipient->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject((getText(true)&lt;>'' and ( family->isEmpty() and given->isEmpty() and suffix->isEmpty() and prefix->isEmpty()   )   ) xor (getText(true)='' and (not family->isEmpty() and not given->isEmpty()  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5VzMUF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformationRecipientIntendedRecipientPersonName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5VzMUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PbFbMH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformationRecipientIntendedRecipientPersonName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PbFbMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null).informationRecipient->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5WRGYF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformationRecipientIntendedRecipientOrganizationName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5WRGYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pbg5AH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformationRecipientIntendedRecipientOrganizationName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pbg5AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null).receivedOrganization->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (name->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5WRtcF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformationRecipientIntendedRecipientInformationRecipient" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5WRtcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PbhgEH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformationRecipientIntendedRecipientInformationRecipient" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PbhgEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null)->reject(informationRecipient->one(informationRecipient : cda::Person | not informationRecipient.oclIsUndefined() and informationRecipient.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5WRtcl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformationRecipientIntendedRecipientRecievedOrganization" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5WRtc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PbiHIH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformationRecipientIntendedRecipientRecievedOrganization" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PbiHIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null)->reject(receivedOrganization->one(receivedOrganization : cda::Organization | not receivedOrganization.oclIsUndefined() and receivedOrganization.oclIsKindOf(cda::Organization)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5WSUgF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformationRecipientIntendedRecipient" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5WSUgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PbiHIn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformationRecipientIntendedRecipient" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PbiHI33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null)->reject(intendedRecipient->one(intendedRecipient : cda::IntendedRecipient | not intendedRecipient.oclIsUndefined() and intendedRecipient.oclIsKindOf(cda::IntendedRecipient)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5XRzAF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5XRzAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pcd7QH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pcd7QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ( streetAddressLine->size() >=1 and streetAddressLine->size() &lt;=4))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5XSaEF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5XSaEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PceiUH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PceiUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies state->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5XTBIF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5XTBIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PcfJYH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PcfJYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies postalCode->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5XToMF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5XToMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PcfwcH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PcfwcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::PostalAddressUse) and 
 let value : vocab::PostalAddressUse = element.oclAsType(vocab::PostalAddressUse) in 
 value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or value = vocab::PostalAddressUse::H or value = vocab::PostalAddressUse::HP or value = vocab::PostalAddressUse::HV or value = vocab::PostalAddressUse::PHYS or value = vocab::PostalAddressUse::PST or value = vocab::PostalAddressUse::PUB or value = vocab::PostalAddressUse::TMP or value = vocab::PostalAddressUse::WP) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5XUPQF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5XUPQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PcgXgH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PcgXgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5XU2UF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5XU2UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PcgXgn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PcgXg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((country->isEmpty() or country->exists(element | element.isNullFlavorUndefined())) implies (( not country->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5XVdYF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5XVdYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pcg-kH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pcg-kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((state->isEmpty() or state->exists(element | element.isNullFlavorUndefined())) implies (( not state->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5XWEcF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5XWEcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PchloH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PchloX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((city->isEmpty() or city->exists(element | element.isNullFlavorUndefined())) implies (city->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5XWrgF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5XWrgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PciMsH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PciMsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((postalCode->isEmpty() or postalCode->exists(element | element.isNullFlavorUndefined())) implies (( not postalCode->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5XXSkF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5XXSkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PciMsn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PciMs33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((streetAddressLine->isEmpty() or streetAddressLine->exists(element | element.isNullFlavorUndefined())) implies (( not streetAddressLine->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5XYgsF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityTELUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5XYgsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pcja0H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityTELUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pcja0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null).telecom->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5X7TQF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5X7TQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PdBU4H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PdBU4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null).assignedPerson->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject((getText(true)&lt;>'' and ( family->isEmpty() and given->isEmpty() and suffix->isEmpty() and prefix->isEmpty()   )   ) xor (getText(true)='' and (not family->isEmpty() and not given->isEmpty()  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5X76UF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityPersonName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5X76UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PdBU4n3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityPersonName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PdBU433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null).assignedPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5X8hYF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityHasNationalProviderIdentifier" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5X8hYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PdB78H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityHasNationalProviderIdentifier" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PdB78X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null)->reject(id->exists( root='2.16.840.1.113883.4.6' ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5X9IcF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5X9IcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PdB78n3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PdB7833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5X9Icl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5X9Ic19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PdCjAH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PdCjAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5X9vgF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5X9vgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PdCjAn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PdCjA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5X-WkF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5X-WkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PdDKEH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PdDKEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (( not addr->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5X-Wkl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityTelecom" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5X-Wk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PdDKEn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityTelecom" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PdDxIH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5X-9oF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityAssignedPerson" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5X-9oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PdDxIX3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityAssignedPerson" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PdDxIn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null)->reject(assignedPerson->one(assignedPerson : cda::Person | not assignedPerson.oclIsUndefined() and assignedPerson.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5X_ksF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorTime" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5X_ksV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PdEYMH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorTime" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PdEYMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null)->reject((time.oclIsUndefined() or time.isNullFlavorUndefined()) implies (not time.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5X_ksl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorSignatureCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5X_ks19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PdEYMn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorSignatureCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PdEYM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null)->reject((signatureCode.oclIsUndefined() or signatureCode.isNullFlavorUndefined()) implies (not signatureCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5YALwF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorSignatureCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5YALwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PdE_QH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorSignatureCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PdE_QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null)->reject((signatureCode.oclIsUndefined() or signatureCode.isNullFlavorUndefined()) implies (not signatureCode.oclIsUndefined() and signatureCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = signatureCode.oclAsType(datatypes::CS) in 
 value.code = 'S'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5YAy0F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5YAy0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PdE_Qn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticatorAssignedEntity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PdE_Q33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ZL3gF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ZL3gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PeCBgH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PeCBgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ( streetAddressLine->size() >=1 and streetAddressLine->size() &lt;=4))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ZMekF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ZMekV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PeCokH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PeCokX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies state->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ZNFoF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ZNFoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PeDPoH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PeDPoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies postalCode->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ZNssF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ZNssV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PeD2sH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PeD2sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::PostalAddressUse) and 
 let value : vocab::PostalAddressUse = element.oclAsType(vocab::PostalAddressUse) in 
 value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or value = vocab::PostalAddressUse::H or value = vocab::PostalAddressUse::HP or value = vocab::PostalAddressUse::HV or value = vocab::PostalAddressUse::PHYS or value = vocab::PostalAddressUse::PST or value = vocab::PostalAddressUse::PUB or value = vocab::PostalAddressUse::TMP or value = vocab::PostalAddressUse::WP) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ZOTwF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ZOTwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PeD2sn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PeD2s33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ZO60F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ZO60V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PeEdwH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PeEdwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((country->isEmpty() or country->exists(element | element.isNullFlavorUndefined())) implies (( not country->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ZO60l9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ZPh4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PeFE0H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PeFE0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((state->isEmpty() or state->exists(element | element.isNullFlavorUndefined())) implies (( not state->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ZPh4V9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ZPh4l9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PeFr4H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PeFr4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((city->isEmpty() or city->exists(element | element.isNullFlavorUndefined())) implies (city->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ZQI8F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ZQI8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PeGS8H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PeGS8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((postalCode->isEmpty() or postalCode->exists(element | element.isNullFlavorUndefined())) implies (( not postalCode->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ZQwAF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ZQwAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PeG6AH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PeG6AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((streetAddressLine->isEmpty() or streetAddressLine->exists(element | element.isNullFlavorUndefined())) implies (( not streetAddressLine->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ZR-IF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityTELUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ZR-IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PeIIIH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityTELUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PeIIIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null).telecom->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ZxtYF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ZxtYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PekNAH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PekNAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null).assignedPerson->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject((getText(true)&lt;>'' and ( family->isEmpty() and given->isEmpty() and suffix->isEmpty() and prefix->isEmpty()   )   ) xor (getText(true)='' and (not family->isEmpty() and not given->isEmpty()  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ZyUcF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityPersonName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ZyUcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pek0EH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityPersonName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pek0EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null).assignedPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ZyUcl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityHasNationalProviderIdentifier" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ZyUc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PelbIH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityHasNationalProviderIdentifier" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PelbIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null)->reject(id->exists( root='2.16.840.1.113883.4.6' ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Zy7gF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Zy7gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PelbIn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PelbI33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ZzikF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ZzikV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PemCMH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PemCMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Zzikl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Zzik19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PempQH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PempQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Z0JoF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Z0JoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PempQn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PempQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (( not addr->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Z0wsF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityTelecom" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Z0wsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PenQUH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityTelecom" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PenQUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Z1XwF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityAssignedPerson" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Z1XwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pen3YH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntityAssignedPerson" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pen3YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null)->reject(assignedPerson->one(assignedPerson : cda::Person | not assignedPerson.oclIsUndefined() and assignedPerson.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Z1Xwl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorTime" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Z1Xw19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pen3Yn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorTime" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pen3Y33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null)->reject((time.oclIsUndefined() or time.isNullFlavorUndefined()) implies (not time.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Z1-0F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorSignatureCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Z1-0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PeoecH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorSignatureCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PeoecX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null)->reject((signatureCode.oclIsUndefined() or signatureCode.isNullFlavorUndefined()) implies (not signatureCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Z2l4F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorSignatureCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Z2l4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PepFgH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorSignatureCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PepFgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null)->reject((signatureCode.oclIsUndefined() or signatureCode.isNullFlavorUndefined()) implies (not signatureCode.oclIsUndefined() and signatureCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = signatureCode.oclAsType(datatypes::CS) in 
 value.code = 'S'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Z2l4l9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Z2l419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PepskH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticatorAssignedEntity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PepskX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5aVuEF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5aVuEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PfL4EH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PfL4EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ( streetAddressLine->size() >=1 and streetAddressLine->size() &lt;=4))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5aWVIF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5aWVIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PfMfIH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PfNGMH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies state->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5aW8MF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5aW8MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PfNGMX3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PfNGMn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies postalCode->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5aXjQF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5aXjQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PfNtQH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PfNtQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::PostalAddressUse) and 
 let value : vocab::PostalAddressUse = element.oclAsType(vocab::PostalAddressUse) in 
 value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or value = vocab::PostalAddressUse::H or value = vocab::PostalAddressUse::HP or value = vocab::PostalAddressUse::HV or value = vocab::PostalAddressUse::PHYS or value = vocab::PostalAddressUse::PST or value = vocab::PostalAddressUse::PUB or value = vocab::PostalAddressUse::TMP or value = vocab::PostalAddressUse::WP) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5aYKUF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5aYKUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PfOUUH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PfOUUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5aYxYF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5aYxYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PfO7YH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PfO7YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((country->isEmpty() or country->exists(element | element.isNullFlavorUndefined())) implies (( not country->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5aZYcF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5aZYcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PfPicH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PfPicX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((state->isEmpty() or state->exists(element | element.isNullFlavorUndefined())) implies (( not state->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5aZ_gF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5aZ_gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PfQJgH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PfQJgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((city->isEmpty() or city->exists(element | element.isNullFlavorUndefined())) implies (city->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5aamkF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5aamkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PfQwkH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PfQwkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((postalCode->isEmpty() or postalCode->exists(element | element.isNullFlavorUndefined())) implies (( not postalCode->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5abNoF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5abNoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PfQwkn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PfRXoH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((streetAddressLine->isEmpty() or streetAddressLine->exists(element | element.isNullFlavorUndefined())) implies (( not streetAddressLine->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5a8LAF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5a8LAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pfv4wH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pfv4wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).assignedPerson->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject((getText(true)&lt;>'' and ( family->isEmpty() and given->isEmpty() and suffix->isEmpty() and prefix->isEmpty()   )   ) xor (getText(true)='' and (not family->isEmpty() and not given->isEmpty()  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5a8yEF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityPersonName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5a8yEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pfwf0H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityPersonName" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pfwf0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).assignedPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5a9ZIF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityHasNationalProviderIdentifier" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5a9ZIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PfxG4H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityHasNationalProviderIdentifier" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PfxG4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null)->reject(id->exists( root='2.16.840.1.113883.4.6' ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5a-AMF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5a-AMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pfxt8H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pfxt8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5a-AMl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5a-AM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PfyVAH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PfyVAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5a-nQF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5a-nQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PfyVAn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PfyVA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5a_OUF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5a_OUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pfy8EH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pfy8EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (not addr->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5a_1YF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityAssignedPerson" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5a_1YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PfzjIH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityAssignedPerson" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PfzjIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null)->reject(assignedPerson->one(assignedPerson : cda::Person | not assignedPerson.oclIsUndefined() and assignedPerson.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5bgLsF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5bgLsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PgSrUH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PgSrUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).relatedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ( streetAddressLine->size() >=1 and streetAddressLine->size() &lt;=4))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5bhZ0F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5bhZ0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PgTSYH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PgTSYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).relatedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies state->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5bin8F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5bin8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PgT5cH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PgT5cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).relatedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies postalCode->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5bj2EF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5bkdIF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PgUggH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PgUggX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).relatedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::PostalAddressUse) and 
 let value : vocab::PostalAddressUse = element.oclAsType(vocab::PostalAddressUse) in 
 value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or value = vocab::PostalAddressUse::H or value = vocab::PostalAddressUse::HP or value = vocab::PostalAddressUse::HV or value = vocab::PostalAddressUse::PHYS or value = vocab::PostalAddressUse::PST or value = vocab::PostalAddressUse::PUB or value = vocab::PostalAddressUse::TMP or value = vocab::PostalAddressUse::WP) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5bkdIV9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5bkdIl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PgVHkH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PgVHkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).relatedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5blEMF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5blEMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PgVuoH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PgVuoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).relatedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((country->isEmpty() or country->exists(element | element.isNullFlavorUndefined())) implies (( not country->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5blrQF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5blrQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PgWVsH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PgWVsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).relatedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((state->isEmpty() or state->exists(element | element.isNullFlavorUndefined())) implies (( not state->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5bmSUF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5bmSUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PgW8wH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PgW8wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).relatedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((city->isEmpty() or city->exists(element | element.isNullFlavorUndefined())) implies (city->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5bm5YF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5bm5YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PgXj0H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PgXj0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).relatedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((postalCode->isEmpty() or postalCode->exists(element | element.isNullFlavorUndefined())) implies (( not postalCode->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5bngcF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5bngcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PgYK4H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PgYK4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).relatedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((streetAddressLine->isEmpty() or streetAddressLine->exists(element | element.isNullFlavorUndefined())) implies (( not streetAddressLine->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5cH2wF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantRelatedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5cH2wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pg2sAH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantRelatedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pg3TEH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).relatedEntity->excluding(null).relatedPerson->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject((getText(true)&lt;>'' and ( family->isEmpty() and given->isEmpty() and suffix->isEmpty() and prefix->isEmpty()   )   ) xor (getText(true)='' and (not family->isEmpty() and not given->isEmpty()  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5cId0F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantRelatedEntityAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5cId0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pg36IH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantRelatedEntityAddr" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pg36IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).relatedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (not addr->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5cJE4F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantRelatedEntityPerson" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5cJE4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pg36In3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantRelatedEntityPerson" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pg36I33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).relatedEntity->excluding(null)->reject(relatedPerson->one(relatedPerson : cda::Person | not relatedPerson.oclIsUndefined() and relatedPerson.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5cJr8F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantHasAssignedEntityOrRelatedEntity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5cJr8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pg4hMH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantHasAssignedEntityOrRelatedEntity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pg4hMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null)->reject(assignedEntity.oclIsUndefined() xor relatedEntity.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5cKTAF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsParticipantSupportAssociatedEntityHasAssociatedPersonOrScopingOrganization" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5cKTAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pg5IQH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsParticipantSupportAssociatedEntityHasAssociatedPersonOrScopingOrganization" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pg5IQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::IND)->select(typeCode = vocab::ParticipationType::IND)->reject((not associatedEntity.associatedPerson.oclIsUndefined()) or (not associatedEntity.scopingOrganization.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5cK6EF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsParticipantSupportTime" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5cK6EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pg5vUH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsParticipantSupportTime" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pg5vUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::IND)->select(typeCode = vocab::ParticipationType::IND)->reject((time.oclIsUndefined() or time.isNullFlavorUndefined()) implies (not time.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5dK_oF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInFulfillmentOfOrderId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5dK_oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ph2KgH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInFulfillmentOfOrderId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ph2KgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->excluding(null).order->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5dLmsF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInFulfillmentOfOrder" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5dLmsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ph2xkH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInFulfillmentOfOrder" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ph2xkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->excluding(null)->reject(order->one(order : cda::Order | not order.oclIsUndefined() and order.oclIsKindOf(cda::Order)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5fSfgF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityHasNationalProviderIdentifier" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5fSfgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pjw2EH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityHasNationalProviderIdentifier" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pjw2EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null).assignedEntity->excluding(null)->reject(id->exists( root='2.16.840.1.113883.4.6' ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5fTGkF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5fTGkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PjxdIH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PjxdIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null).assignedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5fTtoF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5fTtoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PjyEMH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PjyEMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5fTtol9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5fTto19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PjyEMn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PjyEM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5fUUsF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1TypeCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5fUUsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PjyrQH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1TypeCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PjyrQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->reject(isDefined('typeCode'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5fU7wF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5fU7wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PjzSUH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PjzSUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->reject((functionCode.oclIsUndefined() or functionCode.isNullFlavorUndefined()) implies (not functionCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5fU7wl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5fU7w19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pjz5YH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pjz5YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->reject((functionCode.oclIsUndefined() or functionCode.isNullFlavorUndefined()) implies (not functionCode.oclIsUndefined() and functionCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = functionCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.88'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5fVi0F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5fVi0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pjz5Yn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntity" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pjz5Y33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5fWJ4F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEventEffectiveTimeLow" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5fWJ4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pj0gcH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEventEffectiveTimeLow" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pj0gcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(effectiveTime->forAll(not low.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5fWw8F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEventEffectiveTime" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5fWw8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pj1HgH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEventEffectiveTime" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pj1HgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5fXYAF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5fXYAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pj1Hgn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pj1Hg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(performer->exists(performer : cda::Performer1 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer1)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5fXYAl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEvent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5fXYA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pj1ukH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEvent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pj1ukX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null)->reject(serviceEvent->one(serviceEvent : cda::ServiceEvent | not serviceEvent.oclIsUndefined() and serviceEvent.oclIsKindOf(cda::ServiceEvent)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5gZSwF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorizationConsentId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5gZSwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PksqMH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorizationConsentId" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PksqMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->excluding(null).consent->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5gZ50F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorizationConsentCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5gZ50V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PktRQH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorizationConsentCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PktRQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->excluding(null).consent->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5gag4F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorizationConsentStatusCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5gag4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pkt4UH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorizationConsentStatusCodeP" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pkt4UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->excluding(null).consent->excluding(null)->reject((statusCode.oclIsUndefined() or statusCode.isNullFlavorUndefined()) implies (not statusCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5gbH8F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorizationConsentStatusCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5gbH8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PkufYH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorizationConsentStatusCode" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PkufYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->excluding(null).consent->excluding(null)->reject((statusCode.oclIsUndefined() or statusCode.isNullFlavorUndefined()) implies (not statusCode.oclIsUndefined() and statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5gbvAF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorizationConsent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5gbvAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PkufYn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorizationConsent" constrainedElement="_2DNRcBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PkufY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->excluding(null)->reject(consent->one(consent : cda::Consent | not consent.oclIsUndefined() and consent.oclIsKindOf(cda::Consent)))</body>
         </specification>
@@ -1909,70 +1909,70 @@ value.code = 'completed'))</body>
           <body>(self.statusCode.code = 'completed') implies not self.effectiveTime.high.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pxNdEF9xEey5t-mahoHmrg" name="AllergyProblemActTemplateId" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pxNdEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CGZ5En3sEeyivuDeOiJBMg" name="AllergyProblemActTemplateId" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CGagIH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.30')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pxPSQF9xEey5t-mahoHmrg" name="AllergyProblemActClassCode" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pxPSQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CGc8YH3sEeyivuDeOiJBMg" name="AllergyProblemActClassCode" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CGc8YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pxRHcF9xEey5t-mahoHmrg" name="AllergyProblemActMoodCode" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pxRHcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CGfYoH3sEeyivuDeOiJBMg" name="AllergyProblemActMoodCode" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CGfYoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pxSVkF9xEey5t-mahoHmrg" name="AllergyProblemActId" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pxSVkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CGhN0H3sEeyivuDeOiJBMg" name="AllergyProblemActId" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CGhN0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pxTjsF9xEey5t-mahoHmrg" name="AllergyProblemActCode" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pxTjsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CGib8H3sEeyivuDeOiJBMg" name="AllergyProblemActCode" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CGib8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pxUx0F9xEey5t-mahoHmrg" name="AllergyProblemActStatusCode" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pxUx0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CGjqEH3sEeyivuDeOiJBMg" name="AllergyProblemActStatusCode" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CGjqEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'active' or value.code = 'suspended' or value.code = 'aborted' or value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_px2WQF9xEey5t-mahoHmrg" name="AllergyProblemActEffectiveTime" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_px2WQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CHLVIH3sEeyivuDeOiJBMg" name="AllergyProblemActEffectiveTime" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CHLVIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p5pAUF9xEey5t-mahoHmrg" name="AllergyProblemActAllergyObservation" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p5pAUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_COQNgH3sEeyivuDeOiJBMg" name="AllergyProblemActAllergyObservation" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_COQNgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AllergyObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5hI5oF9xEey5t-mahoHmrg" name="AllergyProblemActCDCodeAndCodeSystemValues" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5hI5oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Plab4H3sEeyivuDeOiJBMg" name="AllergyProblemActCDCodeAndCodeSystemValues" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Plab4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject((code = 'CONC' and codeSystem = '2.16.840.1.113883.5.6') or (code = '48765-2' and codeSystem = '2.16.840.1.113883.6.1'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5hI5ol9xEey5t-mahoHmrg" name="AllergyProblemActCDCode" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5hI5o19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PlbC8H3sEeyivuDeOiJBMg" name="AllergyProblemActCDCode" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PlbC8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not code.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5hI5pF9xEey5t-mahoHmrg" name="AllergyProblemActCDCodeSystem" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5hJgsF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PlbC8n3sEeyivuDeOiJBMg" name="AllergyProblemActCDCodeSystem" constrainedElement="_2EAisBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PlbC833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not codeSystem.oclIsUndefined() )))</body>
         </specification>
@@ -1980,15 +1980,15 @@ value.code = 'active' or value.code = 'suspended' or value.code = 'aborted' or v
       <generalization xmi:id="_2GDKExSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_p5pAUl9xEey5t-mahoHmrg" name="getAllergyObservations" bodyCondition="_p5pAVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_p5pAVV9xEey5t-mahoHmrg" name="body" constrainedElement="_p5pAUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_p5pAVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_COQNgn3sEeyivuDeOiJBMg" name="getAllergyObservations" bodyCondition="_COQNhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_COQNhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_COQNgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_COQNhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AllergyObservation)).oclAsType(consol::AllergyObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_p5pAU19xEey5t-mahoHmrg" type="_2EaLUBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p5pAVF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_COQNg33sEeyivuDeOiJBMg" type="_2EaLUBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_COQNhH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -2042,198 +2042,198 @@ NOTE: The agent responsible for an allergy or adverse reaction is not always a m
           <body>self.entryRelationship->select(er : cda::EntryRelationship | er.observation.oclIsTypeOf(consol::SeverityObservation))->forAll(ent : cda::EntryRelationship | ent.inversionInd=true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_px6AoV9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationTemplateId" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_px6Aol9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CHPmkX3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationTemplateId" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CHPmkn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.7')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_px9D8F9xEey5t-mahoHmrg" name="AllergyObservationClassCode" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_px9D8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CHTQ8H3sEeyivuDeOiJBMg" name="AllergyObservationClassCode" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CHTQ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_px_gMF9xEey5t-mahoHmrg" name="AllergyObservationMoodCode" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_px_gMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CHVtMH3sEeyivuDeOiJBMg" name="AllergyObservationMoodCode" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CHVtMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pyBVYF9xEey5t-mahoHmrg" name="AllergyObservationId" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pyBVYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CHYJcH3sEeyivuDeOiJBMg" name="AllergyObservationId" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CHYJcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (not self.id->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pyEYsF9xEey5t-mahoHmrg" name="AllergyObservationCodeP" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pyEYsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CHca4H3sEeyivuDeOiJBMg" name="AllergyObservationCodeP" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CHca4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pyCjgF9xEey5t-mahoHmrg" name="AllergyObservationCode" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pyCjgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CHZ-oH3sEeyivuDeOiJBMg" name="AllergyObservationCode" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CHalsH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pyFm0F9xEey5t-mahoHmrg" name="AllergyObservationStatusCode" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pyFm0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CHeQEH3sEeyivuDeOiJBMg" name="AllergyObservationStatusCode" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CHeQEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pyHcAF9xEey5t-mahoHmrg" name="AllergyObservationEffectiveTime" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pyIDEF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CHgsUH3sEeyivuDeOiJBMg" name="AllergyObservationEffectiveTime" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CHgsUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pyJRMF9xEey5t-mahoHmrg" name="AllergyObservationValue" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pyJRMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CHjIkH3sEeyivuDeOiJBMg" name="AllergyObservationValue" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CHjIkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '420134006' or value.code = '418038007' or value.code = '419511003' or value.code = '418471000' or value.code = '419199007' or value.code = '416098002' or value.code = '414285001' or value.code = '59037007' or value.code = '235719002' or value.code = '232347008' or value.code = '426232007')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pzSgsF9xEey5t-mahoHmrg" name="AllergyObservationReactionObservation" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pzSgsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CIrJ8H3sEeyivuDeOiJBMg" name="AllergyObservationReactionObservation" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CIrJ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ReactionObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::MFST)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pzy3AF9xEey5t-mahoHmrg" name="AllergyObservationSeverityObservation" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pzy3AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CJKSIH3sEeyivuDeOiJBMg" name="AllergyObservationSeverityObservation" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CJKSIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SeverityObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q-Ff4F9xEey5t-mahoHmrg" name="AllergyObservationAllergyStatusObservation" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q-Ff4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DH050H3sEeyivuDeOiJBMg" name="AllergyObservationAllergyStatusObservation" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DH050X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AllergyStatusObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r35cwF9xEey5t-mahoHmrg" name="AllergyObservationParticipant" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r35cwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D46YgH3sEeyivuDeOiJBMg" name="AllergyObservationParticipant" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D46YgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->one(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ioucF9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ioucV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pms1UH3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pms1UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null).code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((originalText.oclIsUndefined() or originalText.isNullFlavorUndefined()) implies (not originalText.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ioucl9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntityCETranslation" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5iouc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pms1Un3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntityCETranslation" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pms1U33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null).code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (not translation->isEmpty()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ioudF9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ioudV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pms1VH3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pms1VX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(not code.originalText.reference.value.oclIsUndefined() implies not getSection().text.getText(code.originalText.reference.value.substring(2, code.originalText.reference.value.size())).oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ipVgF9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntityReferenceValue" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ipVgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PmtcYH3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntityReferenceValue" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PmtcYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(not code.originalText.reference.oclIsUndefined() implies code.originalText.reference.value->size() = 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ipVgl9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ipVg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PmtcYn3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PmtcY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(not code.originalText.oclIsUndefined() implies not code.originalText.reference.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ipVhF9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntityCodeTerminologyValueSetGroupSRFI" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ipVhV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PmtcZH3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntityCodeTerminologyValueSetGroupSRFI" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PmtcZX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(( code.oclIsUndefined() or code.isNullFlavorUndefined() ) implies ( not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and ( ( let value : datatypes::CE = code.oclAsType(datatypes::CE) in value.codeSystem = '2.16.840.1.113883.3.26.1.5' and not value.code.oclIsUndefined() ) or ( let value : datatypes::CE = code.oclAsType(datatypes::CE) in value.codeSystem = '2.16.840.1.113883.6.88' and not value.code.oclIsUndefined() ) or ( let value : datatypes::CE = code.oclAsType(datatypes::CE) in value.codeSystem = '2.16.840.1.113883.4.9' and not value.code.oclIsUndefined() ) or ( let value : datatypes::CE = code.oclAsType(datatypes::CE) in value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined() ) ) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ip8kF9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntityClassCode" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ip8kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PmuDcH3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntityClassCode" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PmuDcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(isDefined('classCode'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ip8kl9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntityCode" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ip8k19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PmuDcn3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntityCode" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PmuDc33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5iqjoF9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRoleClassCode" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5iqjoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PmuDdH3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRoleClassCode" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PmuDdX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null)->reject(not classCode.oclIsUndefined() and classCode.oclIsKindOf(vocab::RoleClassRoot) and 
 let value : vocab::RoleClassRoot = classCode.oclAsType(vocab::RoleClassRoot) in 
 value = vocab::RoleClassRoot::MANU)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5iqjol9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntity" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5iqjo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PmuDdn3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntity" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PmuDd33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null)->reject(playingEntity->one(playingEntity : cda::PlayingEntity | not playingEntity.oclIsUndefined() and playingEntity.oclIsKindOf(cda::PlayingEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5iqjpF9xEey5t-mahoHmrg" name="AllergyObservationParticipantTypeCode" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5iqjpV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PmuqgH3sEeyivuDeOiJBMg" name="AllergyObservationParticipantTypeCode" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PmuqgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(not typeCode.oclIsUndefined() and typeCode.oclIsKindOf(vocab::ParticipationType) and 
 let value : vocab::ParticipationType = typeCode.oclAsType(vocab::ParticipationType) in 
 value = vocab::ParticipationType::CSM)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5irKsF9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRole" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5irKsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pmuqgn3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRole" constrainedElement="_2EaLUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pmuqg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(participantRole->one(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(cda::ParticipantRole)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_2F5ZERSVEeGGzu7fmW9pXw" general="_mgny4NF8EeOHUokOVP95oQ"/>
-      <ownedOperation xmi:id="_pzTHwF9xEey5t-mahoHmrg" name="getConsolReactionObservations" bodyCondition="_pzTHw19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_pzTHw19xEey5t-mahoHmrg" name="body" constrainedElement="_pzTHwF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_pzTHxF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CIsYEH3sEeyivuDeOiJBMg" name="getConsolReactionObservations" bodyCondition="_CIsYE33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CIsYE33sEeyivuDeOiJBMg" name="body" constrainedElement="_CIsYEH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CIsYFH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ReactionObservation)).oclAsType(consol::ReactionObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_pzTHwV9xEey5t-mahoHmrg" type="_2E_aIRSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pzTHwl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_CIsYEX3sEeyivuDeOiJBMg" type="_2E_aIRSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CIsYEn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_pzzeEF9xEey5t-mahoHmrg" name="getConsolSeverityObservation" bodyCondition="_pzzeE19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_pzzeE19xEey5t-mahoHmrg" name="body" constrainedElement="_pzzeEF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_pzzeFF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CJKSIn3sEeyivuDeOiJBMg" name="getConsolSeverityObservation" bodyCondition="_CJKSJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CJKSJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_CJKSIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CJKSJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SeverityObservation))->asSequence()->any(true).oclAsType(consol::SeverityObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_pzzeEV9xEey5t-mahoHmrg" type="_2FGu4hSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pzzeEl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_CJKSI33sEeyivuDeOiJBMg" type="_2FGu4hSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CJKSJH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_q-Ff4l9xEey5t-mahoHmrg" name="getConsolAllergyStatusObservation" bodyCondition="_q-Ff5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_q-Ff5V9xEey5t-mahoHmrg" name="body" constrainedElement="_q-Ff4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_q-Ff5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DH050n3sEeyivuDeOiJBMg" name="getConsolAllergyStatusObservation" bodyCondition="_DH051X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DH051X3sEeyivuDeOiJBMg" name="body" constrainedElement="_DH050n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DH051n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AllergyStatusObservation))->asSequence()->any(true).oclAsType(consol::AllergyStatusObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_q-Ff419xEey5t-mahoHmrg" type="_2FRuAhSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_q-Ff5F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_DH05033sEeyivuDeOiJBMg" type="_2FRuAhSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DH051H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -2247,54 +2247,54 @@ value = vocab::ParticipationType::CSM)</body>
           <body>self.value.oclAsType(datatypes::PQ).unit->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pzzeFV9xEey5t-mahoHmrg" name="AgeObservationTemplateId" constrainedElement="_2EqqABSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pzzeFl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CJKSJ33sEeyivuDeOiJBMg" name="AgeObservationTemplateId" constrainedElement="_2EqqABSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CJK5MH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.31')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pz1TQF9xEey5t-mahoHmrg" name="AgeObservationClassCode" constrainedElement="_2EqqABSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pz1TQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CJMHUH3sEeyivuDeOiJBMg" name="AgeObservationClassCode" constrainedElement="_2EqqABSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CJMHUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pz2hYF9xEey5t-mahoHmrg" name="AgeObservationMoodCode" constrainedElement="_2EqqABSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pz2hYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CJN8gH3sEeyivuDeOiJBMg" name="AgeObservationMoodCode" constrainedElement="_2EqqABSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CJN8gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pz49oF9xEey5t-mahoHmrg" name="AgeObservationCodeP" constrainedElement="_2EqqABSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pz49oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CJQYwH3sEeyivuDeOiJBMg" name="AgeObservationCodeP" constrainedElement="_2EqqABSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CJQYwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pz3vgF9xEey5t-mahoHmrg" name="AgeObservationCode" constrainedElement="_2EqqABSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pz3vgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CJPKoH3sEeyivuDeOiJBMg" name="AgeObservationCode" constrainedElement="_2EqqABSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CJPKoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '445518008' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pz6LwF9xEey5t-mahoHmrg" name="AgeObservationStatusCode" constrainedElement="_2EqqABSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pz6LwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CJRm4H3sEeyivuDeOiJBMg" name="AgeObservationStatusCode" constrainedElement="_2EqqABSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CJRm4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pz7Z4F9xEey5t-mahoHmrg" name="AgeObservationStatusCodeP" constrainedElement="_2EqqABSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pz7Z4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CJTcEH3sEeyivuDeOiJBMg" name="AgeObservationStatusCodeP" constrainedElement="_2EqqABSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CJTcEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pz8oAF9xEey5t-mahoHmrg" name="AgeObservationValue" constrainedElement="_2EqqABSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pz8oAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CJVRQH3sEeyivuDeOiJBMg" name="AgeObservationValue" constrainedElement="_2EqqABSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CJVRQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::PQ)))</body>
         </specification>
@@ -2325,56 +2325,56 @@ value.code = 'completed')</body>
           <body>not self.text.reference.value.oclIsUndefined() implies not self.getSection().text.getText(self.text.reference.value.substring(2, self.text.reference.value.size())).oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pz9PEF9xEey5t-mahoHmrg" name="HealthStatusObservationTemplateId" constrainedElement="_2ExXsBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pz9PEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CJV4UH3sEeyivuDeOiJBMg" name="HealthStatusObservationTemplateId" constrainedElement="_2ExXsBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CJV4UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.5')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_pz_EQF9xEey5t-mahoHmrg" name="HealthStatusObservationClassCode" constrainedElement="_2ExXsBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_pz_EQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CJYUkH3sEeyivuDeOiJBMg" name="HealthStatusObservationClassCode" constrainedElement="_2ExXsBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CJYUkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p0ASYF9xEey5t-mahoHmrg" name="HealthStatusObservationMoodCode" constrainedElement="_2ExXsBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p0ASYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CJZisH3sEeyivuDeOiJBMg" name="HealthStatusObservationMoodCode" constrainedElement="_2ExXsBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CJZisX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p0BggF9xEey5t-mahoHmrg" name="HealthStatusObservationCode" constrainedElement="_2ExXsBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p0BggV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CJaw0H3sEeyivuDeOiJBMg" name="HealthStatusObservationCode" constrainedElement="_2ExXsBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CJbX4H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '11323-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p0CuoF9xEey5t-mahoHmrg" name="HealthStatusObservationText" constrainedElement="_2ExXsBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p0CuoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CJcmAH3sEeyivuDeOiJBMg" name="HealthStatusObservationText" constrainedElement="_2ExXsBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CJcmAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p0DVsF9xEey5t-mahoHmrg" name="HealthStatusObservationStatusCode" constrainedElement="_2ExXsBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p0DVsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CJd0IH3sEeyivuDeOiJBMg" name="HealthStatusObservationStatusCode" constrainedElement="_2ExXsBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CJd0IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p0FK4F9xEey5t-mahoHmrg" name="HealthStatusObservationValue" constrainedElement="_2ExXsBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p0FK4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CJfpUH3sEeyivuDeOiJBMg" name="HealthStatusObservationValue" constrainedElement="_2ExXsBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CJfpUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '81323004' or value.code = '313386006' or value.code = '162467007' or value.code = '161901003' or value.code = '271593001' or value.code = '21134002' or value.code = '161045001' or value.code = '419099009' or value.code = '135818000' or value.code = '135815002')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p0mvUF9xEey5t-mahoHmrg" name="HealthStatusObservationValueP" constrainedElement="_2ExXsBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p0mvUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CJ7uMH3sEeyivuDeOiJBMg" name="HealthStatusObservationValueP" constrainedElement="_2ExXsBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CJ7uMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
@@ -2435,84 +2435,84 @@ value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '81323004' or valu
           <body>self.entryRelationship->select(er : cda::EntryRelationship | er.substanceAdministration.oclIsTypeOf(consol::MedicationActivity))->forAll(ent : cda::EntryRelationship | ent.inversionInd=true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p1YLYF9xEey5t-mahoHmrg" name="ReactionObservationTemplateId" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p1YLYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CKXMAH3sEeyivuDeOiJBMg" name="ReactionObservationTemplateId" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CKXMAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.9')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p1b1wF9xEey5t-mahoHmrg" name="ReactionObservationClassCode" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p1b1wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CKa2YH3sEeyivuDeOiJBMg" name="ReactionObservationClassCode" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CKa2YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p1dq8F9xEey5t-mahoHmrg" name="ReactionObservationMoodCode" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p1dq8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CKcrkH3sEeyivuDeOiJBMg" name="ReactionObservationMoodCode" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CKcrkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p1fgIF9xEey5t-mahoHmrg" name="ReactionObservationId" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p1fgIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CKegwH3sEeyivuDeOiJBMg" name="ReactionObservationId" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CKegwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (self.id->size() =  1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p1guQF9xEey5t-mahoHmrg" name="ReactionObservationCode" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p1guQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CKgV8H3sEeyivuDeOiJBMg" name="ReactionObservationCode" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CKgV8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p1h8YF9xEey5t-mahoHmrg" name="ReactionObservationText" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p1h8YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CKhkEH3sEeyivuDeOiJBMg" name="ReactionObservationText" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CKhkEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p1jKgF9xEey5t-mahoHmrg" name="ReactionObservationStatusCode" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p1jKgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CKiyMH3sEeyivuDeOiJBMg" name="ReactionObservationStatusCode" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CKiyMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p1kYoF9xEey5t-mahoHmrg" name="ReactionObservationEffectiveTime" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p1kYoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CKknYH3sEeyivuDeOiJBMg" name="ReactionObservationEffectiveTime" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CKknYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p1lmwF9xEey5t-mahoHmrg" name="ReactionObservationValue" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p1lmwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CKmckH3sEeyivuDeOiJBMg" name="ReactionObservationValue" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CKmckX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p2F9EF9xEey5t-mahoHmrg" name="ReactionObservationValueP" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p2GkIF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CLIBAH3sEeyivuDeOiJBMg" name="ReactionObservationValueP" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CLIBAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p4UxsF9xEey5t-mahoHmrg" name="ReactionObservationSeverityObservation" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p4UxsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CNHlEH3sEeyivuDeOiJBMg" name="ReactionObservationSeverityObservation" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CNHlEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SeverityObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rUTngF9xEey5t-mahoHmrg" name="ReactionObservationProcedureActivityProcedure" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rUTngV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Da8qIH3sEeyivuDeOiJBMg" name="ReactionObservationProcedureActivityProcedure" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Da8qIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.procedure.oclIsUndefined() and entryRelationship.procedure.oclIsKindOf(consol::ProcedureActivityProcedure) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rU1L8F9xEey5t-mahoHmrg" name="ReactionObservationMedicationActivity" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rU1L8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DbYvAH3sEeyivuDeOiJBMg" name="ReactionObservationMedicationActivity" constrainedElement="_2E_aIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DbZWEH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::MedicationActivity) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
@@ -2520,37 +2520,37 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
       <generalization xmi:id="_2FwPIhSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_p4VYwF9xEey5t-mahoHmrg" name="getSeverityObservation" bodyCondition="_p4VYw19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_p4VYw19xEey5t-mahoHmrg" name="body" constrainedElement="_p4VYwF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_p4VYxF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CNIMIH3sEeyivuDeOiJBMg" name="getSeverityObservation" bodyCondition="_CNIMI33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CNIMI33sEeyivuDeOiJBMg" name="body" constrainedElement="_CNIMIH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CNIMJH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SeverityObservation))->asSequence()->any(true).oclAsType(consol::SeverityObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_p4VYwV9xEey5t-mahoHmrg" type="_2FGu4hSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p4VYwl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_CNIMIX3sEeyivuDeOiJBMg" type="_2FGu4hSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CNIMIn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rUTngl9xEey5t-mahoHmrg" name="getProcedureActivityProcedures" bodyCondition="_rUTnhV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rUTnhV9xEey5t-mahoHmrg" name="body" constrainedElement="_rUTngl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rUTnhl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Da9RMH3sEeyivuDeOiJBMg" name="getProcedureActivityProcedures" bodyCondition="_Da9RM33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Da9RM33sEeyivuDeOiJBMg" name="body" constrainedElement="_Da9RMH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Da9RNH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getProcedures()->select(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::ProcedureActivityProcedure)).oclAsType(consol::ProcedureActivityProcedure)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rUTng19xEey5t-mahoHmrg" type="_2OG58RSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rUTnhF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Da9RMX3sEeyivuDeOiJBMg" type="_2OG58RSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Da9RMn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rU1L8l9xEey5t-mahoHmrg" name="getMedicationActivities" bodyCondition="_rU1L9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rU1L9V9xEey5t-mahoHmrg" name="body" constrainedElement="_rU1L8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rU1L9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DbZWEX3sEeyivuDeOiJBMg" name="getMedicationActivities" bodyCondition="_DbZWFH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DbZWFH3sEeyivuDeOiJBMg" name="body" constrainedElement="_DbZWEX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DbZWFX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity)).oclAsType(consol::MedicationActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rU1L819xEey5t-mahoHmrg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rU1L9F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DbZWEn3sEeyivuDeOiJBMg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DbZWE33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -2576,56 +2576,56 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
           <body>not self.text.reference.value.oclIsUndefined() implies not self.getSection().text.getText(self.text.reference.value.substring(2, self.text.reference.value.size())).oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p2m6cF9xEey5t-mahoHmrg" name="SeverityObservationTemplateId" constrainedElement="_2FGu4hSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p2m6cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CLoXUH3sEeyivuDeOiJBMg" name="SeverityObservationTemplateId" constrainedElement="_2FGu4hSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CLoXUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.8')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p2pWsF9xEey5t-mahoHmrg" name="SeverityObservationClassCode" constrainedElement="_2FGu4hSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p2pWsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CLqzkH3sEeyivuDeOiJBMg" name="SeverityObservationClassCode" constrainedElement="_2FGu4hSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CLqzkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p2qk0F9xEey5t-mahoHmrg" name="SeverityObservationMoodCode" constrainedElement="_2FGu4hSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p2qk0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CLsBsH3sEeyivuDeOiJBMg" name="SeverityObservationMoodCode" constrainedElement="_2FGu4hSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CLsowH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p2ry8F9xEey5t-mahoHmrg" name="SeverityObservationCode" constrainedElement="_2FGu4hSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p2ry8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CLt24H3sEeyivuDeOiJBMg" name="SeverityObservationCode" constrainedElement="_2FGu4hSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CLt24X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'SEV' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p2toIF9xEey5t-mahoHmrg" name="SeverityObservationText" constrainedElement="_2FGu4hSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p2toIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CLvFAH3sEeyivuDeOiJBMg" name="SeverityObservationText" constrainedElement="_2FGu4hSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CLvFAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p2u2QF9xEey5t-mahoHmrg" name="SeverityObservationStatusCode" constrainedElement="_2FGu4hSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p2u2QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CLwTIH3sEeyivuDeOiJBMg" name="SeverityObservationStatusCode" constrainedElement="_2FGu4hSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CLwTIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p2wEYF9xEey5t-mahoHmrg" name="SeverityObservationValue" constrainedElement="_2FGu4hSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p2wEYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CLxhQH3sEeyivuDeOiJBMg" name="SeverityObservationValue" constrainedElement="_2FGu4hSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CLxhQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '255604002' or value.code = '371923003' or value.code = '6736007' or value.code = '371924009' or value.code = '24484000' or value.code = '399166001')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p3Ro0F9xEey5t-mahoHmrg" name="SeverityObservationValueP" constrainedElement="_2FGu4hSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p3Ro0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CMO0QH3sEeyivuDeOiJBMg" name="SeverityObservationValueP" constrainedElement="_2FGu4hSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CMO0QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
@@ -2640,42 +2640,42 @@ value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '255604002' or val
 This template represents the status of the allergy indicating whether it is active, no longer active, or is an historic allergy. There can be only one allergy status observation per alert observation.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_p4VYxV9xEey5t-mahoHmrg" name="AllergyStatusObservationTemplateId" constrainedElement="_2FRuAhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p4VYxl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CNIMJX3sEeyivuDeOiJBMg" name="AllergyStatusObservationTemplateId" constrainedElement="_2FRuAhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CNIMJn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.28')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p4XN8F9xEey5t-mahoHmrg" name="AllergyStatusObservationClassCode" constrainedElement="_2FRuAhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p4XN8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CNJaQH3sEeyivuDeOiJBMg" name="AllergyStatusObservationClassCode" constrainedElement="_2FRuAhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CNJaQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p4ZDIF9xEey5t-mahoHmrg" name="AllergyStatusObservationMoodCode" constrainedElement="_2FRuAhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p4ZDIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CNLPcH3sEeyivuDeOiJBMg" name="AllergyStatusObservationMoodCode" constrainedElement="_2FRuAhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CNLPcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p4aRQF9xEey5t-mahoHmrg" name="AllergyStatusObservationCode" constrainedElement="_2FRuAhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p4aRQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CNMdkH3sEeyivuDeOiJBMg" name="AllergyStatusObservationCode" constrainedElement="_2FRuAhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CNMdkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '33999-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p4cGcF9xEey5t-mahoHmrg" name="AllergyStatusObservationStatusCode" constrainedElement="_2FRuAhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p4cGcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CNOSwH3sEeyivuDeOiJBMg" name="AllergyStatusObservationStatusCode" constrainedElement="_2FRuAhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CNOSwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p4d7oF9xEey5t-mahoHmrg" name="AllergyStatusObservationValue" constrainedElement="_2FRuAhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p4d7oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CNPg4H3sEeyivuDeOiJBMg" name="AllergyStatusObservationValue" constrainedElement="_2FRuAhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CNPg4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = element.oclAsType(datatypes::CE) in 
@@ -2708,40 +2708,40 @@ value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '55561003' or valu
           <body>not self.text.reference.value.oclIsUndefined() implies not self.getSection().text.getText(self.text.reference.value.substring(2, self.text.reference.value.size())).oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p5AuMF9xEey5t-mahoHmrg" name="CommentActivityTemplateId" constrainedElement="_2FhloBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p5AuMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CNuCAH3sEeyivuDeOiJBMg" name="CommentActivityTemplateId" constrainedElement="_2FhloBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CNuCAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.64')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p5DKcF9xEey5t-mahoHmrg" name="CommentActivityClassCode" constrainedElement="_2FhloBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p5DKcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CNv3MH3sEeyivuDeOiJBMg" name="CommentActivityClassCode" constrainedElement="_2FhloBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CNv3MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p5E_oF9xEey5t-mahoHmrg" name="CommentActivityMoodCode" constrainedElement="_2FhloBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p5E_oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CNxFUH3sEeyivuDeOiJBMg" name="CommentActivityMoodCode" constrainedElement="_2FhloBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CNxFUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p5GNwF9xEey5t-mahoHmrg" name="CommentActivityCode" constrainedElement="_2FhloBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p5GNwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CNyTcH3sEeyivuDeOiJBMg" name="CommentActivityCode" constrainedElement="_2FhloBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CNyTcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '48767-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p5Hb4F9xEey5t-mahoHmrg" name="CommentActivityText" constrainedElement="_2FhloBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p5IC8F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CNzhkH3sEeyivuDeOiJBMg" name="CommentActivityText" constrainedElement="_2FhloBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CNzhkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4fIqEF9xEey5t-mahoHmrg" name="CommentActivityAuthorParticipation" constrainedElement="_2FhloBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4fIqEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OwjQcH3sEeyivuDeOiJBMg" name="CommentActivityAuthorParticipation" constrainedElement="_2FhloBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OwjQcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->one(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
@@ -2842,184 +2842,184 @@ Medication timing is complex. This template requires that there be a substanceAd
           <body>not self.rateQuantity.oclIsUndefined() implies self.rateQuantity.oclAsType(datatypes::PQ).unit->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p5pnYF9xEey5t-mahoHmrg" name="MedicationActivityTemplateId" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p5pnYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_COQNh33sEeyivuDeOiJBMg" name="MedicationActivityTemplateId" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_COQ0kH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.16')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p5t40F9xEey5t-mahoHmrg" name="MedicationActivityClassCode" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p5t40V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_COUe8H3sEeyivuDeOiJBMg" name="MedicationActivityClassCode" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_COUe8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClass::SBADM</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p5vG8F9xEey5t-mahoHmrg" name="MedicationActivityMoodCode" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p5vG8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_COWUIH3sEeyivuDeOiJBMg" name="MedicationActivityMoodCode" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_COWUIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentSubstanceMood) and 
 let value : vocab::x_DocumentSubstanceMood = self.moodCode.oclAsType(vocab::x_DocumentSubstanceMood) in 
 value = vocab::x_DocumentSubstanceMood::EVN or value = vocab::x_DocumentSubstanceMood::INT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p6RScF9xEey5t-mahoHmrg" name="MedicationActivityId" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p6RScV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_COzAEH3sEeyivuDeOiJBMg" name="MedicationActivityId" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_COzAEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p6SgkF9xEey5t-mahoHmrg" name="MedicationActivityCode" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p6THoF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CO01QH3sEeyivuDeOiJBMg" name="MedicationActivityCode" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CO01QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p6UVwF9xEey5t-mahoHmrg" name="MedicationActivityStatusCode" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p6UVwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CO1cUH3sEeyivuDeOiJBMg" name="MedicationActivityStatusCode" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CO1cUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p64WcF9xEey5t-mahoHmrg" name="MedicationActivityRouteCodeP" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p64WcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CPUkgH3sEeyivuDeOiJBMg" name="MedicationActivityRouteCodeP" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CPUkgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.routeCode.oclIsUndefined() or self.routeCode.isNullFlavorUndefined()) implies (not self.routeCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p6U80F9xEey5t-mahoHmrg" name="MedicationActivityRouteCode" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p6Vj4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CO2qcH3sEeyivuDeOiJBMg" name="MedicationActivityRouteCode" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CO2qcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.routeCode.oclIsUndefined() or self.routeCode.isNullFlavorUndefined()) implies (not self.routeCode.oclIsUndefined() and self.routeCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.routeCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.3.26.1.1' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p7bJAF9xEey5t-mahoHmrg" name="MedicationActivityApproachSiteCode" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p7bJAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CP1h4H3sEeyivuDeOiJBMg" name="MedicationActivityApproachSiteCode" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CP1h4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.approachSiteCode->isEmpty() or self.approachSiteCode->exists(element | element.isNullFlavorUndefined())) implies (self.approachSiteCode->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p7_wwF9xEey5t-mahoHmrg" name="MedicationActivityApproachSiteCodeP" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p7_wwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CQTb8H3sEeyivuDeOiJBMg" name="MedicationActivityApproachSiteCodeP" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CQTb8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.approachSiteCode->isEmpty() or self.approachSiteCode->exists(element | element.isNullFlavorUndefined())) implies (( not self.approachSiteCode->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p8k_kF9xEey5t-mahoHmrg" name="MedicationActivityDoseQuantity" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p8k_kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CQwH4H3sEeyivuDeOiJBMg" name="MedicationActivityDoseQuantity" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CQwH4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.doseQuantity.oclIsUndefined() or self.doseQuantity.isNullFlavorUndefined()) implies (not self.doseQuantity.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p8m0wF9xEey5t-mahoHmrg" name="MedicationActivityRateQuantity" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p8m0wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CQxWAH3sEeyivuDeOiJBMg" name="MedicationActivityRateQuantity" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CQxWAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.rateQuantity.oclIsUndefined() or self.rateQuantity.isNullFlavorUndefined()) implies (not self.rateQuantity.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p8op8F9xEey5t-mahoHmrg" name="MedicationActivityMaxDoseQuantity" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p8op8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CQykIH3sEeyivuDeOiJBMg" name="MedicationActivityMaxDoseQuantity" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CQykIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.maxDoseQuantity.oclIsUndefined() or self.maxDoseQuantity.isNullFlavorUndefined()) implies (not self.maxDoseQuantity.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p9XpwF9xEey5t-mahoHmrg" name="MedicationActivityAdministrationUnitCodeP" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p9XpwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CRRFQH3sEeyivuDeOiJBMg" name="MedicationActivityAdministrationUnitCodeP" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CRRFQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.administrationUnitCode.oclIsUndefined() or self.administrationUnitCode.isNullFlavorUndefined()) implies (not self.administrationUnitCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p8p4EF9xEey5t-mahoHmrg" name="MedicationActivityAdministrationUnitCode" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p8p4EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CQzyQH3sEeyivuDeOiJBMg" name="MedicationActivityAdministrationUnitCode" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CQzyQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.administrationUnitCode.oclIsUndefined() or self.administrationUnitCode.isNullFlavorUndefined()) implies (not self.administrationUnitCode.oclIsUndefined() and self.administrationUnitCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.administrationUnitCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.3.26.1.1' and (value.code = 'C42887' or value.code = 'C42888' or value.code = 'C42960' or value.code = 'C42971' or value.code = 'C42889' or value.code = 'C42892' or value.code = 'C42890' or value.code = 'C43451' or value.code = 'C42891' or value.code = 'C25158' or value.code = 'C42895' or value.code = 'C42896' or value.code = 'C42917' or value.code = 'C42902' or value.code = 'C42904' or value.code = 'C42916' or value.code = 'C42928' or value.code = 'C42936' or value.code = 'C42954' or value.code = 'C45414' or value.code = 'C42678' or value.code = 'C60884' or value.code = 'C60891' or value.code = 'C42900' or value.code = 'C42919' or value.code = 'C28944' or value.code = 'C60897' or value.code = 'C42901' or value.code = 'C45415' or value.code = 'C47890' or value.code = 'C43525' or value.code = 'C42679' or value.code = 'C42763' or value.code = 'C17423' or value.code = 'C42912' or value.code = 'C42913' or value.code = 'C42915' or value.code = 'C42929' or value.code = 'C60926' or value.code = 'C42932' or value.code = 'C42920' or value.code = 'C42984' or value.code = 'C60927' or value.code = 'C60928' or value.code = 'C60929' or value.code = 'C42933' or value.code = 'C42934' or value.code = 'C42906' or value.code = 'C60930' or value.code = 'C48193' or value.code = 'C42937' or value.code = 'C45416' or value.code = 'C42938' or value.code = 'C42903' or value.code = 'C42909' or value.code = 'C42939' or value.code = 'C42940' or value.code = 'C42921' or value.code = 'C42941' or value.code = 'C42894' or value.code = 'C42978' or value.code = 'C42942' or value.code = 'C42944' or value.code = 'C60931' or value.code = 'C42946' or value.code = 'C42914' or value.code = 'C42950' or value.code = 'C42974' or value.code = 'C42976' or value.code = 'C42977' or value.code = 'C42959' or value.code = 'C42957' or value.code = 'C42958' or value.code = 'C42956' or value.code = 'C42945' or value.code = 'C42899' or value.code = 'C42995' or value.code = 'C42926' or value.code = 'C42951' or value.code = 'C42988' or value.code = 'C60933' or value.code = 'C42922' or value.code = 'C47915' or value.code = 'C42947' or value.code = 'C42948' or value.code = 'C47916' or value.code = 'C45413' or value.code = 'C42949' or value.code = 'C42952' or value.code = 'C42953' or value.code = 'C60934' or value.code = 'C29167' or value.code = 'C60957' or value.code = 'C60958' or value.code = 'C42955' or value.code = 'C29269' or value.code = 'C42965' or value.code = 'C42966' or value.code = 'C60984' or value.code = 'C47887' or value.code = 'C42967' or value.code = 'C42907' or value.code = 'C60985' or value.code = 'C42968' or value.code = 'C42923' or value.code = 'C42911' or value.code = 'C42969' or value.code = 'C42943' or value.code = 'C42918' or value.code = 'C25394' or value.code = 'C42970' or value.code = 'C47913' or value.code = 'C42972' or value.code = 'C42908' or value.code = 'C42973' or value.code = 'C42975' or value.code = 'C42961' or value.code = 'C60988' or value.code = 'C42979' or value.code = 'C42980' or value.code = 'C42981' or value.code = 'C42982' or value.code = 'C42983' or value.code = 'C42986' or value.code = 'C42898' or value.code = 'C42987' or value.code = 'C60994' or value.code = 'C42935' or value.code = 'C60992' or value.code = 'C47912' or value.code = 'C42989' or value.code = 'C42962' or value.code = 'C42990' or value.code = 'C42991' or value.code = 'C47914' or value.code = 'C42993' or value.code = 'C42924' or value.code = 'C42994' or value.code = 'C42925' or value.code = 'C60995' or value.code = 'C47889' or value.code = 'C47898' or value.code = 'C42996' or value.code = 'C42998' or value.code = 'C42893' or value.code = 'C42897' or value.code = 'C60997' or value.code = 'C42905' or value.code = 'C42997' or value.code = 'C42910' or value.code = 'C42927' or value.code = 'C42931' or value.code = 'C42930' or value.code = 'C61004' or value.code = 'C61005' or value.code = 'C42964' or value.code = 'C42963' or value.code = 'C42999' or value.code = 'C61006' or value.code = 'C42985' or value.code = 'C42992' or value.code = 'C47892' or value.code = 'C47897' or value.code = 'C43000' or value.code = 'C43001' or value.code = 'C43002' or value.code = 'C43003'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p99foF9xEey5t-mahoHmrg" name="MedicationActivityText" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p99foV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CRuYQH3sEeyivuDeOiJBMg" name="MedicationActivityText" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CRuYQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p9_U0F9xEey5t-mahoHmrg" name="MedicationActivityRepeatNumber" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p9_U0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CRvmYH3sEeyivuDeOiJBMg" name="MedicationActivityRepeatNumber" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CRvmYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.repeatNumber.oclIsUndefined() or self.repeatNumber.isNullFlavorUndefined()) implies (not self.repeatNumber.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p-iucF9xEey5t-mahoHmrg" name="MedicationActivityMedicationSupplyOrder" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p-iucV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CSM5YH3sEeyivuDeOiJBMg" name="MedicationActivityMedicationSupplyOrder" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CSM5YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::MedicationSupplyOrder) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p_ES4F9xEey5t-mahoHmrg" name="MedicationActivityReactionObservation" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p_ES4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CSqzcH3sEeyivuDeOiJBMg" name="MedicationActivityReactionObservation" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CSqzcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ReactionObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::CAUS)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p_o6oF9xEey5t-mahoHmrg" name="MedicationActivityPerformer" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p_o6oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CTFqMH3sEeyivuDeOiJBMg" name="MedicationActivityPerformer" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CTFqMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->one(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(rim::Participation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qBbqYF9xEey5t-mahoHmrg" name="MedicationActivityInstructions" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qBbqYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CUszwH3sEeyivuDeOiJBMg" name="MedicationActivityInstructions" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CUszwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instructions) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q3GHEF9xEey5t-mahoHmrg" name="MedicationActivityIndication" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q3GHEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DBav0H3sEeyivuDeOiJBMg" name="MedicationActivityIndication" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DBav0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q4U2IF9xEey5t-mahoHmrg" name="MedicationActivityMedicationDispense" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q4U2IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DCcqkH3sEeyivuDeOiJBMg" name="MedicationActivityMedicationDispense" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DCcqkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::MedicationDispense) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q43BoF9xEey5t-mahoHmrg" name="MedicationActivityDrugVehicle" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q43BoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DC9n8H3sEeyivuDeOiJBMg" name="MedicationActivityDrugVehicle" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DC9n8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant2 | not participant.participantRole.oclIsUndefined() and participant.participantRole.oclIsKindOf(consol::DrugVehicle))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tlaHcF9xEey5t-mahoHmrg" name="MedicationActivityConsumable" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tlaHcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FUHyQH3sEeyivuDeOiJBMg" name="MedicationActivityConsumable" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FUHyQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.consumable->one(consumable : cda::Consumable | not consumable.oclIsUndefined() and consumable.oclIsKindOf(cda::Consumable))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2Mxl4F9xEey5t-mahoHmrg" name="MedicationActivityPrecondition" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2Mxl4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MzgU8H3sEeyivuDeOiJBMg" name="MedicationActivityPrecondition" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MzgU8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.precondition->exists(precondition : cda::Precondition | not precondition.oclIsUndefined() and precondition.oclIsKindOf(cda::Precondition))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5jNWMF9xEey5t-mahoHmrg" name="MedicationActivityConsumableMedicationInformation" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5jNWMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PnLWcH3sEeyivuDeOiJBMg" name="MedicationActivityConsumableMedicationInformation" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PnLWcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.consumable->excluding(null)->reject(manufacturedProduct->one(manufacturedProduct : cda::ManufacturedProduct | not manufacturedProduct.oclIsUndefined() and manufacturedProduct.oclIsKindOf(consol::MedicationInformation)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5jtsgF9xEey5t-mahoHmrg" name="MedicationActivityPreconditionTypeCode" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5jtsgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PnopcH3sEeyivuDeOiJBMg" name="MedicationActivityPreconditionTypeCode" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PnopcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.precondition->excluding(null)->reject(isDefined('typeCode') and typeCode=vocab::ActRelationshipType::PRCN)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5juTkF9xEey5t-mahoHmrg" name="MedicationActivityPreconditionPreconditionForSubstanceAdministration" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5juTkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pnopcn3sEeyivuDeOiJBMg" name="MedicationActivityPreconditionPreconditionForSubstanceAdministration" constrainedElement="_2GHbgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pnopc33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.precondition->excluding(null)->reject(criterion->one(criterion : cda::Criterion | not criterion.oclIsUndefined() and criterion.oclIsKindOf(consol::PreconditionForSubstanceAdministration)))</body>
         </specification>
@@ -3027,70 +3027,70 @@ value.codeSystem = '2.16.840.1.113883.3.26.1.1' and (value.code = 'C42887' or va
       <generalization xmi:id="_2H1SwhSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_nazskEbuEd6besF9iFIJkQ"/>
       </generalization>
-      <ownedOperation xmi:id="_p-iucl9xEey5t-mahoHmrg" name="getMedicationSupplyOrder" bodyCondition="_p-jVgV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_p-jVgV9xEey5t-mahoHmrg" name="body" constrainedElement="_p-iucl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_p-jVgl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CSNgcH3sEeyivuDeOiJBMg" name="getMedicationSupplyOrder" bodyCondition="_CSNgc33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CSNgc33sEeyivuDeOiJBMg" name="body" constrainedElement="_CSNgcH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CSNgdH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::MedicationSupplyOrder))->asSequence()->any(true).oclAsType(consol::MedicationSupplyOrder)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_p-iuc19xEey5t-mahoHmrg" type="_j3aTQBrTEeGo461UQq-B1g" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p-jVgF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_CSNgcX3sEeyivuDeOiJBMg" type="_j3aTQBrTEeGo461UQq-B1g" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CSNgcn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_p_ES4l9xEey5t-mahoHmrg" name="getReactionObservation" bodyCondition="_p_ES5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_p_ES5V9xEey5t-mahoHmrg" name="body" constrainedElement="_p_ES4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_p_ES5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CSqzcn3sEeyivuDeOiJBMg" name="getReactionObservation" bodyCondition="_CSqzdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CSqzdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_CSqzcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CSqzdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ReactionObservation))->asSequence()->any(true).oclAsType(consol::ReactionObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_p_ES419xEey5t-mahoHmrg" type="_2E_aIRSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p_ES5F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_CSqzc33sEeyivuDeOiJBMg" type="_2E_aIRSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CSqzdH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_qBbqYl9xEey5t-mahoHmrg" name="getInstructions" bodyCondition="_qBcRcF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qBcRcF9xEey5t-mahoHmrg" name="body" constrainedElement="_qBbqYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qBcRcV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CUta0H3sEeyivuDeOiJBMg" name="getInstructions" bodyCondition="_CUta033sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CUta033sEeyivuDeOiJBMg" name="body" constrainedElement="_CUta0H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CUta1H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instructions))->asSequence()->any(true).oclAsType(consol::Instructions)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qBbqY19xEey5t-mahoHmrg" type="_2G8h9RSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qBbqZF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_CUta0X3sEeyivuDeOiJBMg" type="_2G8h9RSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CUta0n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_q3GHEl9xEey5t-mahoHmrg" name="getIndications" bodyCondition="_q3GHFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_q3GHFV9xEey5t-mahoHmrg" name="body" constrainedElement="_q3GHEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_q3GHFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DBav0n3sEeyivuDeOiJBMg" name="getIndications" bodyCondition="_DBav1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DBav1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_DBav0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DBav1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication)).oclAsType(consol::Indication)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_q3GHE19xEey5t-mahoHmrg" type="_sHrUoBUSEeG6PvUxSTZnaw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_q3GHFF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DBav033sEeyivuDeOiJBMg" type="_sHrUoBUSEeG6PvUxSTZnaw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DBav1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_q4VdMF9xEey5t-mahoHmrg" name="getMedicationDispenses" bodyCondition="_q4VdM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_q4VdM19xEey5t-mahoHmrg" name="body" constrainedElement="_q4VdMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_q4VdNF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DCcqkn3sEeyivuDeOiJBMg" name="getMedicationDispenses" bodyCondition="_DCcqlX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DCcqlX3sEeyivuDeOiJBMg" name="body" constrainedElement="_DCcqkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DCcqln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::MedicationDispense)).oclAsType(consol::MedicationDispense)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_q4VdMV9xEey5t-mahoHmrg" type="_DpoGkBUUEeG6PvUxSTZnaw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_q4VdMl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DCcqk33sEeyivuDeOiJBMg" type="_DpoGkBUUEeG6PvUxSTZnaw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DCcqlH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_q43Bol9xEey5t-mahoHmrg" name="getDrugVehicles" bodyCondition="_q43BpV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_q43BpV9xEey5t-mahoHmrg" name="body" constrainedElement="_q43Bol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_q43osF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DC9n8n3sEeyivuDeOiJBMg" name="getDrugVehicles" bodyCondition="_DC9n9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DC9n9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_DC9n8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DC9n9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getParticipantRoles()->select(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(consol::DrugVehicle)).oclAsType(consol::DrugVehicle)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_q43Bo19xEey5t-mahoHmrg" type="_VBXq8BUTEeG6PvUxSTZnaw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_q43BpF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DC9n833sEeyivuDeOiJBMg" type="_VBXq8BUTEeG6PvUxSTZnaw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DC9n9H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -3100,44 +3100,44 @@ value.codeSystem = '2.16.840.1.113883.3.26.1.1' and (value.code = 'C42887' or va
 The FDA Amendments Act specifies the creation of a Unique Device Identification (UDI) System that requires the label of devices to bear a unique identifier that will standardize device identification and identify the device through distribution and use.  &#xD;
 The UDI should be sent in the participantRole/id.</body>
       </ownedComment>
-      <ownedRule xmi:id="_p_phsF9xEey5t-mahoHmrg" name="ProductInstanceTemplateId" constrainedElement="_2G2bUxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p_phsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CTGRQH3sEeyivuDeOiJBMg" name="ProductInstanceTemplateId" constrainedElement="_2G2bUxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CTGRQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.37')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p_qv0F9xEey5t-mahoHmrg" name="ProductInstanceClassCode" constrainedElement="_2G2bUxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p_qv0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CTHfYH3sEeyivuDeOiJBMg" name="ProductInstanceClassCode" constrainedElement="_2G2bUxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CTHfYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('classCode') and self.classCode=vocab::RoleClassRoot::MANU</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p_slAF9xEey5t-mahoHmrg" name="ProductInstanceId" constrainedElement="_2G2bUxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p_slAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CTItgH3sEeyivuDeOiJBMg" name="ProductInstanceId" constrainedElement="_2G2bUxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CTItgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_slW_sF9xEey5t-mahoHmrg" name="ProductInstanceScopingEntity" constrainedElement="_2G2bUxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_slW_sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EfepQH3sEeyivuDeOiJBMg" name="ProductInstanceScopingEntity" constrainedElement="_2G2bUxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EfepQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.scopingEntity->one(scopingEntity : cda::Entity | not scopingEntity.oclIsUndefined() and scopingEntity.oclIsKindOf(cda::Entity))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sl3WAF9xEey5t-mahoHmrg" name="ProductInstancePlayingDevice" constrainedElement="_2G2bUxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sl3WAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ef5gAH3sEeyivuDeOiJBMg" name="ProductInstancePlayingDevice" constrainedElement="_2G2bUxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ef5gAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.playingDevice->one(playingDevice : cda::Device | not playingDevice.oclIsUndefined() and playingDevice.oclIsKindOf(cda::Device))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5kOC0F9xEey5t-mahoHmrg" name="ProductInstanceScopingEntityId" constrainedElement="_2G2bUxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5kOC0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PoFVYH3sEeyivuDeOiJBMg" name="ProductInstanceScopingEntityId" constrainedElement="_2G2bUxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PoFVYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.scopingEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5kuZIF9xEey5t-mahoHmrg" name="ProductInstancePlayingDeviceCode" constrainedElement="_2G2bUxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5kuZIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PogMIH3sEeyivuDeOiJBMg" name="ProductInstancePlayingDeviceCode" constrainedElement="_2G2bUxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PogMIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.playingDevice->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
@@ -3168,46 +3168,46 @@ The UDI should be sent in the participantRole/id.</body>
           <body>not self.text.reference.value.oclIsUndefined() implies not self.getSection().text.getText(self.text.reference.value.substring(2, self.text.reference.value.size())).oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p_w2cF9xEey5t-mahoHmrg" name="InstructionsTemplateId" constrainedElement="_2G8h9RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p_w2cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CTMX4X3sEeyivuDeOiJBMg" name="InstructionsTemplateId" constrainedElement="_2G8h9RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CTMX4n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.20')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p_yroF9xEey5t-mahoHmrg" name="InstructionsClassCode" constrainedElement="_2G8h9RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p_yroV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CTONEH3sEeyivuDeOiJBMg" name="InstructionsClassCode" constrainedElement="_2G8h9RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CTONEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p_0g0F9xEey5t-mahoHmrg" name="InstructionsMoodCode" constrainedElement="_2G8h9RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p_0g0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CTPbMH3sEeyivuDeOiJBMg" name="InstructionsMoodCode" constrainedElement="_2G8h9RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CTPbMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::INT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qAWsUF9xEey5t-mahoHmrg" name="InstructionsCodeP" constrainedElement="_2G8h9RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qAWsUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CTvxgH3sEeyivuDeOiJBMg" name="InstructionsCodeP" constrainedElement="_2G8h9RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CTvxgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_p_1u8F9xEey5t-mahoHmrg" name="InstructionsCode" constrainedElement="_2G8h9RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_p_1u8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CTQpUH3sEeyivuDeOiJBMg" name="InstructionsCode" constrainedElement="_2G8h9RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CTQpUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qA430F9xEey5t-mahoHmrg" name="InstructionsText" constrainedElement="_2G8h9RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qA430V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CUNrkH3sEeyivuDeOiJBMg" name="InstructionsText" constrainedElement="_2G8h9RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CUNrkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qA5e4F9xEey5t-mahoHmrg" name="InstructionsStatusCode" constrainedElement="_2G8h9RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qA5e4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CUO5sH3sEeyivuDeOiJBMg" name="InstructionsStatusCode" constrainedElement="_2G8h9RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CUO5sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
@@ -3234,52 +3234,52 @@ value.code = 'completed')</body>
           <body>self.participant->select(par : cda::Participant2 | par.participantRole.oclIsKindOf(consol::ProductInstance))->forAll(p : cda::Participant2 | p.typeCode=vocab::ParticipationType::PRD)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qBcRcl9xEey5t-mahoHmrg" name="NonMedicinalSupplyActivityTemplateId" constrainedElement="_2HIvMBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qBcRc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CUta1X3sEeyivuDeOiJBMg" name="NonMedicinalSupplyActivityTemplateId" constrainedElement="_2HIvMBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CUta1n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.50')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qBeGoF9xEey5t-mahoHmrg" name="NonMedicinalSupplyActivityClassCode" constrainedElement="_2HIvMBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qBeGoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CUvQAH3sEeyivuDeOiJBMg" name="NonMedicinalSupplyActivityClassCode" constrainedElement="_2HIvMBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CUvQAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassSupply::SPLY</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qBfUwF9xEey5t-mahoHmrg" name="NonMedicinalSupplyActivityMoodCode" constrainedElement="_2HIvMBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qBfUwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CUweIH3sEeyivuDeOiJBMg" name="NonMedicinalSupplyActivityMoodCode" constrainedElement="_2HIvMBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CUweIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentSubstanceMood) and 
 let value : vocab::x_DocumentSubstanceMood = self.moodCode.oclAsType(vocab::x_DocumentSubstanceMood) in 
 value = vocab::x_DocumentSubstanceMood::EVN or value = vocab::x_DocumentSubstanceMood::INT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qCCHUF9xEey5t-mahoHmrg" name="NonMedicinalSupplyActivityId" constrainedElement="_2HIvMBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qCCHUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CVMjAH3sEeyivuDeOiJBMg" name="NonMedicinalSupplyActivityId" constrainedElement="_2HIvMBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CVMjAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qCD8gF9xEey5t-mahoHmrg" name="NonMedicinalSupplyActivityStatusCode" constrainedElement="_2HIvMBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qCD8gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CVNxIH3sEeyivuDeOiJBMg" name="NonMedicinalSupplyActivityStatusCode" constrainedElement="_2HIvMBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CVNxIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qCFKoF9xEey5t-mahoHmrg" name="NonMedicinalSupplyActivityEffectiveTime" constrainedElement="_2HIvMBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qCFKoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CVO_QH3sEeyivuDeOiJBMg" name="NonMedicinalSupplyActivityEffectiveTime" constrainedElement="_2HIvMBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CVO_QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime->isEmpty() or self.effectiveTime->exists(element | element.isNullFlavorUndefined())) implies (( not self.effectiveTime->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qCGYwF9xEey5t-mahoHmrg" name="NonMedicinalSupplyActivityQuantity" constrainedElement="_2HIvMBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qCGYwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CVPmUH3sEeyivuDeOiJBMg" name="NonMedicinalSupplyActivityQuantity" constrainedElement="_2HIvMBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CVQNYH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.quantity.oclIsUndefined() or self.quantity.isNullFlavorUndefined()) implies (not self.quantity.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qCokQF9xEey5t-mahoHmrg" name="NonMedicinalSupplyActivityProductInstance" constrainedElement="_2HIvMBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qCokQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CVrEIH3sEeyivuDeOiJBMg" name="NonMedicinalSupplyActivityProductInstance" constrainedElement="_2HIvMBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CVrEIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->one(participant : cda::Participant2 | not participant.participantRole.oclIsUndefined() and participant.participantRole.oclIsKindOf(consol::ProductInstance))</body>
         </specification>
@@ -3287,15 +3287,15 @@ value = vocab::x_DocumentSubstanceMood::EVN or value = vocab::x_DocumentSubstanc
       <generalization xmi:id="_2HnQUhSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_3gL0sEbuEd6besF9iFIJkQ"/>
       </generalization>
-      <ownedOperation xmi:id="_qCokQl9xEey5t-mahoHmrg" name="getProductInstance" bodyCondition="_qCokRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qCokRV9xEey5t-mahoHmrg" name="body" constrainedElement="_qCokQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qCokRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CVrEIn3sEeyivuDeOiJBMg" name="getProductInstance" bodyCondition="_CVrrMH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CVrrMH3sEeyivuDeOiJBMg" name="body" constrainedElement="_CVrEIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CVrrMX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getParticipantRoles()->select(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(consol::ProductInstance))->asSequence()->any(true).oclAsType(consol::ProductInstance)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qCokQ19xEey5t-mahoHmrg" type="_2G2bUxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qCokRF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_CVrEI33sEeyivuDeOiJBMg" type="_2G2bUxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CVrEJH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -3325,60 +3325,60 @@ Many systems display the nested Problem Observation with the most recent author
           <body>not self.effectiveTime.high.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qCokR19xEey5t-mahoHmrg" name="ProblemConcernActTemplateId" constrainedElement="_2H6yUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qCokSF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CVrrMn3sEeyivuDeOiJBMg" name="ProblemConcernActTemplateId" constrainedElement="_2H6yUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CVrrM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.3')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qCrAgF9xEey5t-mahoHmrg" name="ProblemConcernActClassCode" constrainedElement="_2H6yUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qCrAgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CVs5UH3sEeyivuDeOiJBMg" name="ProblemConcernActClassCode" constrainedElement="_2H6yUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CVs5UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qCs1sF9xEey5t-mahoHmrg" name="ProblemConcernActMoodCode" constrainedElement="_2H6yUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qCs1sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CVuugH3sEeyivuDeOiJBMg" name="ProblemConcernActMoodCode" constrainedElement="_2H6yUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CVuugX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qCuq4F9xEey5t-mahoHmrg" name="ProblemConcernActId" constrainedElement="_2H6yUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qCuq4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CVv8oH3sEeyivuDeOiJBMg" name="ProblemConcernActId" constrainedElement="_2H6yUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CVv8oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qCxHIF9xEey5t-mahoHmrg" name="ProblemConcernActCodeP" constrainedElement="_2H6yUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qCxHIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CVxx0H3sEeyivuDeOiJBMg" name="ProblemConcernActCodeP" constrainedElement="_2H6yUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CVxx0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qCv5AF9xEey5t-mahoHmrg" name="ProblemConcernActCode" constrainedElement="_2H6yUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qCv5AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CVwjsH3sEeyivuDeOiJBMg" name="ProblemConcernActCode" constrainedElement="_2H6yUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CVwjsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'CONC' and value.codeSystem = '2.16.840.1.113883.5.6')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qCyVQF9xEey5t-mahoHmrg" name="ProblemConcernActStatusCode" constrainedElement="_2H6yUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qCyVQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CVy_8H3sEeyivuDeOiJBMg" name="ProblemConcernActStatusCode" constrainedElement="_2H6yUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CVy_8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'active' or value.code = 'suspended' or value.code = 'aborted' or value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qDVu4F9xEey5t-mahoHmrg" name="ProblemConcernActEffectiveTime" constrainedElement="_2H6yUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qDVu4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CWOdwH3sEeyivuDeOiJBMg" name="ProblemConcernActEffectiveTime" constrainedElement="_2H6yUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CWOdwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rD07gF9xEey5t-mahoHmrg" name="ProblemConcernActProblemObservation" constrainedElement="_2H6yUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rD07gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DMW0gH3sEeyivuDeOiJBMg" name="ProblemConcernActProblemObservation" constrainedElement="_2H6yUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DMW0gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
@@ -3386,15 +3386,15 @@ value.code = 'active' or value.code = 'suspended' or value.code = 'aborted' or v
       <generalization xmi:id="_2IINsxSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_rD07gl9xEey5t-mahoHmrg" name="getProblemObservations" bodyCondition="_rD07hV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rD07hV9xEey5t-mahoHmrg" name="body" constrainedElement="_rD07gl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rD07hl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DMW0gn3sEeyivuDeOiJBMg" name="getProblemObservations" bodyCondition="_DMXbkn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DMXbkn3sEeyivuDeOiJBMg" name="body" constrainedElement="_DMW0gn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DMXbk33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation)).oclAsType(consol::ProblemObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rD07g19xEey5t-mahoHmrg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rD07hF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DMXbkH3sEeyivuDeOiJBMg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DMXbkX3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -3404,384 +3404,384 @@ value.code = 'active' or value.code = 'suspended' or value.code = 'aborted' or v
 &#xD;
 The CCD is a core data set of the most relevant administrative, demographic, and clinical information facts about a patient's healthcare, covering one or more healthcare encounters. It provides a means for one healthcare practitioner, system, or setting to aggregate all of the pertinent data about a patient and forward it to another practitioner, system, or setting to support the continuity of care. The primary use case for the CCD is to provide a snapshot in time containing the pertinent clinical, demographic, and administrative data for a specific patient . More specific use cases, such as a Discharge Summary or Progress Note, are available as alternative documents in this guide.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qDW9AF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qDW9AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CWPE0H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CWPE0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.2')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qDaAUF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentCodeP" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qDaAUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CWSIIH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentCodeP" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CWSIIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qDYLIF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentCode" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qDYLIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CWQS8H3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentCode" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CWQS8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '34133-9' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qDb1gF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentLanguageCode" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qDb1gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CWT9UH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentLanguageCode" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CWT9UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.languageCode.oclIsUndefined() or self.languageCode.isNullFlavorUndefined()) implies (not self.languageCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tbn5UF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentDocumentationOf" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tbn5UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FLvSUH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentDocumentationOf" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FLvSUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->one(documentationOf : cda::DocumentationOf | not documentationOf.oclIsUndefined() and documentationOf.oclIsKindOf(cda::DocumentationOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tcol8F9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentAuthor" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tcol8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FMijkH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentAuthor" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FMjKoH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(cda::Author))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tdloMF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentAllergiesSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tdloMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FNXqAH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentAllergiesSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FNXqAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_teFXcF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentMedicationsSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_teFXcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FNx5sH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentMedicationsSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FNx5sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_teiDYF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentProblemSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_teiDYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FOLiUH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentProblemSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FOLiUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tfDn0F9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentProceduresSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tfDn0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FOlK8H3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentProceduresSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FOlyAH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tffssF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentResultsSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tffssV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FPDFAH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentResultsSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FPDFAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tgDGUF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentAdvanceDirectivesSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tgDGUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FPd7wH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentAdvanceDirectivesSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FPd7wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdvanceDirectivesSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tghAYF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentEncountersSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tghAYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FP5ZkH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentEncountersSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FP5ZkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::EncountersSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_thB9wF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentFamilyHistorySection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_thB9wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FQTCMH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentFamilyHistorySection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FQTCMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_thfQwF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentFunctionalStatusSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_thfQwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FQtR4H3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentFunctionalStatusSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FQtR4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FunctionalStatusSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tiA1MF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentImmunizationsSectionEntriesOptional" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tiA1MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FRHhkH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentImmunizationsSectionEntriesOptional" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FRHhkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tievQF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentMedicalEquipmentSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tievQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FRjmcH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentMedicalEquipmentSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FRjmcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicalEquipmentSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ti_FkF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentPayersSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ti_FkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FR92IH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentPayersSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FR92IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PayersSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tjfb4F9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentPlanOfCareSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tjfb4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FSYs4H3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentPlanOfCareSection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FSYs4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfCareSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tj-kEF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentSocialHistorySection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tj-kEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FS31EH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentSocialHistorySection" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FS31EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tkceIF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentVitalSignsSectionEntriesOptional" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tkceIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FTSr0H3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentVitalSignsSectionEntriesOptional" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FTSr0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5lvs0F9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentDocumentationOfServiceEventEffectiveTimeHigh" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5lvs0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PpVSkH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentDocumentationOfServiceEventEffectiveTimeHigh" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PpVSkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((high.oclIsUndefined() or high.isNullFlavorUndefined()) implies (not high.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5lwT4F9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentDocumentationOfServiceEventEffectiveTimeLow" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5lwT4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PpVSkn3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentDocumentationOfServiceEventEffectiveTimeLow" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PpVSk33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((low.oclIsUndefined() or low.isNullFlavorUndefined()) implies (not low.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5mwZcF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntityHasNationalProviderIdentifier" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5mwZcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PqOqcH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntityHasNationalProviderIdentifier" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PqOqcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PRF).assignedEntity->excluding(null)->reject(id->exists(root='2.16.840.1.113883.4.6'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5mwZcl9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntityCode" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5mwZc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PqPRgH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntityCode" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PqPRgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PRF).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 not value.codeSystem.oclIsUndefined() or not value.codeSystemName.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5mxAgF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntityId" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5mxAgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PqPRgn3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntityId" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PqPRg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PRF).assignedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5mxAgl9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentDocumentationOfServiceEventPerformerTypeCode" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5mxAg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PqPRhH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentDocumentationOfServiceEventPerformerTypeCode" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PqPRhX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PRF)->select(typeCode = vocab::x_ServiceEventPerformer::PRF)->reject(typeCode=vocab::x_ServiceEventPerformer::PRF)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5mxAhF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntity" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5mxAhV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PqP4kH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntity" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PqP4kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PRF)->select(typeCode = vocab::x_ServiceEventPerformer::PRF)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5mxnkF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentDocumentationOfServiceEventClassCode" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5mxnkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PqP4kn3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentDocumentationOfServiceEventClassCode" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PqP4k33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(isDefined('classCode') and classCode=vocab::ActClassRoot::PCPR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5mxnkl9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentDocumentationOfServiceEventEffectiveTime" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5mxnk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PqP4lH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentDocumentationOfServiceEventEffectiveTime" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PqP4lX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5mxnlF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentDocumentationOfServiceEventPerformer" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5mxnlV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PqP4ln3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentDocumentationOfServiceEventPerformer" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PqP4l33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(performer->select(performer : cda::Performer1 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer1))->select(typeCode = vocab::x_ServiceEventPerformer::PRF)->notEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5myOoF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentDocumentationOfServiceEvent" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5myOoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PqQfoH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentDocumentationOfServiceEvent" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PqQfoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null)->reject(serviceEvent->one(serviceEvent : cda::ServiceEvent | not serviceEvent.oclIsUndefined() and serviceEvent.oclIsKindOf(cda::ServiceEvent)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5nxGEF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentAuthorAssignedAuthorHasAssignedPersonOrRepresentedOrganization" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5nxGEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PrFmEH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentAuthorAssignedAuthorHasAssignedPersonOrRepresentedOrganization" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PrFmEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject((not assignedPerson.oclIsUndefined()) or (not representedOrganization.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5nxGEl9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentAuthorAssignedAuthorHasRepresentOrganization" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5nxGE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PrFmEn3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentAuthorAssignedAuthorHasRepresentOrganization" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PrFmE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject((not representedOrganization.oclIsUndefined() and assignedPerson.oclIsUndefined() and assignedAuthoringDevice.oclIsUndefined()) implies id->exists(id | not id.isNullFlavorUndefined() and id.nullFlavor = vocab::NullFlavor::NA))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5nxtIF9xEey5t-mahoHmrg" name="ContinuityOfCareDocumentAuthorAssignedAuthor" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5nxtIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PrGNIH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocumentAuthorAssignedAuthor" constrainedElement="_2IJb0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PrGNIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null)->reject(assignedAuthor->one(assignedAuthor : cda::AssignedAuthor | not assignedAuthor.oclIsUndefined() and assignedAuthor.oclIsKindOf(cda::AssignedAuthor)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_2PQJchSVEeGGzu7fmW9pXw" general="_2DNRcBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_tdloMl9xEey5t-mahoHmrg" name="getAllergiesSection" bodyCondition="_tdloNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tdloNV9xEey5t-mahoHmrg" name="body" constrainedElement="_tdloMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tdloNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FNXqAn3sEeyivuDeOiJBMg" name="getAllergiesSection" bodyCondition="_FNXqBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FNXqBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FNXqAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FNXqBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSection))->asSequence()->any(true).oclAsType(consol::AllergiesSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tdloM19xEey5t-mahoHmrg" type="_2LMIwBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tdloNF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FNXqA33sEeyivuDeOiJBMg" type="_2LMIwBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FNXqBH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_teFXcl9xEey5t-mahoHmrg" name="getMedicationsSection" bodyCondition="_teFXdV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_teFXdV9xEey5t-mahoHmrg" name="body" constrainedElement="_teFXcl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_teFXdl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FNx5sn3sEeyivuDeOiJBMg" name="getMedicationsSection" bodyCondition="_FNx5tX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FNx5tX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FNx5sn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FNx5tn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSection))->asSequence()->any(true).oclAsType(consol::MedicationsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_teFXc19xEey5t-mahoHmrg" type="_2NIpgBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_teFXdF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FNx5s33sEeyivuDeOiJBMg" type="_2NIpgBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FNx5tH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_teiqcF9xEey5t-mahoHmrg" name="getProblemSection" bodyCondition="_teiqc19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_teiqc19xEey5t-mahoHmrg" name="body" constrainedElement="_teiqcF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_teiqdF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FOLiUn3sEeyivuDeOiJBMg" name="getProblemSection" bodyCondition="_FOLiVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FOLiVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FOLiUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FOLiVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSection))->asSequence()->any(true).oclAsType(consol::ProblemSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_teiqcV9xEey5t-mahoHmrg" type="_2LSPYBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_teiqcl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FOLiU33sEeyivuDeOiJBMg" type="_2LSPYBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FOLiVH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tfDn0l9xEey5t-mahoHmrg" name="getProceduresSection" bodyCondition="_tfDn1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tfDn1V9xEey5t-mahoHmrg" name="body" constrainedElement="_tfDn0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tfDn1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FOlyAX3sEeyivuDeOiJBMg" name="getProceduresSection" bodyCondition="_FOlyBH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FOlyBH3sEeyivuDeOiJBMg" name="body" constrainedElement="_FOlyAX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FOlyBX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSection))->asSequence()->any(true).oclAsType(consol::ProceduresSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tfDn019xEey5t-mahoHmrg" type="_2OAzQRSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tfDn1F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FOlyAn3sEeyivuDeOiJBMg" type="_2OAzQRSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FOlyA33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tffssl9xEey5t-mahoHmrg" name="getResultsSection" bodyCondition="_tfgTwl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tfgTwl9xEey5t-mahoHmrg" name="body" constrainedElement="_tffssl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tfgTw19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FPDsEH3sEeyivuDeOiJBMg" name="getResultsSection" bodyCondition="_FPDsE33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FPDsE33sEeyivuDeOiJBMg" name="body" constrainedElement="_FPDsEH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FPDsFH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSection))->asSequence()->any(true).oclAsType(consol::ResultsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tfgTwF9xEey5t-mahoHmrg" type="_2Js7AxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tfgTwV9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FPDsEX3sEeyivuDeOiJBMg" type="_2Js7AxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FPDsEn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tgDGUl9xEey5t-mahoHmrg" name="getAdvanceDirectivesSection" bodyCondition="_tgDGVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tgDGVV9xEey5t-mahoHmrg" name="body" constrainedElement="_tgDGUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tgDGVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FPd7wn3sEeyivuDeOiJBMg" name="getAdvanceDirectivesSection" bodyCondition="_FPd7xX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FPd7xX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FPd7wn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FPd7xn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdvanceDirectivesSection))->asSequence()->any(true).oclAsType(consol::AdvanceDirectivesSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tgDGU19xEey5t-mahoHmrg" type="_2KgzUBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tgDGVF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FPd7w33sEeyivuDeOiJBMg" type="_2KgzUBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FPd7xH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tghncF9xEey5t-mahoHmrg" name="getEncountersSection" bodyCondition="_tghnc19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tghnc19xEey5t-mahoHmrg" name="body" constrainedElement="_tghncF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tghndF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FP5Zkn3sEeyivuDeOiJBMg" name="getEncountersSection" bodyCondition="_FP6AoX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FP6AoX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FP5Zkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FP6Aon3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::EncountersSection))->asSequence()->any(true).oclAsType(consol::EncountersSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tghncV9xEey5t-mahoHmrg" type="_2LWg0BSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tghncl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FP5Zk33sEeyivuDeOiJBMg" type="_2LWg0BSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FP6AoH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_thB9wl9xEey5t-mahoHmrg" name="getFamilyHistorySection" bodyCondition="_thB9xV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_thB9xV9xEey5t-mahoHmrg" name="body" constrainedElement="_thB9wl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_thB9xl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FQTpQH3sEeyivuDeOiJBMg" name="getFamilyHistorySection" bodyCondition="_FQTpQ33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FQTpQ33sEeyivuDeOiJBMg" name="body" constrainedElement="_FQTpQH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FQTpRH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection))->asSequence()->any(true).oclAsType(consol::FamilyHistorySection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_thB9w19xEey5t-mahoHmrg" type="_2IWQIxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_thB9xF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FQTpQX3sEeyivuDeOiJBMg" type="_2IWQIxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FQTpQn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_thfQwl9xEey5t-mahoHmrg" name="getFunctionalStatusSection" bodyCondition="_thf30l9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_thf30l9xEey5t-mahoHmrg" name="body" constrainedElement="_thfQwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_thf3019xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FQt48H3sEeyivuDeOiJBMg" name="getFunctionalStatusSection" bodyCondition="_FQt4833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FQt4833sEeyivuDeOiJBMg" name="body" constrainedElement="_FQt48H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FQt49H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FunctionalStatusSection))->asSequence()->any(true).oclAsType(consol::FunctionalStatusSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_thf30F9xEey5t-mahoHmrg" type="_2KKOBhSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_thf30V9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FQt48X3sEeyivuDeOiJBMg" type="_2KKOBhSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FQt48n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tiA1Ml9xEey5t-mahoHmrg" name="getImmunizationsSectionEntriesOptional" bodyCondition="_tiA1NV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tiA1NV9xEey5t-mahoHmrg" name="body" constrainedElement="_tiA1Ml9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tiA1Nl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FRHhkn3sEeyivuDeOiJBMg" name="getImmunizationsSectionEntriesOptional" bodyCondition="_FRHhlX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FRHhlX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FRHhkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FRHhln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::ImmunizationsSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tiA1M19xEey5t-mahoHmrg" type="_EuPloBVeEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tiA1NF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FRHhk33sEeyivuDeOiJBMg" type="_EuPloBVeEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FRHhlH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tievQl9xEey5t-mahoHmrg" name="getMedicalEquipmentSection" bodyCondition="_tievRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tievRV9xEey5t-mahoHmrg" name="body" constrainedElement="_tievQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tievRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FRjmcn3sEeyivuDeOiJBMg" name="getMedicalEquipmentSection" bodyCondition="_FRjmdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FRjmdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FRjmcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FRjmdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicalEquipmentSection))->asSequence()->any(true).oclAsType(consol::MedicalEquipmentSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tievQ19xEey5t-mahoHmrg" type="_2KEucBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tievRF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FRjmc33sEeyivuDeOiJBMg" type="_2KEucBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FRjmdH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_ti_soF9xEey5t-mahoHmrg" name="getPayersSection" bodyCondition="_ti_so19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ti_so19xEey5t-mahoHmrg" name="body" constrainedElement="_ti_soF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ti_spF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FR-dMH3sEeyivuDeOiJBMg" name="getPayersSection" bodyCondition="_FR-dM33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FR-dM33sEeyivuDeOiJBMg" name="body" constrainedElement="_FR-dMH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FR-dNH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PayersSection))->asSequence()->any(true).oclAsType(consol::PayersSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ti_soV9xEey5t-mahoHmrg" type="_2MV_UBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ti_sol9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FR-dMX3sEeyivuDeOiJBMg" type="_2MV_UBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FR-dMn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tjfb4l9xEey5t-mahoHmrg" name="getPlanOfCareSection" bodyCondition="_tjfb5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tjfb5V9xEey5t-mahoHmrg" name="body" constrainedElement="_tjfb4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tjfb5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FSYs4n3sEeyivuDeOiJBMg" name="getPlanOfCareSection" bodyCondition="_FSYs5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FSYs5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_FSYs4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FSYs5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfCareSection))->asSequence()->any(true).oclAsType(consol::PlanOfCareSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tjfb419xEey5t-mahoHmrg" type="_2NP-QxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tjfb5F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FSYs433sEeyivuDeOiJBMg" type="_2NP-QxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FSYs5H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tj_LIF9xEey5t-mahoHmrg" name="getSocialHistorySection" bodyCondition="_tj_LI19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tj_LI19xEey5t-mahoHmrg" name="body" constrainedElement="_tj_LIF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tj_LJF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FS31En3sEeyivuDeOiJBMg" name="getSocialHistorySection" bodyCondition="_FS31FX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FS31FX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FS31En3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FS31Fn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection))->asSequence()->any(true).oclAsType(consol::SocialHistorySection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tj_LIV9xEey5t-mahoHmrg" type="_2JKvgBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tj_LIl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FS31E33sEeyivuDeOiJBMg" type="_2JKvgBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FS31FH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tkdFMF9xEey5t-mahoHmrg" name="getVitalSignsSectionEntriesOptional" bodyCondition="_tkdFM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tkdFM19xEey5t-mahoHmrg" name="body" constrainedElement="_tkdFMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tkdFNF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FTSr0n3sEeyivuDeOiJBMg" name="getVitalSignsSectionEntriesOptional" bodyCondition="_FTSr1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FTSr1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_FTSr0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FTSr1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::VitalSignsSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tkdFMV9xEey5t-mahoHmrg" type="_bRH8sBVeEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tkdFMl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FTSr033sEeyivuDeOiJBMg" type="_bRH8sBVeEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FTSr1H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -3789,40 +3789,40 @@ not value.codeSystem.oclIsUndefined() or not value.codeSystemName.oclIsUndefined
       <ownedComment xmi:id="_2JJhYBSVEeGGzu7fmW9pXw" annotatedElement="_2IWQIxSVEeGGzu7fmW9pXw">
         <body>This section contains data defining the patient's genetic relatives in terms of possible or relevant health risk factors that have a potential impact on the patient's healthcare risk profile.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qEWbgF9xEey5t-mahoHmrg" name="FamilyHistorySectionTemplateId" constrainedElement="_2IWQIxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qEWbgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CW7BUH3sEeyivuDeOiJBMg" name="FamilyHistorySectionTemplateId" constrainedElement="_2IWQIxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CW7BUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.15')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qEXpoF9xEey5t-mahoHmrg" name="FamilyHistorySectionCode" constrainedElement="_2IWQIxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qEXpoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CW7oYH3sEeyivuDeOiJBMg" name="FamilyHistorySectionCode" constrainedElement="_2IWQIxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CW7oYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10157-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qEY3wF9xEey5t-mahoHmrg" name="FamilyHistorySectionCodeP" constrainedElement="_2IWQIxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qEY3wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CW82gH3sEeyivuDeOiJBMg" name="FamilyHistorySectionCodeP" constrainedElement="_2IWQIxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CW82gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qEas8F9xEey5t-mahoHmrg" name="FamilyHistorySectionTitle" constrainedElement="_2IWQIxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qEas8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CW-EoH3sEeyivuDeOiJBMg" name="FamilyHistorySectionTitle" constrainedElement="_2IWQIxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CW-EoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qEb7EF9xEey5t-mahoHmrg" name="FamilyHistorySectionText" constrainedElement="_2IWQIxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qEb7EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CW_SwH3sEeyivuDeOiJBMg" name="FamilyHistorySectionText" constrainedElement="_2IWQIxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CW_SwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qFAi0F9xEey5t-mahoHmrg" name="FamilyHistorySectionFamilyHistory" constrainedElement="_2IWQIxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qFBJ4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CXea8H3sEeyivuDeOiJBMg" name="FamilyHistorySectionFamilyHistory" constrainedElement="_2IWQIxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CXea8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.organizer.oclIsUndefined() and entry.organizer.oclIsKindOf(consol::FamilyHistoryOrganizer))</body>
         </specification>
@@ -3830,15 +3830,15 @@ value.code = '10157-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_2JJhYhSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_qFBJ4V9xEey5t-mahoHmrg" name="getFamilyHistories" bodyCondition="_qFBJ5F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qFBJ5F9xEey5t-mahoHmrg" name="body" constrainedElement="_qFBJ4V9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qFBJ5V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CXea8n3sEeyivuDeOiJBMg" name="getFamilyHistories" bodyCondition="_CXea9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CXea9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_CXea8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CXea9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::FamilyHistoryOrganizer)).oclAsType(consol::FamilyHistoryOrganizer)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qFBJ4l9xEey5t-mahoHmrg" type="_2IbIoBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qFBJ419xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_CXea833sEeyivuDeOiJBMg" type="_2IbIoBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CXea9H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -3846,116 +3846,116 @@ value.code = '10157-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_nxLqwCEhEeGCQOQgxKvcXw">
         <body>The Family History Oranizer associates a set of observations with a family member. For example, the Family History Organizer can group a set of observations about the patient's father.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qFBJ5l9xEey5t-mahoHmrg" name="FamilyHistoryOrganizerTemplateId" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qFBJ519xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CXea933sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerTemplateId" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CXfCAH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.45')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qFC_EF9xEey5t-mahoHmrg" name="FamilyHistoryOrganizerClassCode" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qFC_EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CXgQIH3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerClassCode" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CXgQIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryOrganizer::CLUSTER</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qFE0QF9xEey5t-mahoHmrg" name="FamilyHistoryOrganizerMoodCode" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qFE0QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CXiFUH3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerMoodCode" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CXiFUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::ActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qFJFsF9xEey5t-mahoHmrg" name="FamilyHistoryOrganizerStatusCodeP" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qFJFsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CXlIoH3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerStatusCodeP" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CXlIoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qFGCYF9xEey5t-mahoHmrg" name="FamilyHistoryOrganizerStatusCode" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qFGpcF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CXjTcH3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerStatusCode" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CXjTcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qLQ70F9xEey5t-mahoHmrg" name="FamilyHistoryOrganizerFamilyHistoryObservation" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qLQ70V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CcIRcH3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerFamilyHistoryObservation" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CcIRcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->exists(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::FamilyHistoryObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uB1kwF9xEey5t-mahoHmrg" name="FamilyHistoryOrganizerSubject" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uB1kwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fqo00H3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerSubject" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fqo00X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.subject->one(subject : cda::Subject | not subject.oclIsUndefined() and subject.oclIsKindOf(cda::Subject))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5qd0wF9xEey5t-mahoHmrg" name="FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonAdministrativeGenderCode" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5qeb0F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PtQwUH3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonAdministrativeGenderCode" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PtQwUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.subject->excluding(null).relatedSubject->excluding(null).subject->excluding(null)->reject((administrativeGenderCode.oclIsUndefined() or administrativeGenderCode.isNullFlavorUndefined()) implies (not administrativeGenderCode.oclIsUndefined() and administrativeGenderCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = administrativeGenderCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.1' and (value.code = 'F' or value.code = 'M' or value.code = 'UN')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5qeb0V9xEey5t-mahoHmrg" name="FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonAdministrativeGenderCodeP" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5qeb0l9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PtQwUn3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonAdministrativeGenderCodeP" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PtQwU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.subject->excluding(null).relatedSubject->excluding(null).subject->excluding(null)->reject((administrativeGenderCode.oclIsUndefined() or administrativeGenderCode.isNullFlavorUndefined()) implies (not administrativeGenderCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5qeb019xEey5t-mahoHmrg" name="FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonBirthTime" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5qeb1F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PtQwVH3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonBirthTime" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PtQwVX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.subject->excluding(null).relatedSubject->excluding(null).subject->excluding(null)->reject((birthTime.oclIsUndefined() or birthTime.isNullFlavorUndefined()) implies (not birthTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5qfC4F9xEey5t-mahoHmrg" name="FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonSDTCDeceasedInd" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5qfC4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PtQwVn3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonSDTCDeceasedInd" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PtQwV33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.subject->excluding(null).relatedSubject->excluding(null).subject->excluding(null)->reject((sDTCDeceasedInd.oclIsUndefined() or sDTCDeceasedInd.isNullFlavorUndefined()) implies (not sDTCDeceasedInd.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5qfC4l9xEey5t-mahoHmrg" name="FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonSDTCDeceasedTime" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5qfC419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PtRXYH3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonSDTCDeceasedTime" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PtRXYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.subject->excluding(null).relatedSubject->excluding(null).subject->excluding(null)->reject((sDTCDeceasedTime.oclIsUndefined() or sDTCDeceasedTime.isNullFlavorUndefined()) implies (not sDTCDeceasedTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5qfC5F9xEey5t-mahoHmrg" name="FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonSDTCId" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5qfC5V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PtRXYn3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonSDTCId" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PtRXY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.subject->excluding(null).relatedSubject->excluding(null).subject->excluding(null)->reject((sDTCId->isEmpty() or sDTCId->exists(element | element.isNullFlavorUndefined())) implies (not sDTCId->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5qfp8F9xEey5t-mahoHmrg" name="FamilyHistoryOrganizerSubjectRelatedSubjectClassCode" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5qfp8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PtRXZH3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerSubjectRelatedSubjectClassCode" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PtRXZX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.subject->excluding(null).relatedSubject->excluding(null)->reject(isDefined('classCode') and classCode=vocab::x_DocumentSubject::PRS)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5qfp8l9xEey5t-mahoHmrg" name="FamilyHistoryOrganizerSubjectRelatedSubjectCode" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5qfp819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PtR-cH3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerSubjectRelatedSubjectCode" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PtR-cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.subject->excluding(null).relatedSubject->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.111' and (value.code = 'ADOPT' or value.code = 'AUNT' or value.code = 'CHILD' or value.code = 'CHLDINLAW' or value.code = 'COUSN' or value.code = 'DOMPART' or value.code = 'FAMMEMB' or value.code = 'CHLDFOST' or value.code = 'GRNDCHILD' or value.code = 'GPARNT' or value.code = 'GRPRN' or value.code = 'GGRPRN' or value.code = 'HSIB' or value.code = 'MAUNT' or value.code = 'MCOUSN' or value.code = 'MGRPRN' or value.code = 'MGGRPRN' or value.code = 'MUNCLE' or value.code = 'NCHILD' or value.code = 'NPRN' or value.code = 'NSIB' or value.code = 'NIENEPH' or value.code = 'PRN' or value.code = 'PRNINLAW' or value.code = 'PAUNT' or value.code = 'PCOUSN' or value.code = 'PGRPRN' or value.code = 'PGGRPRN' or value.code = 'PUNCLE' or value.code = 'SIB' or value.code = 'SIBINLAW' or value.code = 'SIGOTHR' or value.code = 'SPS' or value.code = 'STEP' or value.code = 'STPPRN' or value.code = 'STPSIB' or value.code = 'UNCLE')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5qfp9F9xEey5t-mahoHmrg" name="FamilyHistoryOrganizerSubjectRelatedSubjectCodeP" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5qfp9V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PtR-cn3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerSubjectRelatedSubjectCodeP" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PtR-c33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.subject->excluding(null).relatedSubject->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5qgRAF9xEey5t-mahoHmrg" name="FamilyHistoryOrganizerSubjectRelatedSubjectSubject" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5qgRAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PtR-dH3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerSubjectRelatedSubjectSubject" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PtR-dX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.subject->excluding(null).relatedSubject->excluding(null)->reject(subject->one(subject : cda::SubjectPerson | not subject.oclIsUndefined() and subject.oclIsKindOf(cda::SubjectPerson)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5qgRAl9xEey5t-mahoHmrg" name="FamilyHistoryOrganizerSubjectRelatedSubject" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5qgRA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PtR-dn3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerSubjectRelatedSubject" constrainedElement="_2IbIoBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PtR-d33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.subject->excluding(null)->reject(relatedSubject->one(relatedSubject : cda::RelatedSubject | not relatedSubject.oclIsUndefined() and relatedSubject.oclIsKindOf(cda::RelatedSubject)))</body>
         </specification>
@@ -3963,15 +3963,15 @@ value.codeSystem = '2.16.840.1.113883.5.111' and (value.code = 'ADOPT' or value.
       <generalization xmi:id="_2JHFIBSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_B6aX4EbvEd6besF9iFIJkQ"/>
       </generalization>
-      <ownedOperation xmi:id="_qLRi4F9xEey5t-mahoHmrg" name="getFamilyHistoryObservations" bodyCondition="_qLRi419xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qLRi419xEey5t-mahoHmrg" name="body" constrainedElement="_qLRi4F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qLRi5F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CcIRcn3sEeyivuDeOiJBMg" name="getFamilyHistoryObservations" bodyCondition="_CcIRdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CcIRdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_CcIRcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CcIRdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::FamilyHistoryObservation)).oclAsType(consol::FamilyHistoryObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qLRi4V9xEey5t-mahoHmrg" type="_2IpyIxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qLRi4l9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_CcIRc33sEeyivuDeOiJBMg" type="_2IpyIxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CcIRdH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -3985,80 +3985,80 @@ value.codeSystem = '2.16.840.1.113883.5.111' and (value.code = 'ADOPT' or value.
           <body>self.entryRelationship->forAll(ent : cda::EntryRelationship | ent.observation.oclIsTypeOf(consol::AgeObservation) implies ent.inversionInd=true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qHw74F9xEey5t-mahoHmrg" name="FamilyHistoryObservationTemplateId" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qHw74V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CZ1LYH3sEeyivuDeOiJBMg" name="FamilyHistoryObservationTemplateId" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CZ1LYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.46')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qHyxEF9xEey5t-mahoHmrg" name="FamilyHistoryObservationClassCode" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qHyxEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CZ3AkH3sEeyivuDeOiJBMg" name="FamilyHistoryObservationClassCode" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CZ3AkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qH0mQF9xEey5t-mahoHmrg" name="FamilyHistoryObservationMoodCode" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qH0mQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CZ41wH3sEeyivuDeOiJBMg" name="FamilyHistoryObservationMoodCode" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CZ41wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qH3CgF9xEey5t-mahoHmrg" name="FamilyHistoryObservationId" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qH3CgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CZ6q8H3sEeyivuDeOiJBMg" name="FamilyHistoryObservationId" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CZ6q8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qI3vIF9xEey5t-mahoHmrg" name="FamilyHistoryObservationCodeP" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qI3vIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CaYlAH3sEeyivuDeOiJBMg" name="FamilyHistoryObservationCodeP" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CaYlAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qH4QoF9xEey5t-mahoHmrg" name="FamilyHistoryObservationCode" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qH4QoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CZ7SAH3sEeyivuDeOiJBMg" name="FamilyHistoryObservationCode" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CZ7SAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '404684003' or value.code = '409586006' or value.code = '282291009' or value.code = '64572001' or value.code = '248536006' or value.code = '418799008' or value.code = '55607006' or value.code = '373930000'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qJjEkF9xEey5t-mahoHmrg" name="FamilyHistoryObservationStatusCode" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qJjEkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CazbwH3sEeyivuDeOiJBMg" name="FamilyHistoryObservationStatusCode" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CazbwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qJlg0F9xEey5t-mahoHmrg" name="FamilyHistoryObservationStatusCodeP" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qJlg0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ca0p4H3sEeyivuDeOiJBMg" name="FamilyHistoryObservationStatusCodeP" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ca0p4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qJnWAF9xEey5t-mahoHmrg" name="FamilyHistoryObservationEffectiveTime" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qJnWAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ca14AH3sEeyivuDeOiJBMg" name="FamilyHistoryObservationEffectiveTime" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ca14AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qJokIF9xEey5t-mahoHmrg" name="FamilyHistoryObservationValue" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qJokIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ca2fEH3sEeyivuDeOiJBMg" name="FamilyHistoryObservationValue" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ca2fEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qKwlgF9xEey5t-mahoHmrg" name="FamilyHistoryObservationAgeObservation" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qKwlgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CbtasH3sEeyivuDeOiJBMg" name="FamilyHistoryObservationAgeObservation" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CbtasX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AgeObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rE2PMF9xEey5t-mahoHmrg" name="FamilyHistoryObservationFamilyHistoryDeathObservation" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rE2PMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DNQMYH3sEeyivuDeOiJBMg" name="FamilyHistoryObservationFamilyHistoryDeathObservation" constrainedElement="_2IpyIxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DNQMYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::FamilyHistoryDeathObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::CAUS)</body>
         </specification>
@@ -4066,26 +4066,26 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
       <generalization xmi:id="_2I5CsRSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_qKwlgl9xEey5t-mahoHmrg" name="getAgeObservation" bodyCondition="_qKwlhV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qKwlhV9xEey5t-mahoHmrg" name="body" constrainedElement="_qKwlgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qKwlhl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Cbtasn3sEeyivuDeOiJBMg" name="getAgeObservation" bodyCondition="_CbtatX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CbtatX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Cbtasn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cbtatn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AgeObservation))->asSequence()->any(true).oclAsType(consol::AgeObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qKwlg19xEey5t-mahoHmrg" type="_2EqqABSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qKwlhF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Cbtas33sEeyivuDeOiJBMg" type="_2EqqABSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CbtatH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rE22QF9xEey5t-mahoHmrg" name="getFamilyHistoryDeathObservation" bodyCondition="_rE22Q19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rE22Q19xEey5t-mahoHmrg" name="body" constrainedElement="_rE22QF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rE22RF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DNQzcH3sEeyivuDeOiJBMg" name="getFamilyHistoryDeathObservation" bodyCondition="_DNQzc33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DNQzc33sEeyivuDeOiJBMg" name="body" constrainedElement="_DNQzcH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DNQzdH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::FamilyHistoryDeathObservation))->asSequence()->any(true).oclAsType(consol::FamilyHistoryDeathObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rE22QV9xEey5t-mahoHmrg" type="_2SC-sBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rE22Ql9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_DNQzcX3sEeyivuDeOiJBMg" type="_2SC-sBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DNQzcn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -4093,58 +4093,58 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
       <ownedComment xmi:id="_LJ4sMDyWEeGOm9opnDhYAQ">
         <body>This section contains data defining the patient's occupational, personal (e.g. lifestyle), social, and environmental history and health risk factors, as well as administrative data such as marital status, race, ethnicity and religious affiliation. Social history can have significant influence on a patient's physical, psychological and emotional health and wellbeing so should be considered in the development of a complete record.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qLRi5V9xEey5t-mahoHmrg" name="SocialHistorySectionTemplateId" constrainedElement="_2JKvgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qLRi5l9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CcIRd33sEeyivuDeOiJBMg" name="SocialHistorySectionTemplateId" constrainedElement="_2JKvgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CcI4gH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.17')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qLSxAF9xEey5t-mahoHmrg" name="SocialHistorySectionCode" constrainedElement="_2JKvgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qLSxAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CcJfkH3sEeyivuDeOiJBMg" name="SocialHistorySectionCode" constrainedElement="_2JKvgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CcJfkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '29762-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qLT_IF9xEey5t-mahoHmrg" name="SocialHistorySectionCodeP" constrainedElement="_2JKvgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qLUmMF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CcKtsH3sEeyivuDeOiJBMg" name="SocialHistorySectionCodeP" constrainedElement="_2JKvgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CcKtsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qLV0UF9xEey5t-mahoHmrg" name="SocialHistorySectionTitle" constrainedElement="_2JKvgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qLV0UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CcL70H3sEeyivuDeOiJBMg" name="SocialHistorySectionTitle" constrainedElement="_2JKvgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CcL70X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qLXCcF9xEey5t-mahoHmrg" name="SocialHistorySectionText" constrainedElement="_2JKvgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qLXCcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CcNJ8H3sEeyivuDeOiJBMg" name="SocialHistorySectionText" constrainedElement="_2JKvgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CcNJ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qL4m4F9xEey5t-mahoHmrg" name="SocialHistorySectionSocialHistoryObservation" constrainedElement="_2JKvgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qL4m4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CcrrEH3sEeyivuDeOiJBMg" name="SocialHistorySectionSocialHistoryObservation" constrainedElement="_2JKvgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CcrrEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::SocialHistoryObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKGioF9xEey5t-mahoHmrg" name="SocialHistorySectionPregnancyObservation" constrainedElement="_2JKvgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKGioV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSB-sH3sEeyivuDeOiJBMg" name="SocialHistorySectionPregnancyObservation" constrainedElement="_2JKvgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSB-sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::PregnancyObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uOA_kF9xEey5t-mahoHmrg" name="SocialHistorySectionSmokingStatusObservation" constrainedElement="_2JKvgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uOA_kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F0UVQH3sEeyivuDeOiJBMg" name="SocialHistorySectionSmokingStatusObservation" constrainedElement="_2JKvgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F0UVQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::SmokingStatusObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uOikAF9xEey5t-mahoHmrg" name="SocialHistorySectionTobaccoUse" constrainedElement="_2JKvgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uOjLEF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F0t94H3sEeyivuDeOiJBMg" name="SocialHistorySectionTobaccoUse" constrainedElement="_2JKvgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F0t94X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::TobaccoUse))</body>
         </specification>
@@ -4152,48 +4152,48 @@ value.code = '29762-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_2Jrs4hSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_qL4m4l9xEey5t-mahoHmrg" name="getSocialHistoryObservations" bodyCondition="_qL4m5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qL4m5V9xEey5t-mahoHmrg" name="body" constrainedElement="_qL4m4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qL4m5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CcrrEn3sEeyivuDeOiJBMg" name="getSocialHistoryObservations" bodyCondition="_CcrrFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CcrrFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_CcrrEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CcrrFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SocialHistoryObservation)).oclAsType(consol::SocialHistoryObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qL4m419xEey5t-mahoHmrg" type="_2JOZ4BSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qL4m5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_CcrrE33sEeyivuDeOiJBMg" type="_2JOZ4BSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CcrrFH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rKGiol9xEey5t-mahoHmrg" name="getPregnancyObservations" bodyCondition="_rKGipV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rKGipV9xEey5t-mahoHmrg" name="body" constrainedElement="_rKGiol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKGipl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DSClwH3sEeyivuDeOiJBMg" name="getPregnancyObservations" bodyCondition="_DSClw33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DSClw33sEeyivuDeOiJBMg" name="body" constrainedElement="_DSClwH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSClxH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PregnancyObservation)).oclAsType(consol::PregnancyObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rKGio19xEey5t-mahoHmrg" type="_2N6soBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rKGipF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DSClwX3sEeyivuDeOiJBMg" type="_2N6soBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DSClwn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uOA_kl9xEey5t-mahoHmrg" name="getSmokingStatusObservations" bodyCondition="_uOA_lV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uOA_lV9xEey5t-mahoHmrg" name="body" constrainedElement="_uOA_kl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uOA_ll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_F0U8UH3sEeyivuDeOiJBMg" name="getSmokingStatusObservations" bodyCondition="_F0U8U33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_F0U8U33sEeyivuDeOiJBMg" name="body" constrainedElement="_F0U8UH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_F0U8VH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SmokingStatusObservation)).oclAsType(consol::SmokingStatusObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uOA_k19xEey5t-mahoHmrg" type="_RYJj0OWQEeGKmvzED_He2w" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uOA_lF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_F0U8UX3sEeyivuDeOiJBMg" type="_RYJj0OWQEeGKmvzED_He2w" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F0U8Un3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uOjLEV9xEey5t-mahoHmrg" name="getTobaccoUses" bodyCondition="_uOjLFF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uOjLFF9xEey5t-mahoHmrg" name="body" constrainedElement="_uOjLEV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uOjLFV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_F0uk8H3sEeyivuDeOiJBMg" name="getTobaccoUses" bodyCondition="_F0uk833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_F0uk833sEeyivuDeOiJBMg" name="body" constrainedElement="_F0uk8H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_F0uk9H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::TobaccoUse)).oclAsType(consol::TobaccoUse)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uOjLEl9xEey5t-mahoHmrg" type="_gIH_QOWQEeGKmvzED_He2w" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uOjLE19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_F0uk8X3sEeyivuDeOiJBMg" type="_gIH_QOWQEeGKmvzED_He2w" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F0uk8n3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -4219,54 +4219,54 @@ value.code = '29762-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>not self.code.originalText.reference.value.oclIsUndefined() implies not self.getSection().text.getText(self.code.originalText.reference.value.substring(2, self.code.originalText.reference.value.size())).oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qL4m519xEey5t-mahoHmrg" name="SocialHistoryObservationTemplateId" constrainedElement="_2JOZ4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qL4m6F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CcrrF33sEeyivuDeOiJBMg" name="SocialHistoryObservationTemplateId" constrainedElement="_2JOZ4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CcrrGH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.38')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qL7DIF9xEey5t-mahoHmrg" name="SocialHistoryObservationClassCode" constrainedElement="_2JOZ4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qL7DIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CctgQH3sEeyivuDeOiJBMg" name="SocialHistoryObservationClassCode" constrainedElement="_2JOZ4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CctgQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qL8RQF9xEey5t-mahoHmrg" name="SocialHistoryObservationMoodCode" constrainedElement="_2JOZ4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qL84UF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CcvVcH3sEeyivuDeOiJBMg" name="SocialHistoryObservationMoodCode" constrainedElement="_2JOZ4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CcvVcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qL-GcF9xEey5t-mahoHmrg" name="SocialHistoryObservationId" constrainedElement="_2JOZ4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qL-GcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CcwjkH3sEeyivuDeOiJBMg" name="SocialHistoryObservationId" constrainedElement="_2JOZ4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CcwjkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qMgR8F9xEey5t-mahoHmrg" name="SocialHistoryObservationCodeP" constrainedElement="_2JOZ4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qMgR8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CdMBYH3sEeyivuDeOiJBMg" name="SocialHistoryObservationCodeP" constrainedElement="_2JOZ4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CdMBYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qL_UkF9xEey5t-mahoHmrg" name="SocialHistoryObservationCode" constrainedElement="_2JOZ4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qL_UkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CcxKoH3sEeyivuDeOiJBMg" name="SocialHistoryObservationCode" constrainedElement="_2JOZ4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CcxKoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '229819007' or value.code = '256235009' or value.code = '160573003' or value.code = '364393001' or value.code = '364703007' or value.code = '425400000' or value.code = '363908000' or value.code = '228272008' or value.code = '105421008' or value.code = '302160007' or value.code = '423514004' or value.code = '102487004' or value.code = '424483007' or value.code = '442133001' or value.code = '446996006'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qNBPUF9xEey5t-mahoHmrg" name="SocialHistoryObservationStatusCode" constrainedElement="_2JOZ4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qNBPUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cdm4IH3sEeyivuDeOiJBMg" name="SocialHistoryObservationStatusCode" constrainedElement="_2JOZ4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cdm4IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qNDEgF9xEey5t-mahoHmrg" name="SocialHistoryObservationValue" constrainedElement="_2JOZ4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qNDEgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CdoGQH3sEeyivuDeOiJBMg" name="SocialHistoryObservationValue" constrainedElement="_2JOZ4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CdoGQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (( not self.value->isEmpty()) )</body>
         </specification>
@@ -4282,40 +4282,40 @@ Laboratory results are typically generated by laboratories providing analytic se
 Imaging results are typically generated by a clinician reviewing the output of an imaging procedure, such as where a cardiologist reports the left ventricular ejection fraction based on the review of a cardiac echocardiogram.&#xD;
 Procedure results are typically generated by a clinician to provide more granular information about component observations made during  a procedure, such as where a gastroenterologist reports the size of a polyp observed during a colonoscopy.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qNESoV9xEey5t-mahoHmrg" name="ResultsSectionEntriesOptionalTemplateId" constrainedElement="_2Js7AxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qNE5sF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CdotUX3sEeyivuDeOiJBMg" name="ResultsSectionEntriesOptionalTemplateId" constrainedElement="_2Js7AxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CdotUn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.3.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qNHV8F9xEey5t-mahoHmrg" name="ResultsSectionEntriesOptionalCodeP" constrainedElement="_2Js7AxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qNHV8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CdrJkH3sEeyivuDeOiJBMg" name="ResultsSectionEntriesOptionalCodeP" constrainedElement="_2Js7AxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CdrJkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qNFgwF9xEey5t-mahoHmrg" name="ResultsSectionEntriesOptionalCode" constrainedElement="_2Js7AxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qNFgwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cdp7cH3sEeyivuDeOiJBMg" name="ResultsSectionEntriesOptionalCode" constrainedElement="_2Js7AxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cdp7cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '30954-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qNIkEF9xEey5t-mahoHmrg" name="ResultsSectionEntriesOptionalTitle" constrainedElement="_2Js7AxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qNIkEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CdsXsH3sEeyivuDeOiJBMg" name="ResultsSectionEntriesOptionalTitle" constrainedElement="_2Js7AxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CdsXsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qNKZQF9xEey5t-mahoHmrg" name="ResultsSectionText" constrainedElement="_2Js7AxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qNKZQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cdtl0H3sEeyivuDeOiJBMg" name="ResultsSectionText" constrainedElement="_2Js7AxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cdtl0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rh2UQF9xEey5t-mahoHmrg" name="ResultsSectionResultOrganizer" constrainedElement="_2Js7AxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rh2UQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DmGxQH3sEeyivuDeOiJBMg" name="ResultsSectionResultOrganizer" constrainedElement="_2Js7AxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DmGxQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.organizer.oclIsUndefined() and entry.organizer.oclIsKindOf(consol::ResultOrganizer))</body>
         </specification>
@@ -4325,15 +4325,15 @@ value.code = '30954-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>couple</body>
         </ownedComment>
       </generalization>
-      <ownedOperation xmi:id="_rh2UQl9xEey5t-mahoHmrg" name="getConsolResultOrganizers" bodyCondition="_rh2URV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rh2URV9xEey5t-mahoHmrg" name="body" constrainedElement="_rh2UQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rh2URl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DmHYUH3sEeyivuDeOiJBMg" name="getConsolResultOrganizers" bodyCondition="_DmHYU33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DmHYU33sEeyivuDeOiJBMg" name="body" constrainedElement="_DmHYUH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DmHYVH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::ResultOrganizer)).oclAsType(consol::ResultOrganizer)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rh2UQ19xEey5t-mahoHmrg" type="_2JxzgBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rh2URF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DmHYUX3sEeyivuDeOiJBMg" type="_2JxzgBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DmHYUn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -4363,52 +4363,52 @@ If any Results Observation within the organizer has a statusCode of 'active', th
           <body>self.isClassCodeDefined() and (self.classCode = vocab::x_ActClassDocumentEntryOrganizer::CLUSTER or self.classCode = vocab::x_ActClassDocumentEntryOrganizer::BATTERY)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qNLnYF9xEey5t-mahoHmrg" name="ResultOrganizerTemplateId" constrainedElement="_2JxzgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qNLnYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CduM4H3sEeyivuDeOiJBMg" name="ResultOrganizerTemplateId" constrainedElement="_2JxzgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CduM4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qNNckF9xEey5t-mahoHmrg" name="ResultOrganizerClassCode" constrainedElement="_2JxzgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qNNckV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CdwCEH3sEeyivuDeOiJBMg" name="ResultOrganizerClassCode" constrainedElement="_2JxzgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CdwCEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('classCode')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qNOqsF9xEey5t-mahoHmrg" name="ResultOrganizerMoodCode" constrainedElement="_2JxzgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qNOqsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CdxQMH3sEeyivuDeOiJBMg" name="ResultOrganizerMoodCode" constrainedElement="_2JxzgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CdxQMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::ActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qNQf4F9xEey5t-mahoHmrg" name="ResultOrganizerId" constrainedElement="_2JxzgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qNQf4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cdx3QH3sEeyivuDeOiJBMg" name="ResultOrganizerId" constrainedElement="_2JxzgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cdx3QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qN1usF9xEey5t-mahoHmrg" name="ResultOrganizerStatusCodeP" constrainedElement="_2JxzgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qN1usV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CePKQH3sEeyivuDeOiJBMg" name="ResultOrganizerStatusCodeP" constrainedElement="_2JxzgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CePKQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qNRuAF9xEey5t-mahoHmrg" name="ResultOrganizerStatusCode" constrainedElement="_2JxzgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qNRuAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CdzFYH3sEeyivuDeOiJBMg" name="ResultOrganizerStatusCode" constrainedElement="_2JxzgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CdzFYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'aborted' or value.code = 'active' or value.code = 'cancelled' or value.code = 'completed' or value.code = 'held' or value.code = 'suspended')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qOX6MF9xEey5t-mahoHmrg" name="ResultOrganizerCode" constrainedElement="_2JxzgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qOX6MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CeqBAH3sEeyivuDeOiJBMg" name="ResultOrganizerCode" constrainedElement="_2JxzgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CeqBAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qO5eoF9xEey5t-mahoHmrg" name="ResultOrganizerResultObservation" constrainedElement="_2JxzgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qO5eoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CfEQsH3sEeyivuDeOiJBMg" name="ResultOrganizerResultObservation" constrainedElement="_2JxzgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CfEQsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->exists(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::ResultObservation))</body>
         </specification>
@@ -4416,15 +4416,15 @@ value.code = 'aborted' or value.code = 'active' or value.code = 'cancelled' or v
       <generalization xmi:id="_2KCSNBSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_B6aX4EbvEd6besF9iFIJkQ"/>
       </generalization>
-      <ownedOperation xmi:id="_qO5eol9xEey5t-mahoHmrg" name="getResultObservations" bodyCondition="_qO5epV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qO5epV9xEey5t-mahoHmrg" name="body" constrainedElement="_qO5eol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qO5epl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CfEQsn3sEeyivuDeOiJBMg" name="getResultObservations" bodyCondition="_CfEQtX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CfEQtX3sEeyivuDeOiJBMg" name="body" constrainedElement="_CfEQsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CfEQtn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ResultObservation)).oclAsType(consol::ResultObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qO5eo19xEey5t-mahoHmrg" type="_2J1d4BSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qO5epF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_CfEQs33sEeyivuDeOiJBMg" type="_2J1d4BSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CfEQtH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -4472,82 +4472,82 @@ The result observation includes a statusCode to allow recording the status of an
           <body>self.author->size()&lt;2</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qO6FsF9xEey5t-mahoHmrg" name="ResultObservationTemplateId" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qO6FsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CfE3wH3sEeyivuDeOiJBMg" name="ResultObservationTemplateId" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CfE3wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.2')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qO9JAF9xEey5t-mahoHmrg" name="ResultObservationClassCode" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qO9JAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CfHUAH3sEeyivuDeOiJBMg" name="ResultObservationClassCode" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CfHUAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qO--MF9xEey5t-mahoHmrg" name="ResultObservationMoodCode" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qO--MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CfIiIH3sEeyivuDeOiJBMg" name="ResultObservationMoodCode" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CfIiIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qPAzYF9xEey5t-mahoHmrg" name="ResultObservationId" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qPAzYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CfJwQH3sEeyivuDeOiJBMg" name="ResultObservationId" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CfJwQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qPCBgF9xEey5t-mahoHmrg" name="ResultObservationCode" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qPCBgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CfKXUH3sEeyivuDeOiJBMg" name="ResultObservationCode" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CfKXUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qPDPoF9xEey5t-mahoHmrg" name="ResultObservationText" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qPDPoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CfLlcH3sEeyivuDeOiJBMg" name="ResultObservationText" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CfLlcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qPEdwF9xEey5t-mahoHmrg" name="ResultObservationStatusCode" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qPEdwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CfMMgH3sEeyivuDeOiJBMg" name="ResultObservationStatusCode" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CfMMgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'aborted' or value.code = 'active' or value.code = 'cancelled' or value.code = 'completed' or value.code = 'held' or value.code = 'suspended')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qPk0EF9xEey5t-mahoHmrg" name="ResultObservationStatusCodeP" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qPlbIF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CfmcMH3sEeyivuDeOiJBMg" name="ResultObservationStatusCodeP" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CfmcMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qQHmoF9xEey5t-mahoHmrg" name="ResultObservationEffectiveTime" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qQHmoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CgBS8H3sEeyivuDeOiJBMg" name="ResultObservationEffectiveTime" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CgBS8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qQI0wF9xEey5t-mahoHmrg" name="ResultObservationValue" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qQI0wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CgChEH3sEeyivuDeOiJBMg" name="ResultObservationValue" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CgChEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qQKp8F9xEey5t-mahoHmrg" name="ResultObservationInterpretationCode" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qQKp8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CgDvMH3sEeyivuDeOiJBMg" name="ResultObservationInterpretationCode" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CgDvMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.interpretationCode->isEmpty() or self.interpretationCode->exists(element | element.isNullFlavorUndefined())) implies (not self.interpretationCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qQL4EF9xEey5t-mahoHmrg" name="ResultObservationMethodCode" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qQL4EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CgE9UH3sEeyivuDeOiJBMg" name="ResultObservationMethodCode" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CgE9UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.methodCode->isEmpty() or self.methodCode->exists(element | element.isNullFlavorUndefined())) implies (( not self.methodCode->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qQNtQF9xEey5t-mahoHmrg" name="ResultObservationTargetSiteCode" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qQNtQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CgGLcH3sEeyivuDeOiJBMg" name="ResultObservationTargetSiteCode" constrainedElement="_2J1d4BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CgGLcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (( not self.targetSiteCode->isEmpty())  and self.targetSiteCode->forAll(element | element.oclIsTypeOf(datatypes::CE)))</body>
         </specification>
@@ -4560,40 +4560,40 @@ value.code = 'aborted' or value.code = 'active' or value.code = 'cancelled' or v
       <ownedComment xmi:id="_6K0pUDh_EeGSytqLITd2FA">
         <body>The Medical Equipment section defines a patient's implanted and external medical devices and equipment that their health status depends on, as well as any pertinent equipment or device history. This section is also used to itemize any pertinent current or historical durable medical equipment (DME) used to help maintain the patient's health status. All pertinent equipment relevant to the diagnosis, care, and treatment of a patient should be included.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qQO7YF9xEey5t-mahoHmrg" name="MedicalEquipmentSectionTemplateId" constrainedElement="_2KEucBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qQO7YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CgGygH3sEeyivuDeOiJBMg" name="MedicalEquipmentSectionTemplateId" constrainedElement="_2KEucBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CgGygX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.23')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qQQJgF9xEey5t-mahoHmrg" name="MedicalEquipmentSectionCode" constrainedElement="_2KEucBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qQQJgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CgIAoH3sEeyivuDeOiJBMg" name="MedicalEquipmentSectionCode" constrainedElement="_2KEucBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CgIAoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '46264-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qQRXoF9xEey5t-mahoHmrg" name="MedicalEquipmentSectionCodeP" constrainedElement="_2KEucBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qQRXoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CgInsH3sEeyivuDeOiJBMg" name="MedicalEquipmentSectionCodeP" constrainedElement="_2KEucBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CgJOwH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qQTM0F9xEey5t-mahoHmrg" name="MedicalEquipmentSectionTitle" constrainedElement="_2KEucBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qQTM0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CgJ10H3sEeyivuDeOiJBMg" name="MedicalEquipmentSectionTitle" constrainedElement="_2KEucBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CgJ10X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qQUa8F9xEey5t-mahoHmrg" name="MedicalEquipmentSectionText" constrainedElement="_2KEucBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qQUa8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CgLD8H3sEeyivuDeOiJBMg" name="MedicalEquipmentSectionText" constrainedElement="_2KEucBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CgLD8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qQ5CsF9xEey5t-mahoHmrg" name="MedicalEquipmentSectionNonMedicinalSupplyActivity" constrainedElement="_2KEucBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qQ5CsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CgqMIH3sEeyivuDeOiJBMg" name="MedicalEquipmentSectionNonMedicinalSupplyActivity" constrainedElement="_2KEucBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CgqMIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.supply.oclIsUndefined() and entry.supply.oclIsKindOf(consol::NonMedicinalSupplyActivity))</body>
         </specification>
@@ -4601,15 +4601,15 @@ value.code = '46264-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_2KJm8hSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_qQ5Csl9xEey5t-mahoHmrg" name="getNonMedicinalSupplyActivities" bodyCondition="_qQ5CtV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qQ5CtV9xEey5t-mahoHmrg" name="body" constrainedElement="_qQ5Csl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qQ5Ctl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CgqMIn3sEeyivuDeOiJBMg" name="getNonMedicinalSupplyActivities" bodyCondition="_CgqMJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CgqMJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_CgqMIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CgqzMH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::NonMedicinalSupplyActivity)).oclAsType(consol::NonMedicinalSupplyActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qQ5Cs19xEey5t-mahoHmrg" type="_2HIvMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qQ5CtF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_CgqMI33sEeyivuDeOiJBMg" type="_2HIvMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CgqMJH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -4639,100 +4639,100 @@ Safety hazards at work, such as communicable diseases, excessive heat, excessive
 The patient's functional status may be expressed as a problem or as a result observation. A functional or cognitive status problem observation describes a patient's problem, symptoms or condition. A functional or cognitive status result observation may include observations resulting from an assessment scale, evaluation or question and answer assessment.&#xD;
 Any deviation from normal function displayed by the patient and recorded in the record should be included. Of particular interest are those limitations that would interfere with self-care or the medical therapeutic process in any way. In addition, a note of normal function, an improvement, or a change in functioning status may be included.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qQ5pwF9xEey5t-mahoHmrg" name="FunctionalStatusSectionTemplateId" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qQ5pwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CgqzMX3sEeyivuDeOiJBMg" name="FunctionalStatusSectionTemplateId" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CgqzMn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.14')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qQ6Q0F9xEey5t-mahoHmrg" name="FunctionalStatusSectionCode" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qQ6Q0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CgsBUH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionCode" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CgsBUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '47420-5' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qQ8GAF9xEey5t-mahoHmrg" name="FunctionalStatusSectionTitle" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qQ8GAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CgtPcH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionTitle" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CgtPcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qQ9UIF9xEey5t-mahoHmrg" name="FunctionalStatusSectionText" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qQ9UIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CgvEoH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionText" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CgvEoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uuG04F9xEey5t-mahoHmrg" name="FunctionalStatusSectionFunctionalStatusResultOrganizer" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uuG04V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GPi4sH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionFunctionalStatusResultOrganizer" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GPi4sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.organizer.oclIsUndefined() and entry.organizer.oclIsKindOf(consol::FunctionalStatusResultOrganizer))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uuvHAF9xEey5t-mahoHmrg" name="FunctionalStatusSectionCognitiveStatusResultOrganizer" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uuvHAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GP9vcH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionCognitiveStatusResultOrganizer" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GP9vcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.organizer.oclIsUndefined() and entry.organizer.oclIsKindOf(consol::CognitiveStatusResultOrganizer))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uvQrcF9xEey5t-mahoHmrg" name="FunctionalStatusSectionFunctionalStatusResultObservation" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uvQrcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GQX_IH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionFunctionalStatusResultObservation" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GQX_IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::FunctionalStatusResultObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uvwasF9xEey5t-mahoHmrg" name="FunctionalStatusSectionCognitiveStatusResultObservation" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uvwasV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GQyO0H3sEeyivuDeOiJBMg" name="FunctionalStatusSectionCognitiveStatusResultObservation" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GQyO0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::CognitiveStatusResultObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uwQxAF9xEey5t-mahoHmrg" name="FunctionalStatusSectionFunctionalStatusProblemObservation" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uwQxAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GRNFkH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionFunctionalStatusProblemObservation" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GRNFkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::FunctionalStatusProblemObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uwvSIF9xEey5t-mahoHmrg" name="FunctionalStatusSectionCognitiveStatusProblemObservation" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uwvSIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GRpxgH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionCognitiveStatusProblemObservation" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GRpxgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::CognitiveStatusProblemObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uxPBYF9xEey5t-mahoHmrg" name="FunctionalStatusSectionCaregiverCharacteristics" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uxPBYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GSFPUH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionCaregiverCharacteristics" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GSFPUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::CaregiverCharacteristics))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uxtigF9xEey5t-mahoHmrg" name="FunctionalStatusSectionAssessmentScaleObservation" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uxtigV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GSffAH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionAssessmentScaleObservation" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GSffAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::AssessmentScaleObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uyRjMF9xEey5t-mahoHmrg" name="FunctionalStatusSectionNonMedicinalSupplyActivity" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uySKQF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GS5HoH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionNonMedicinalSupplyActivity" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GS5HoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.supply.oclIsUndefined() and entry.supply.oclIsKindOf(consol::NonMedicinalSupplyActivity))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uy5OQF9xEey5t-mahoHmrg" name="FunctionalStatusSectionPressureUlcerObservation" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uy5OQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GTYP0H3sEeyivuDeOiJBMg" name="FunctionalStatusSectionPressureUlcerObservation" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GTYP0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::PressureUlcerObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uzY9gF9xEey5t-mahoHmrg" name="FunctionalStatusSectionNumberOfPressureUlcersObservation" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uzY9gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GTyfgH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionNumberOfPressureUlcersObservation" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GTyfgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::NumberOfPressureUlcersObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uz564F9xEey5t-mahoHmrg" name="FunctionalStatusSectionHighestPressureUlcerStage" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uz564V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GUMvMH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionHighestPressureUlcerStage" constrainedElement="_2KKOBhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GUMvMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::HighestPressureUlcerStage))</body>
         </specification>
@@ -4740,174 +4740,174 @@ value.code = '47420-5' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_2KT_ABSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_uuG04l9xEey5t-mahoHmrg" name="getFunctionalStatusResultOrganizers" bodyCondition="_uuG05V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uuG05V9xEey5t-mahoHmrg" name="body" constrainedElement="_uuG04l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uuG05l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GPi4sn3sEeyivuDeOiJBMg" name="getFunctionalStatusResultOrganizers" bodyCondition="_GPi4tX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GPi4tX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GPi4sn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GPi4tn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::FunctionalStatusResultOrganizer)).oclAsType(consol::FunctionalStatusResultOrganizer)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uuG0419xEey5t-mahoHmrg" type="_zBlUUOZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uuG05F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GPi4s33sEeyivuDeOiJBMg" type="_zBlUUOZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GPi4tH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uuvHAl9xEey5t-mahoHmrg" name="getCognitiveStatusResultOrganizers" bodyCondition="_uuvuEl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uuvuEl9xEey5t-mahoHmrg" name="body" constrainedElement="_uuvHAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uuvuE19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GP-WgH3sEeyivuDeOiJBMg" name="getCognitiveStatusResultOrganizers" bodyCondition="_GP-Wg33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GP-Wg33sEeyivuDeOiJBMg" name="body" constrainedElement="_GP-WgH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GP-WhH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::CognitiveStatusResultOrganizer)).oclAsType(consol::CognitiveStatusResultOrganizer)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uuvuEF9xEey5t-mahoHmrg" type="_jfoCUOZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uuvuEV9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GP-WgX3sEeyivuDeOiJBMg" type="_jfoCUOZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GP-Wgn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uvRSgF9xEey5t-mahoHmrg" name="getFunctionalStatusResultObservations" bodyCondition="_uvRSg19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uvRSg19xEey5t-mahoHmrg" name="body" constrainedElement="_uvRSgF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uvRShF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GQYmMH3sEeyivuDeOiJBMg" name="getFunctionalStatusResultObservations" bodyCondition="_GQYmM33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GQYmM33sEeyivuDeOiJBMg" name="body" constrainedElement="_GQYmMH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GQYmNH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::FunctionalStatusResultObservation)).oclAsType(consol::FunctionalStatusResultObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uvRSgV9xEey5t-mahoHmrg" type="_viRU0OZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uvRSgl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GQYmMX3sEeyivuDeOiJBMg" type="_viRU0OZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GQYmMn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uvxBwF9xEey5t-mahoHmrg" name="getCognitiveStatusResultObservations" bodyCondition="_uvxBw19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uvxBw19xEey5t-mahoHmrg" name="body" constrainedElement="_uvxBwF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uvxBxF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GQyO0n3sEeyivuDeOiJBMg" name="getCognitiveStatusResultObservations" bodyCondition="_GQyO1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GQyO1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_GQyO0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GQyO1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CognitiveStatusResultObservation)).oclAsType(consol::CognitiveStatusResultObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uvxBwV9xEey5t-mahoHmrg" type="_gkBM0OZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uvxBwl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GQyO033sEeyivuDeOiJBMg" type="_gkBM0OZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GQyO1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uwQxAl9xEey5t-mahoHmrg" name="getFunctionalStatusProblemObservations" bodyCondition="_uwQxBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uwQxBV9xEey5t-mahoHmrg" name="body" constrainedElement="_uwQxAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uwQxBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GRNFkn3sEeyivuDeOiJBMg" name="getFunctionalStatusProblemObservations" bodyCondition="_GRNFlX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GRNFlX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GRNFkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GRNFln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::FunctionalStatusProblemObservation)).oclAsType(consol::FunctionalStatusProblemObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uwQxA19xEey5t-mahoHmrg" type="_rVl5AOZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uwQxBF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GRNFk33sEeyivuDeOiJBMg" type="_rVl5AOZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GRNFlH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uwvSIl9xEey5t-mahoHmrg" name="getCognitiveStatusProblemObservations" bodyCondition="_uwvSJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uwvSJV9xEey5t-mahoHmrg" name="body" constrainedElement="_uwvSIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uwv5MF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GRpxgn3sEeyivuDeOiJBMg" name="getCognitiveStatusProblemObservations" bodyCondition="_GRqYkn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GRqYkn3sEeyivuDeOiJBMg" name="body" constrainedElement="_GRpxgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GRqYk33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CognitiveStatusProblemObservation)).oclAsType(consol::CognitiveStatusProblemObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uwvSI19xEey5t-mahoHmrg" type="_dXKPQOZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uwvSJF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GRqYkH3sEeyivuDeOiJBMg" type="_dXKPQOZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GRqYkX3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uxPBYl9xEey5t-mahoHmrg" name="getCaregiverCharacteristicss" bodyCondition="_uxPBZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uxPBZV9xEey5t-mahoHmrg" name="body" constrainedElement="_uxPBYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uxPBZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GSFPUn3sEeyivuDeOiJBMg" name="getCaregiverCharacteristicss" bodyCondition="_GSFPVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GSFPVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GSFPUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GSFPVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CaregiverCharacteristics)).oclAsType(consol::CaregiverCharacteristics)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uxPBY19xEey5t-mahoHmrg" type="__pNCUOY-EeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uxPBZF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GSFPU33sEeyivuDeOiJBMg" type="__pNCUOY-EeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GSFPVH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uxtigl9xEey5t-mahoHmrg" name="getAssessmentScaleObservations" bodyCondition="_uxtihV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uxtihV9xEey5t-mahoHmrg" name="body" constrainedElement="_uxtigl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uxtihl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GSffAn3sEeyivuDeOiJBMg" name="getAssessmentScaleObservations" bodyCondition="_GSffBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GSffBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GSffAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GSffBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AssessmentScaleObservation)).oclAsType(consol::AssessmentScaleObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uxtig19xEey5t-mahoHmrg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uxtihF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GSffA33sEeyivuDeOiJBMg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GSffBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uySKQV9xEey5t-mahoHmrg" name="getNonMedicinalSupplyActivities" bodyCondition="_uySKRF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uySKRF9xEey5t-mahoHmrg" name="body" constrainedElement="_uySKQV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uySKRV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GS5usH3sEeyivuDeOiJBMg" name="getNonMedicinalSupplyActivities" bodyCondition="_GS5us33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GS5us33sEeyivuDeOiJBMg" name="body" constrainedElement="_GS5usH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GS5utH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::NonMedicinalSupplyActivity)).oclAsType(consol::NonMedicinalSupplyActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uySKQl9xEey5t-mahoHmrg" type="_2HIvMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uySKQ19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GS5usX3sEeyivuDeOiJBMg" type="_2HIvMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GS5usn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uy5OQl9xEey5t-mahoHmrg" name="getPressureUlcerObservations" bodyCondition="_uy51Ul9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uy51Ul9xEey5t-mahoHmrg" name="body" constrainedElement="_uy5OQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uy51U19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GTYP0n3sEeyivuDeOiJBMg" name="getPressureUlcerObservations" bodyCondition="_GTYP1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GTYP1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_GTYP0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GTYP1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PressureUlcerObservation)).oclAsType(consol::PressureUlcerObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uy51UF9xEey5t-mahoHmrg" type="_9rQowOZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uy51UV9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GTYP033sEeyivuDeOiJBMg" type="_9rQowOZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GTYP1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uzZkkF9xEey5t-mahoHmrg" name="getNumberOfPressureUlcersObservations" bodyCondition="_uzZkk19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uzZkk19xEey5t-mahoHmrg" name="body" constrainedElement="_uzZkkF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uzZklF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GTyfgn3sEeyivuDeOiJBMg" name="getNumberOfPressureUlcersObservations" bodyCondition="_GTyfhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GTyfhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GTyfgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GTyfhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::NumberOfPressureUlcersObservation)).oclAsType(consol::NumberOfPressureUlcersObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uzZkkV9xEey5t-mahoHmrg" type="_7c4ssOZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uzZkkl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GTyfg33sEeyivuDeOiJBMg" type="_7c4ssOZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GTyfhH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uz564l9xEey5t-mahoHmrg" name="getHighestPressureUlcerStages" bodyCondition="_uz565V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uz565V9xEey5t-mahoHmrg" name="body" constrainedElement="_uz564l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uz565l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GUMvMn3sEeyivuDeOiJBMg" name="getHighestPressureUlcerStages" bodyCondition="_GUMvNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GUMvNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GUMvMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GUMvNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::HighestPressureUlcerStage)).oclAsType(consol::HighestPressureUlcerStage)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uz56419xEey5t-mahoHmrg" type="_4YgVsOZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uz565F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GUMvM33sEeyivuDeOiJBMg" type="_4YgVsOZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GUMvNH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_2KgzUBSVEeGGzu7fmW9pXw" name="AdvanceDirectivesSection">
-      <ownedRule xmi:id="_qQ_JUV9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptionalTemplateId" constrainedElement="_2KgzUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qQ_JUl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CgwSwX3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptionalTemplateId" constrainedElement="_2KgzUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cgw50H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.21.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qRBlkF9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptionalCodeP" constrainedElement="_2KgzUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qRBlkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CgzWEH3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptionalCodeP" constrainedElement="_2KgzUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CgzWEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qQ_wYF9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptionalCode" constrainedElement="_2KgzUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qQ_wYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cgxg4H3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptionalCode" constrainedElement="_2KgzUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cgxg4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '42348-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qRCzsF9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionTitle" constrainedElement="_2KgzUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qRCzsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cg0kMH3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionTitle" constrainedElement="_2KgzUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cg0kMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qREo4F9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionText" constrainedElement="_2KgzUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qREo4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cg2ZYH3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionText" constrainedElement="_2KgzUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cg2ZYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qRmNUF9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionAdvanceDirectiveObservation" constrainedElement="_2KgzUBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qRmNUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ChWvsH3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionAdvanceDirectiveObservation" constrainedElement="_2KgzUBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ChWvsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::AdvanceDirectiveObservation))</body>
         </specification>
@@ -4917,15 +4917,15 @@ value.code = '42348-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>couple</body>
         </ownedComment>
       </generalization>
-      <ownedOperation xmi:id="_qRmNUl9xEey5t-mahoHmrg" name="getConsolAdvanceDirectiveObservations" bodyCondition="_qRmNVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qRmNVV9xEey5t-mahoHmrg" name="body" constrainedElement="_qRmNUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qRmNVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_ChXWwH3sEeyivuDeOiJBMg" name="getConsolAdvanceDirectiveObservations" bodyCondition="_ChXWw33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ChXWw33sEeyivuDeOiJBMg" name="body" constrainedElement="_ChXWwH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ChXWxH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AdvanceDirectiveObservation)).oclAsType(consol::AdvanceDirectiveObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qRmNU19xEey5t-mahoHmrg" type="_2KlEwBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qRmNVF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_ChXWwX3sEeyivuDeOiJBMg" type="_2KlEwBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ChXWwn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -4945,170 +4945,170 @@ value.code = '42348-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>self.effectiveTime.high.hasContent() or self.effectiveTime.high.isNullFlavorDefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qRmNV19xEey5t-mahoHmrg" name="AdvanceDirectiveObservationTemplateId" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qRm0YF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ChXWxX3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationTemplateId" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ChXWxn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.48')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qRopkF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationClassCode" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qRopkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ChZzAH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationClassCode" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ChZzAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qRqewF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationMoodCode" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qRqewV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ChboMH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationMoodCode" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ChboMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qRsT8F9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationId" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qRsT8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Chc2UH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationId" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Chc2UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qSOfcF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationCodeP" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qSOfcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CiGWkH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationCodeP" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CiGWkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qRtiEF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationCode" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qRtiEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CheEcH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationCode" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CheEcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '281789004' or value.code = '89666000' or value.code = '225204009' or value.code = '52765003' or value.code = '78823007' or value.code = '304251008' or value.code = '61420007' or value.code = '71388002'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qSvc0F9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationStatusCode" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qSvc0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cik3sH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationStatusCode" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cik3sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qSxSAF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationEffectiveTime" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qSxSAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cims4H3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationEffectiveTime" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cims4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rm2JAF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationVerifier" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rm2JAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DqOcQH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationVerifier" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DqOcQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->select(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))->select(typeCode=vocab::ParticipationType::VRF)->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_roVWwF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationCustodian" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_roVWwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DrfAgH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationCustodian" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DrfAgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->select(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))->select(typeCode=vocab::ParticipationType::CST)->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ro1GAF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationReference" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ro1GAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dr4pIH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationReference" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dr4pIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->exists(reference : cda::Reference | not reference.oclIsUndefined() and reference.oclIsKindOf(cda::Reference))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5rBOYF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationVerifierTime" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5rBOYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PttcQH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationVerifierTime" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PttcQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF)->select(typeCode=vocab::ParticipationType::VRF)->reject((time.oclIsUndefined() or time.isNullFlavorUndefined()) implies (not time.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5rB1cF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationVerifierTypeCode" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5rB1cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PtuDUH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationVerifierTypeCode" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PtuDUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF)->select(typeCode=vocab::ParticipationType::VRF)->reject(isDefined('typeCode'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5rB1cl9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationVerifierParticipantRole" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5rB1c19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PtuDUn3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationVerifierParticipantRole" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PtuDU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF)->select(typeCode=vocab::ParticipationType::VRF)->reject(participantRole->one(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(rim::Role)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5siRUF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationCustodianCustodianRoleCustodianEntityName" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5siRUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PvAcwH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationCustodianCustodianRoleCustodianEntityName" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PvAcwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CST).participantRole->excluding(null).playingEntity->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5siRUl9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationCustodianCustodianRoleAddr" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5siRU19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PvAcwn3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationCustodianCustodianRoleAddr" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PvAcw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CST).participantRole->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (( not addr->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5siRVF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationCustodianCustodianRoleClassCode" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5siRVV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PvAcxH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationCustodianCustodianRoleClassCode" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PvAcxX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CST).participantRole->excluding(null)->reject(isDefined('classCode') and classCode=vocab::RoleClassRoot::AGNT)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5si4YF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationCustodianCustodianRoleTelecom" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5si4YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PvBD0H3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationCustodianCustodianRoleTelecom" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PvBD0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CST).participantRole->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5si4Yl9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationCustodianCustodianRolePlayingEntity" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5si4Y19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PvBD0n3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationCustodianCustodianRolePlayingEntity" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PvBD033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CST).participantRole->excluding(null)->reject(playingEntity->one(playingEntity : cda::PlayingEntity | not playingEntity.oclIsUndefined() and playingEntity.oclIsKindOf(cda::PlayingEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5si4ZF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationCustodianTypeCode" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5si4ZV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PvBD1H3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationCustodianTypeCode" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PvBD1X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CST)->select(typeCode=vocab::ParticipationType::CST)->reject(typeCode=vocab::ParticipationType::CST)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5sjfcF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationCustodianAdvanceDirectiveObservationCustodianRole" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5sjfcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PvBq4H3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationCustodianAdvanceDirectiveObservationCustodianRole" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PvBq4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CST)->select(typeCode=vocab::ParticipationType::CST)->reject(participantRole->one(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(cda::ParticipantRole)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5thv0F9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationReferenceExternalDocumentTextMediaType" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5thv0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pv7p0H3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationReferenceExternalDocumentTextMediaType" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pv7p0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null).externalDocument->excluding(null)->reject(not text.mediaType.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5thv0l9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationReferenceExternalDocumentTextReference" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5thv019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pv7p0n3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationReferenceExternalDocumentTextReference" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pv7p033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null).externalDocument->excluding(null)->reject(not text.oclIsUndefined() implies not text.reference.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5thv1F9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationReferenceExternalDocumentId" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5thv1V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pv7p1H3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationReferenceExternalDocumentId" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pv7p1X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null).externalDocument->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5tiW4F9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationReferenceExternalDocumentText" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5tiW4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pv8Q4H3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationReferenceExternalDocumentText" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pv8Q4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null).externalDocument->excluding(null)->reject((text.oclIsUndefined() or text.isNullFlavorUndefined()) implies (not text.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5tiW4l9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationReferenceTypeCode" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5tiW419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pv8Q4n3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationReferenceTypeCode" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pv8Q433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null)->reject(not typeCode.oclIsUndefined() and typeCode.oclIsKindOf(vocab::x_ActRelationshipExternalReference) and 
 let value : vocab::x_ActRelationshipExternalReference = typeCode.oclAsType(vocab::x_ActRelationshipExternalReference) in 
 value = vocab::x_ActRelationshipExternalReference::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5tiW5F9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationReferenceExternalDocument" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5tiW5V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pv8Q5H3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationReferenceExternalDocument" constrainedElement="_2KlEwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pv8Q5X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null)->reject(externalDocument->one(externalDocument : cda::ExternalDocument | not externalDocument.oclIsUndefined() and externalDocument.oclIsKindOf(cda::ExternalDocument)))</body>
         </specification>
@@ -5121,40 +5121,40 @@ value = vocab::x_ActRelationshipExternalReference::REFR)</body>
       <ownedComment xmi:id="_2LRBQRSVEeGGzu7fmW9pXw" annotatedElement="_2LMIwBSVEeGGzu7fmW9pXw">
         <body>This section lists and describes any medication allergies, adverse reactions, idiosyncratic reactions, anaphylaxis/anaphylactoid reactions to food items, and metabolic variations or adverse reactions/allergies to other substances (such as latex, iodine, tape adhesives) used to assure the safety of health care delivery. At a minimum, it should list currently active and any relevant historical allergies and adverse reactions.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qTBwsF9xEey5t-mahoHmrg" name="AllergiesSectionEntriesOptionalTemplateId" constrainedElement="_2LMIwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qTBwsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ci0IQH3sEeyivuDeOiJBMg" name="AllergiesSectionEntriesOptionalTemplateId" constrainedElement="_2LMIwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ci0IQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qTEM8F9xEey5t-mahoHmrg" name="AllergiesSectionEntriesOptionalCodeP" constrainedElement="_2LMIwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qTEM8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ci19cH3sEeyivuDeOiJBMg" name="AllergiesSectionEntriesOptionalCodeP" constrainedElement="_2LMIwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ci19cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qTCXwF9xEey5t-mahoHmrg" name="AllergiesSectionEntriesOptionalCode" constrainedElement="_2LMIwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qTCXwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ci0vUH3sEeyivuDeOiJBMg" name="AllergiesSectionEntriesOptionalCode" constrainedElement="_2LMIwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ci0vUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '48765-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qTFbEF9xEey5t-mahoHmrg" name="AllergiesSectionTitle" constrainedElement="_2LMIwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qTFbEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ci3LkH3sEeyivuDeOiJBMg" name="AllergiesSectionTitle" constrainedElement="_2LMIwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ci3LkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qTHQQF9xEey5t-mahoHmrg" name="AllergiesSectionText" constrainedElement="_2LMIwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qTHQQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ci4ZsH3sEeyivuDeOiJBMg" name="AllergiesSectionText" constrainedElement="_2LMIwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ci4ZsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qTo0sF9xEey5t-mahoHmrg" name="AllergiesSectionAllergyProblemAct" constrainedElement="_2LMIwBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qTo0sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CjVFoH3sEeyivuDeOiJBMg" name="AllergiesSectionAllergyProblemAct" constrainedElement="_2LMIwBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CjVFoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::AllergyProblemAct))</body>
         </specification>
@@ -5164,15 +5164,15 @@ value.code = '48765-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>couple</body>
         </ownedComment>
       </generalization>
-      <ownedOperation xmi:id="_qTo0sl9xEey5t-mahoHmrg" name="getConsolAllergyProblemActs" bodyCondition="_qTpbwV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qTpbwV9xEey5t-mahoHmrg" name="body" constrainedElement="_qTo0sl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qTpbwl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CjVFon3sEeyivuDeOiJBMg" name="getConsolAllergyProblemActs" bodyCondition="_CjVFpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CjVFpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_CjVFon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CjVFpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::AllergyProblemAct)).oclAsType(consol::AllergyProblemAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qTo0s19xEey5t-mahoHmrg" type="_2EAisBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qTpbwF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_CjVFo33sEeyivuDeOiJBMg" type="_2EAisBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CjVFpH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -5180,40 +5180,40 @@ value.code = '48765-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_hb8PkCAnEeGetMjKLkqR8g">
         <body>This section lists and describes all relevant clinical problems at the time the document is generated. At a minimum, all pertinent current and historical problems should be listed.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qTpbxF9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalTemplateId" constrainedElement="_2LSPYBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qTpbxV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CjVssH3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalTemplateId" constrainedElement="_2LSPYBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CjVssX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.5.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qTtGIF9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalCodeP" constrainedElement="_2LSPYBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qTtGIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CjXh4H3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalCodeP" constrainedElement="_2LSPYBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CjXh4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qTrQ8F9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalCode" constrainedElement="_2LSPYBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qTrQ8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CjWTwH3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalCode" constrainedElement="_2LSPYBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CjWTwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '11450-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qTviYF9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalText" constrainedElement="_2LSPYBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qTviYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CjYwAH3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalText" constrainedElement="_2LSPYBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CjYwAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qTx-oF9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalTitle" constrainedElement="_2LSPYBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qTx-oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CjalMH3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalTitle" constrainedElement="_2LSPYBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CjalMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rBrmcF9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalProblemConcern" constrainedElement="_2LSPYBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rBsNgF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DKl58H3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalProblemConcern" constrainedElement="_2LSPYBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DKmhAH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::ProblemConcernAct))</body>
         </specification>
@@ -5223,15 +5223,15 @@ value.code = '11450-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>couple</body>
         </ownedComment>
       </generalization>
-      <ownedOperation xmi:id="_rBsNgV9xEey5t-mahoHmrg" name="getConsolProblemConcerns" bodyCondition="_rBsNhF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rBsNhF9xEey5t-mahoHmrg" name="body" constrainedElement="_rBsNgV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rBsNhV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DKmhAX3sEeyivuDeOiJBMg" name="getConsolProblemConcerns" bodyCondition="_DKmhBH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DKmhBH3sEeyivuDeOiJBMg" name="body" constrainedElement="_DKmhAX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DKmhBX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::ProblemConcernAct)).oclAsType(consol::ProblemConcernAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rBsNgl9xEey5t-mahoHmrg" type="_2H6yUBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rBsNg19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DKmhAn3sEeyivuDeOiJBMg" type="_2H6yUBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DKmhA33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -5239,40 +5239,40 @@ value.code = '11450-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_2L7IkBSVEeGGzu7fmW9pXw" annotatedElement="_2LWg0BSVEeGGzu7fmW9pXw">
         <body>This section lists and describes any healthcare encounters pertinent to the patient's current health status or historical health history. An Encounter is an interaction, regardless of the setting, between a patient and a practitioner who is vested with primary responsibility for diagnosing, evaluating, or treating the patient's condition. It may include visits, appointments, as well as non face-to-face interactions. It is also a contact between a patient and a practitioner who has primary responsibility for assessing and treating the patient at a given contact, exercising independent judgment. This section may contain all encounters for the time period being summarized, but should include notable encounters.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qTzz0V9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalTemplateId" constrainedElement="_2LWg0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qTzz0l9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CjbMQX3sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalTemplateId" constrainedElement="_2LWg0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CjbMQn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.22.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qT23IF9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalCodeP" constrainedElement="_2LWg0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qT23IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CjdBcH3sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalCodeP" constrainedElement="_2LWg0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CjdBcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qT1B8F9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalCode" constrainedElement="_2LWg0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qT1B8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CjbzUX3sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalCode" constrainedElement="_2LWg0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CjbzUn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '46240-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qT5TYF9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalText" constrainedElement="_2LWg0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qT5TYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cje2oH3sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalText" constrainedElement="_2LWg0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cje2oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qT7IkF9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalTitle" constrainedElement="_2LWg0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qT7IkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CjgEwH3sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalTitle" constrainedElement="_2LWg0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CjgEwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r16fwF9xEey5t-mahoHmrg" name="EncountersSectionEncounterActivities" constrainedElement="_2LWg0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r16fwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D3GaoH3sEeyivuDeOiJBMg" name="EncountersSectionEncounterActivities" constrainedElement="_2LWg0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D3GaoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.encounter.oclIsUndefined() and entry.encounter.oclIsKindOf(consol::EncounterActivities))</body>
         </specification>
@@ -5282,15 +5282,15 @@ value.code = '46240-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>couple</body>
         </ownedComment>
       </generalization>
-      <ownedOperation xmi:id="_r17G0F9xEey5t-mahoHmrg" name="getConsolEncounterActivitiess" bodyCondition="_r17G019xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_r17G019xEey5t-mahoHmrg" name="body" constrainedElement="_r17G0F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_r17G1F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_D3HBsH3sEeyivuDeOiJBMg" name="getConsolEncounterActivitiess" bodyCondition="_D3HBs33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_D3HBs33sEeyivuDeOiJBMg" name="body" constrainedElement="_D3HBsH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_D3HBtH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getEncounters()->select(encounter : cda::Encounter | not encounter.oclIsUndefined() and encounter.oclIsKindOf(consol::EncounterActivities)).oclAsType(consol::EncounterActivities)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_r17G0V9xEey5t-mahoHmrg" type="_2LayQBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r17G0l9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_D3HBsX3sEeyivuDeOiJBMg" type="_2LayQBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_D3HBsn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -5337,82 +5337,82 @@ value.code = '46240-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>(self.sDTCDischargeDispositionCode->isEmpty() or self.sDTCDischargeDispositionCode->exists(element | element.isNullFlavorUndefined())) implies (self.sDTCDischargeDispositionCode->forAll( element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CE) and let value : datatypes::CE = element.oclAsType(datatypes::CE) in (value.codeSystem = '2.16.840.1.113883.6.301.5' or value.codeSystem = '2.16.840.1.113883.12.112') and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qT8WsF9xEey5t-mahoHmrg" name="EncounterActivitiesTemplateId" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qT8WsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cjgr0H3sEeyivuDeOiJBMg" name="EncounterActivitiesTemplateId" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cjgr0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.49')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qT_aAF9xEey5t-mahoHmrg" name="EncounterActivitiesClassCode" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qUABEF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CjjIEH3sEeyivuDeOiJBMg" name="EncounterActivitiesClassCode" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CjjIEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClass::ENC</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qUB2QF9xEey5t-mahoHmrg" name="EncounterActivitiesMoodCode" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qUB2QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cjk9QH3sEeyivuDeOiJBMg" name="EncounterActivitiesMoodCode" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cjk9QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentEncounterMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qUDrcF9xEey5t-mahoHmrg" name="EncounterActivitiesId" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qUDrcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CjmLYH3sEeyivuDeOiJBMg" name="EncounterActivitiesId" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CjmLYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qUE5kF9xEey5t-mahoHmrg" name="EncounterActivitiesCode" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qUE5kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CjmycH3sEeyivuDeOiJBMg" name="EncounterActivitiesCode" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CjmycX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.12' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qUxdIF9xEey5t-mahoHmrg" name="EncounterActivitiesEffectiveTime" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qUxdIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CkCQQH3sEeyivuDeOiJBMg" name="EncounterActivitiesEffectiveTime" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CkCQQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qU0gcF9xEey5t-mahoHmrg" name="EncounterActivitiesSDTCDischargeDispositionCode" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qU0gcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CkEFcH3sEeyivuDeOiJBMg" name="EncounterActivitiesSDTCDischargeDispositionCode" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CkEFcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.sDTCDischargeDispositionCode->isEmpty() or self.sDTCDischargeDispositionCode->exists(element | element.isNullFlavorUndefined())) implies (( not self.sDTCDischargeDispositionCode->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qVenwF9xEey5t-mahoHmrg" name="EncounterActivitiesServiceDeliveryLocation" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qVenwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ckh_gH3sEeyivuDeOiJBMg" name="EncounterActivitiesServiceDeliveryLocation" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ckh_gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant2 | not participant.participantRole.oclIsUndefined() and participant.participantRole.oclIsKindOf(consol::ServiceDeliveryLocation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rEVR0F9xEey5t-mahoHmrg" name="EncounterActivitiesIndication" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rEVR0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DMxrQH3sEeyivuDeOiJBMg" name="EncounterActivitiesIndication" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DMxrQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_t_zkcF9xEey5t-mahoHmrg" name="EncounterActivitiesEncounterPerformer" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_t_zkcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fo69kH3sEeyivuDeOiJBMg" name="EncounterActivitiesEncounterPerformer" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fo69kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->exists(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uI7rQF9xEey5t-mahoHmrg" name="EncounterActivitiesEncounterDiagnosis" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uI7rQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FwmS4H3sEeyivuDeOiJBMg" name="EncounterActivitiesEncounterDiagnosis" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FwmS4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EncounterDiagnosis))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5uh1YF9xEey5t-mahoHmrg" name="EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCode" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5uh1YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pw0aoH3sEeyivuDeOiJBMg" name="EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCode" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pw0aoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5uh1Yl9xEey5t-mahoHmrg" name="EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntity" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5uh1Y19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pw0aon3sEeyivuDeOiJBMg" name="EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntity" constrainedElement="_2LayQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pw0ao33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
@@ -5420,37 +5420,37 @@ value.codeSystem = '2.16.840.1.113883.6.12' and not value.code.oclIsUndefined())
       <generalization xmi:id="_2LttMBSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_AAXtEEbvEd6besF9iFIJkQ"/>
       </generalization>
-      <ownedOperation xmi:id="_qVenwl9xEey5t-mahoHmrg" name="getServiceDeliveryLocations" bodyCondition="_qVenxV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qVenxV9xEey5t-mahoHmrg" name="body" constrainedElement="_qVenwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qVenxl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ckh_gn3sEeyivuDeOiJBMg" name="getServiceDeliveryLocations" bodyCondition="_Ckh_hX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ckh_hX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ckh_gn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ckh_hn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getParticipantRoles()->select(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(consol::ServiceDeliveryLocation)).oclAsType(consol::ServiceDeliveryLocation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qVenw19xEey5t-mahoHmrg" type="_2LiHABSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qVenxF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Ckh_g33sEeyivuDeOiJBMg" type="_2LiHABSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ckh_hH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rEVR0l9xEey5t-mahoHmrg" name="getIndications" bodyCondition="_rEVR1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rEVR1V9xEey5t-mahoHmrg" name="body" constrainedElement="_rEVR0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rEVR1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DMxrQn3sEeyivuDeOiJBMg" name="getIndications" bodyCondition="_DMxrRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DMxrRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_DMxrQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DMxrRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication)).oclAsType(consol::Indication)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rEVR019xEey5t-mahoHmrg" type="_sHrUoBUSEeG6PvUxSTZnaw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rEVR1F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DMxrQ33sEeyivuDeOiJBMg" type="_sHrUoBUSEeG6PvUxSTZnaw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DMxrRH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uI8SUF9xEey5t-mahoHmrg" name="getEncounterDiagnosiss" bodyCondition="_uI8SU19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uI8SU19xEey5t-mahoHmrg" name="body" constrainedElement="_uI8SUF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uI8SVF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FwmS4n3sEeyivuDeOiJBMg" name="getEncounterDiagnosiss" bodyCondition="_FwmS5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FwmS5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_FwmS4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FwmS5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::EncounterDiagnosis)).oclAsType(consol::EncounterDiagnosis)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uI8SUV9xEey5t-mahoHmrg" type="_Ker6MOM2EeGfv4R-kzpM0g" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uI8SUl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_FwmS433sEeyivuDeOiJBMg" type="_Ker6MOM2EeGfv4R-kzpM0g" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FwmS5H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -5473,34 +5473,34 @@ value.codeSystem = '2.16.840.1.113883.6.12' and not value.code.oclIsUndefined())
           <body>self.playingEntity->size()>0 implies self.playingEntity.name->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qVfO0F9xEey5t-mahoHmrg" name="ServiceDeliveryLocationTemplateId" constrainedElement="_2LiHABSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qVfO0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ckh_h33sEeyivuDeOiJBMg" name="ServiceDeliveryLocationTemplateId" constrainedElement="_2LiHABSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ckh_iH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.32')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qVi5MF9xEey5t-mahoHmrg" name="ServiceDeliveryLocationClassCode" constrainedElement="_2LiHABSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qVi5MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ckj0sH3sEeyivuDeOiJBMg" name="ServiceDeliveryLocationClassCode" constrainedElement="_2LiHABSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ckj0sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('classCode') and self.classCode=vocab::RoleClassRoot::SDLOC</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qVkHUF9xEey5t-mahoHmrg" name="ServiceDeliveryLocationCode" constrainedElement="_2LiHABSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qVkHUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CklC0H3sEeyivuDeOiJBMg" name="ServiceDeliveryLocationCode" constrainedElement="_2LiHABSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CklC0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.259' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qWIIAF9xEey5t-mahoHmrg" name="ServiceDeliveryLocationAddr" constrainedElement="_2LiHABSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qWIIAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ck_5kH3sEeyivuDeOiJBMg" name="ServiceDeliveryLocationAddr" constrainedElement="_2LiHABSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ck_5kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.addr->isEmpty() or self.addr->exists(element | element.isNullFlavorUndefined())) implies (not self.addr->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qWJWIF9xEey5t-mahoHmrg" name="ServiceDeliveryLocationTelecom" constrainedElement="_2LiHABSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qWJ9MF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ClBHsH3sEeyivuDeOiJBMg" name="ServiceDeliveryLocationTelecom" constrainedElement="_2LiHABSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ClBHsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.telecom->isEmpty() or self.telecom->exists(element | element.isNullFlavorUndefined())) implies (not self.telecom->isEmpty())</body>
         </specification>
@@ -5510,40 +5510,40 @@ value.codeSystem = '2.16.840.1.113883.6.259' and not value.code.oclIsUndefined()
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_2L7voBSVEeGGzu7fmW9pXw" name="ImmunizationsSection">
-      <ownedRule xmi:id="_qWLLUF9xEey5t-mahoHmrg" name="ImmunizationsSectionEntriesOptionalTemplateId" constrainedElement="_2L7voBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qWLLUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ClBuwH3sEeyivuDeOiJBMg" name="ImmunizationsSectionEntriesOptionalTemplateId" constrainedElement="_2L7voBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ClBuwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.2.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qWNnkF9xEey5t-mahoHmrg" name="ImmunizationsSectionEntriesOptionalCodeP" constrainedElement="_2L7voBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qWNnkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ClDj8H3sEeyivuDeOiJBMg" name="ImmunizationsSectionEntriesOptionalCodeP" constrainedElement="_2L7voBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ClDj8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qWLyYF9xEey5t-mahoHmrg" name="ImmunizationsSectionEntriesOptionalCode" constrainedElement="_2L7voBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qWLyYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ClCV0X3sEeyivuDeOiJBMg" name="ImmunizationsSectionEntriesOptionalCode" constrainedElement="_2L7voBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ClCV0n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '11369-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qWPcwF9xEey5t-mahoHmrg" name="ImmunizationsSectionTitle" constrainedElement="_2L7voBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qWPcwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ClEyEH3sEeyivuDeOiJBMg" name="ImmunizationsSectionTitle" constrainedElement="_2L7voBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ClEyEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qWRR8F9xEey5t-mahoHmrg" name="ImmunizationsSectionText" constrainedElement="_2L7voBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qWRR8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ClGAMH3sEeyivuDeOiJBMg" name="ImmunizationsSectionText" constrainedElement="_2L7voBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ClGAMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qW9OcF9xEey5t-mahoHmrg" name="ImmunizationsSectionImmunization" constrainedElement="_2L7voBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qW9OcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CllIYH3sEeyivuDeOiJBMg" name="ImmunizationsSectionImmunization" constrainedElement="_2L7voBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CllvcH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.substanceAdministration.oclIsUndefined() and entry.substanceAdministration.oclIsKindOf(consol::ImmunizationActivity))</body>
         </specification>
@@ -5553,15 +5553,15 @@ value.code = '11369-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>couple</body>
         </ownedComment>
       </generalization>
-      <ownedOperation xmi:id="_qW9Ocl9xEey5t-mahoHmrg" name="getImmunizations" bodyCondition="_qW9OdV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qW9OdV9xEey5t-mahoHmrg" name="body" constrainedElement="_qW9Ocl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qW9Odl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CllvcX3sEeyivuDeOiJBMg" name="getImmunizations" bodyCondition="_CllvdH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CllvdH3sEeyivuDeOiJBMg" name="body" constrainedElement="_CllvcX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CllvdX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::ImmunizationActivity)).oclAsType(consol::ImmunizationActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qW9Oc19xEey5t-mahoHmrg" type="_2MAoIBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qW9OdF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Cllvcn3sEeyivuDeOiJBMg" type="_2MAoIBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Cllvc33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -5626,190 +5626,190 @@ value.code = '11369-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>self.participant->select(par : cda::Participant2 | par.participantRole.oclIsKindOf(consol::DrugVehicle))->forAll(p : cda::Participant2 | p.typeCode=vocab::ParticipationType::CSM)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qW91gF9xEey5t-mahoHmrg" name="ImmunizationActivityTemplateId" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qW91gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cllvdn3sEeyivuDeOiJBMg" name="ImmunizationActivityTemplateId" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cllvd33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.52')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qXA40F9xEey5t-mahoHmrg" name="ImmunizationActivityClassCode" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qXA40V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CloLsH3sEeyivuDeOiJBMg" name="ImmunizationActivityClassCode" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CloLsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClass::SBADM</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qXCuAF9xEey5t-mahoHmrg" name="ImmunizationActivityMoodCode" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qXCuAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ClpZ0H3sEeyivuDeOiJBMg" name="ImmunizationActivityMoodCode" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ClpZ0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentSubstanceMood) and 
 let value : vocab::x_DocumentSubstanceMood = self.moodCode.oclAsType(vocab::x_DocumentSubstanceMood) in 
 value = vocab::x_DocumentSubstanceMood::EVN or value = vocab::x_DocumentSubstanceMood::INT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qXn80F9xEey5t-mahoHmrg" name="ImmunizationActivityNegationInd" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qXn80V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CmFesH3sEeyivuDeOiJBMg" name="ImmunizationActivityNegationInd" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CmFesX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.negationInd.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qXpyAF9xEey5t-mahoHmrg" name="ImmunizationActivityId" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qXpyAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CmHT4H3sEeyivuDeOiJBMg" name="ImmunizationActivityId" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CmHT4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qXrAIF9xEey5t-mahoHmrg" name="ImmunizationActivityCode" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qXrAIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CmIiAH3sEeyivuDeOiJBMg" name="ImmunizationActivityCode" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CmIiAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qXs1UF9xEey5t-mahoHmrg" name="ImmunizationActivityText" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qXs1UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CmJwIH3sEeyivuDeOiJBMg" name="ImmunizationActivityText" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CmJwIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qXuDcF9xEey5t-mahoHmrg" name="ImmunizationActivityStatusCode" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qXuDcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CmK-QH3sEeyivuDeOiJBMg" name="ImmunizationActivityStatusCode" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CmK-QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qXvRkF9xEey5t-mahoHmrg" name="ImmunizationActivityEffectiveTime" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qXvRkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CmMzcH3sEeyivuDeOiJBMg" name="ImmunizationActivityEffectiveTime" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CmMzcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime->isEmpty() or self.effectiveTime->exists(element | element.isNullFlavorUndefined())) implies (self.effectiveTime->size() =  1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qXwfsF9xEey5t-mahoHmrg" name="ImmunizationActivityRepeatNumber" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qXwfsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CmOBkH3sEeyivuDeOiJBMg" name="ImmunizationActivityRepeatNumber" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CmOBkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.repeatNumber.oclIsUndefined() or self.repeatNumber.isNullFlavorUndefined()) implies (not self.repeatNumber.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qYT5UF9xEey5t-mahoHmrg" name="ImmunizationActivityRouteCodeP" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qYT5UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cmo4UH3sEeyivuDeOiJBMg" name="ImmunizationActivityRouteCodeP" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cmo4UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.routeCode.oclIsUndefined() or self.routeCode.isNullFlavorUndefined()) implies (not self.routeCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qXxt0F9xEey5t-mahoHmrg" name="ImmunizationActivityRouteCode" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qXxt0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CmOooH3sEeyivuDeOiJBMg" name="ImmunizationActivityRouteCode" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CmOooX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.routeCode.oclIsUndefined() or self.routeCode.isNullFlavorUndefined()) implies (not self.routeCode.oclIsUndefined() and self.routeCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.routeCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.3.26.1.1' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qY2r4F9xEey5t-mahoHmrg" name="ImmunizationActivityApproachSiteCode" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qY2r4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CnDvEH3sEeyivuDeOiJBMg" name="ImmunizationActivityApproachSiteCode" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CnDvEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.approachSiteCode->isEmpty() or self.approachSiteCode->exists(element | element.isNullFlavorUndefined())) implies (self.approachSiteCode->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qZY3YF9xEey5t-mahoHmrg" name="ImmunizationActivityApproachSiteCodeP" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qZY3YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cnd-wH3sEeyivuDeOiJBMg" name="ImmunizationActivityApproachSiteCodeP" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cnd-wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.approachSiteCode->isEmpty() or self.approachSiteCode->exists(element | element.isNullFlavorUndefined())) implies (( not self.approachSiteCode->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qZ7C4F9xEey5t-mahoHmrg" name="ImmunizationActivityDoseQuantity" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qZ7C4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cn6qsH3sEeyivuDeOiJBMg" name="ImmunizationActivityDoseQuantity" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cn6qsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.doseQuantity.oclIsUndefined() or self.doseQuantity.isNullFlavorUndefined()) implies (not self.doseQuantity.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qad1cF9xEey5t-mahoHmrg" name="ImmunizationActivityAdministrationUnitCodeP" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qad1cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CoU6YH3sEeyivuDeOiJBMg" name="ImmunizationActivityAdministrationUnitCodeP" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CoU6YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.administrationUnitCode.oclIsUndefined() or self.administrationUnitCode.isNullFlavorUndefined()) implies (not self.administrationUnitCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qZ8RAF9xEey5t-mahoHmrg" name="ImmunizationActivityAdministrationUnitCode" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qZ8RAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cn740H3sEeyivuDeOiJBMg" name="ImmunizationActivityAdministrationUnitCode" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cn740X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.administrationUnitCode.oclIsUndefined() or self.administrationUnitCode.isNullFlavorUndefined()) implies (not self.administrationUnitCode.oclIsUndefined() and self.administrationUnitCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.administrationUnitCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.3.26.1.1' and (value.code = 'C42887' or value.code = 'C42888' or value.code = 'C42960' or value.code = 'C42971' or value.code = 'C42889' or value.code = 'C42892' or value.code = 'C42890' or value.code = 'C43451' or value.code = 'C42891' or value.code = 'C25158' or value.code = 'C42895' or value.code = 'C42896' or value.code = 'C42917' or value.code = 'C42902' or value.code = 'C42904' or value.code = 'C42916' or value.code = 'C42928' or value.code = 'C42936' or value.code = 'C42954' or value.code = 'C45414' or value.code = 'C42678' or value.code = 'C60884' or value.code = 'C60891' or value.code = 'C42900' or value.code = 'C42919' or value.code = 'C28944' or value.code = 'C60897' or value.code = 'C42901' or value.code = 'C45415' or value.code = 'C47890' or value.code = 'C43525' or value.code = 'C42679' or value.code = 'C42763' or value.code = 'C17423' or value.code = 'C42912' or value.code = 'C42913' or value.code = 'C42915' or value.code = 'C42929' or value.code = 'C60926' or value.code = 'C42932' or value.code = 'C42920' or value.code = 'C42984' or value.code = 'C60927' or value.code = 'C60928' or value.code = 'C60929' or value.code = 'C42933' or value.code = 'C42934' or value.code = 'C42906' or value.code = 'C60930' or value.code = 'C48193' or value.code = 'C42937' or value.code = 'C45416' or value.code = 'C42938' or value.code = 'C42903' or value.code = 'C42909' or value.code = 'C42939' or value.code = 'C42940' or value.code = 'C42921' or value.code = 'C42941' or value.code = 'C42894' or value.code = 'C42978' or value.code = 'C42942' or value.code = 'C42944' or value.code = 'C60931' or value.code = 'C42946' or value.code = 'C42914' or value.code = 'C42950' or value.code = 'C42974' or value.code = 'C42976' or value.code = 'C42977' or value.code = 'C42959' or value.code = 'C42957' or value.code = 'C42958' or value.code = 'C42956' or value.code = 'C42945' or value.code = 'C42899' or value.code = 'C42995' or value.code = 'C42926' or value.code = 'C42951' or value.code = 'C42988' or value.code = 'C60933' or value.code = 'C42922' or value.code = 'C47915' or value.code = 'C42947' or value.code = 'C42948' or value.code = 'C47916' or value.code = 'C45413' or value.code = 'C42949' or value.code = 'C42952' or value.code = 'C42953' or value.code = 'C60934' or value.code = 'C29167' or value.code = 'C60957' or value.code = 'C60958' or value.code = 'C42955' or value.code = 'C29269' or value.code = 'C42965' or value.code = 'C42966' or value.code = 'C60984' or value.code = 'C47887' or value.code = 'C42967' or value.code = 'C42907' or value.code = 'C60985' or value.code = 'C42968' or value.code = 'C42923' or value.code = 'C42911' or value.code = 'C42969' or value.code = 'C42943' or value.code = 'C42918' or value.code = 'C25394' or value.code = 'C42970' or value.code = 'C47913' or value.code = 'C42972' or value.code = 'C42908' or value.code = 'C42973' or value.code = 'C42975' or value.code = 'C42961' or value.code = 'C60988' or value.code = 'C42979' or value.code = 'C42980' or value.code = 'C42981' or value.code = 'C42982' or value.code = 'C42983' or value.code = 'C42986' or value.code = 'C42898' or value.code = 'C42987' or value.code = 'C60994' or value.code = 'C42935' or value.code = 'C60992' or value.code = 'C47912' or value.code = 'C42989' or value.code = 'C42962' or value.code = 'C42990' or value.code = 'C42991' or value.code = 'C47914' or value.code = 'C42993' or value.code = 'C42924' or value.code = 'C42994' or value.code = 'C42925' or value.code = 'C60995' or value.code = 'C47889' or value.code = 'C47898' or value.code = 'C42996' or value.code = 'C42998' or value.code = 'C42893' or value.code = 'C42897' or value.code = 'C60997' or value.code = 'C42905' or value.code = 'C42997' or value.code = 'C42910' or value.code = 'C42927' or value.code = 'C42931' or value.code = 'C42930' or value.code = 'C61004' or value.code = 'C61005' or value.code = 'C42964' or value.code = 'C42963' or value.code = 'C42999' or value.code = 'C61006' or value.code = 'C42985' or value.code = 'C42992' or value.code = 'C47892' or value.code = 'C47897' or value.code = 'C43000' or value.code = 'C43001' or value.code = 'C43002' or value.code = 'C43003'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rFWlgF9xEey5t-mahoHmrg" name="ImmunizationActivityDrugVehicle" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rFWlgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DNv7oH3sEeyivuDeOiJBMg" name="ImmunizationActivityDrugVehicle" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DNv7oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->one(participant : cda::Participant2 | not participant.participantRole.oclIsUndefined() and participant.participantRole.oclIsKindOf(consol::DrugVehicle))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rF0fkF9xEey5t-mahoHmrg" name="ImmunizationActivityIndication" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rF0fkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DOXmsH3sEeyivuDeOiJBMg" name="ImmunizationActivityIndication" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DOXmsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rGWrEF9xEey5t-mahoHmrg" name="ImmunizationActivityInstructions" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rGWrEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DO1gwH3sEeyivuDeOiJBMg" name="ImmunizationActivityInstructions" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DO1gwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instructions) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rG2aUF9xEey5t-mahoHmrg" name="ImmunizationActivityMedicationDispense" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rG2aUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DPRloH3sEeyivuDeOiJBMg" name="ImmunizationActivityMedicationDispense" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DPRloX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::MedicationDispense) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rHU7cF9xEey5t-mahoHmrg" name="ImmunizationActivityReactionObservation" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rHU7cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DPscYH3sEeyivuDeOiJBMg" name="ImmunizationActivityReactionObservation" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DPscYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ReactionObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::CAUS)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rIeK8F9xEey5t-mahoHmrg" name="ImmunizationActivityImmunizationRefusalReason" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rIeK8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DQoQgH3sEeyivuDeOiJBMg" name="ImmunizationActivityImmunizationRefusalReason" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DQoQgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ImmunizationRefusalReason) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rJmMUF9xEey5t-mahoHmrg" name="ImmunizationActivityConsumable" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rJmMUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DRl50H3sEeyivuDeOiJBMg" name="ImmunizationActivityConsumable" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DRl50X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.consumable->one(consumable : cda::Consumable | not consumable.oclIsUndefined() and consumable.oclIsKindOf(cda::Consumable))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rRTW0F9xEey5t-mahoHmrg" name="ImmunizationActivityPerformer" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rRTW0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DYrZQH3sEeyivuDeOiJBMg" name="ImmunizationActivityPerformer" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DYrZQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->one(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(rim::Participation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rVViQF9xEey5t-mahoHmrg" name="ImmunizationActivityMedicationSupplyOrder" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rVViQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dby-sH3sEeyivuDeOiJBMg" name="ImmunizationActivityMedicationSupplyOrder" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dby-sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::MedicationSupplyOrder) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2LvrIF9xEey5t-mahoHmrg" name="ImmunizationActivityPrecondition" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2LvrIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Mykg0H3sEeyivuDeOiJBMg" name="ImmunizationActivityPrecondition" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mykg0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.precondition->exists(precondition : cda::Precondition | not precondition.oclIsUndefined() and precondition.oclIsKindOf(cda::Precondition))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5vCLsF9xEey5t-mahoHmrg" name="ImmunizationActivityConsumableImmunizationMedicationInformation" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5vCLsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PxSUsH3sEeyivuDeOiJBMg" name="ImmunizationActivityConsumableImmunizationMedicationInformation" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PxSUsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.consumable->excluding(null)->reject(manufacturedProduct->one(manufacturedProduct : cda::ManufacturedProduct | not manufacturedProduct.oclIsUndefined() and manufacturedProduct.oclIsKindOf(consol::ImmunizationMedicationInformation)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5vkXMF9xEey5t-mahoHmrg" name="ImmunizationActivityPreconditionTypeCode" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5vkXMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PxtLcH3sEeyivuDeOiJBMg" name="ImmunizationActivityPreconditionTypeCode" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PxtLcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.precondition->excluding(null)->reject(isDefined('typeCode') and typeCode=vocab::ActRelationshipType::PRCN)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5vk-QF9xEey5t-mahoHmrg" name="ImmunizationActivityPreconditionPreconditionForSubstanceAdministration" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5vk-QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PxtygH3sEeyivuDeOiJBMg" name="ImmunizationActivityPreconditionPreconditionForSubstanceAdministration" constrainedElement="_2MAoIBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PxtygX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.precondition->excluding(null)->reject(criterion->one(criterion : cda::Criterion | not criterion.oclIsUndefined() and criterion.oclIsKindOf(consol::PreconditionForSubstanceAdministration)))</body>
         </specification>
@@ -5817,81 +5817,81 @@ value.codeSystem = '2.16.840.1.113883.3.26.1.1' and (value.code = 'C42887' or va
       <generalization xmi:id="_2MQfwxSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_nazskEbuEd6besF9iFIJkQ"/>
       </generalization>
-      <ownedOperation xmi:id="_rFWlgl9xEey5t-mahoHmrg" name="getDrugVehicle" bodyCondition="_rFWlhV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rFWlhV9xEey5t-mahoHmrg" name="body" constrainedElement="_rFWlgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rFWlhl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DNwisH3sEeyivuDeOiJBMg" name="getDrugVehicle" bodyCondition="_DNwis33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DNwis33sEeyivuDeOiJBMg" name="body" constrainedElement="_DNwisH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DNwitH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getParticipantRoles()->select(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(consol::DrugVehicle))->asSequence()->any(true).oclAsType(consol::DrugVehicle)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rFWlg19xEey5t-mahoHmrg" type="_VBXq8BUTEeG6PvUxSTZnaw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rFWlhF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_DNwisX3sEeyivuDeOiJBMg" type="_VBXq8BUTEeG6PvUxSTZnaw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DNwisn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rF0fkl9xEey5t-mahoHmrg" name="getIndication" bodyCondition="_rF0flV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rF0flV9xEey5t-mahoHmrg" name="body" constrainedElement="_rF0fkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rF0fll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DOXmsn3sEeyivuDeOiJBMg" name="getIndication" bodyCondition="_DOXmtX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DOXmtX3sEeyivuDeOiJBMg" name="body" constrainedElement="_DOXmsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DOYNwH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication))->asSequence()->any(true).oclAsType(consol::Indication)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rF0fk19xEey5t-mahoHmrg" type="_sHrUoBUSEeG6PvUxSTZnaw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rF0flF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_DOXms33sEeyivuDeOiJBMg" type="_sHrUoBUSEeG6PvUxSTZnaw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DOXmtH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rGWrEl9xEey5t-mahoHmrg" name="getInstructions" bodyCondition="_rGWrFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rGWrFV9xEey5t-mahoHmrg" name="body" constrainedElement="_rGWrEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rGWrFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DO1gwn3sEeyivuDeOiJBMg" name="getInstructions" bodyCondition="_DO2H0H3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DO2H0H3sEeyivuDeOiJBMg" name="body" constrainedElement="_DO1gwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DO2H0X3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instructions))->asSequence()->any(true).oclAsType(consol::Instructions)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rGWrE19xEey5t-mahoHmrg" type="_2G8h9RSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rGWrFF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_DO1gw33sEeyivuDeOiJBMg" type="_2G8h9RSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DO1gxH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rG3BYF9xEey5t-mahoHmrg" name="getMedicationDispense" bodyCondition="_rG3BY19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rG3BY19xEey5t-mahoHmrg" name="body" constrainedElement="_rG3BYF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rG3BZF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DPSMsH3sEeyivuDeOiJBMg" name="getMedicationDispense" bodyCondition="_DPSMs33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DPSMs33sEeyivuDeOiJBMg" name="body" constrainedElement="_DPSMsH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DPSMtH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::MedicationDispense))->asSequence()->any(true).oclAsType(consol::MedicationDispense)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rG3BYV9xEey5t-mahoHmrg" type="_DpoGkBUUEeG6PvUxSTZnaw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rG3BYl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_DPSMsX3sEeyivuDeOiJBMg" type="_DpoGkBUUEeG6PvUxSTZnaw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DPSMsn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rHU7cl9xEey5t-mahoHmrg" name="getReactionObservation" bodyCondition="_rHU7dV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rHU7dV9xEey5t-mahoHmrg" name="body" constrainedElement="_rHU7cl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rHU7dl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DPscYn3sEeyivuDeOiJBMg" name="getReactionObservation" bodyCondition="_DPtDcX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DPtDcX3sEeyivuDeOiJBMg" name="body" constrainedElement="_DPscYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DPtDcn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ReactionObservation))->asSequence()->any(true).oclAsType(consol::ReactionObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rHU7c19xEey5t-mahoHmrg" type="_2E_aIRSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rHU7dF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_DPscY33sEeyivuDeOiJBMg" type="_2E_aIRSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DPtDcH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rIeK8l9xEey5t-mahoHmrg" name="getImmunizationRefusalReason" bodyCondition="_rIeK9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rIeK9V9xEey5t-mahoHmrg" name="body" constrainedElement="_rIeK8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rIeK9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DQoQgn3sEeyivuDeOiJBMg" name="getImmunizationRefusalReason" bodyCondition="_DQoQhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DQoQhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_DQoQgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DQoQhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ImmunizationRefusalReason))->asSequence()->any(true).oclAsType(consol::ImmunizationRefusalReason)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rIeK819xEey5t-mahoHmrg" type="__qYdcBVNEeGbmN_W114JUw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rIeK9F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_DQoQg33sEeyivuDeOiJBMg" type="__qYdcBVNEeGbmN_W114JUw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DQoQhH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rVViQl9xEey5t-mahoHmrg" name="getMedicationSupplyOrder" bodyCondition="_rVViRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rVViRV9xEey5t-mahoHmrg" name="body" constrainedElement="_rVViQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rVViRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Dby-sn3sEeyivuDeOiJBMg" name="getMedicationSupplyOrder" bodyCondition="_Dby-tX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Dby-tX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Dby-sn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dby-tn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::MedicationSupplyOrder))->asSequence()->any(true).oclAsType(consol::MedicationSupplyOrder)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rVViQ19xEey5t-mahoHmrg" type="_j3aTQBrTEeGo461UQq-B1g" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rVViRF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Dby-s33sEeyivuDeOiJBMg" type="_j3aTQBrTEeGo461UQq-B1g" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Dby-tH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -5917,40 +5917,40 @@ that represents the preference order. Each policy or program identifies the cove
 with respect to the payer, so that the identifiers can be recorded.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_qbBPEF9xEey5t-mahoHmrg" name="PayersSectionTemplateId" constrainedElement="_2MV_UBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qbBPEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CowYMH3sEeyivuDeOiJBMg" name="PayersSectionTemplateId" constrainedElement="_2MV_UBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CowYMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.18')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qbCdMF9xEey5t-mahoHmrg" name="PayersSectionCode" constrainedElement="_2MV_UBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qbCdMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cow_QX3sEeyivuDeOiJBMg" name="PayersSectionCode" constrainedElement="_2MV_UBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cow_Qn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '48768-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qbESYF9xEey5t-mahoHmrg" name="PayersSectionCodeP" constrainedElement="_2MV_UBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qbESYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CoyNYH3sEeyivuDeOiJBMg" name="PayersSectionCodeP" constrainedElement="_2MV_UBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CoyNYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qbFggF9xEey5t-mahoHmrg" name="PayersSectionTitle" constrainedElement="_2MV_UBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qbFggV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CozbgH3sEeyivuDeOiJBMg" name="PayersSectionTitle" constrainedElement="_2MV_UBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CozbgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qbHVsF9xEey5t-mahoHmrg" name="PayersSectionText" constrainedElement="_2MV_UBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qbHVsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Co1QsH3sEeyivuDeOiJBMg" name="PayersSectionText" constrainedElement="_2MV_UBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Co1QsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q9lJkF9xEey5t-mahoHmrg" name="PayersSectionCoverageActivity" constrainedElement="_2MV_UBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q9lJkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DHaDEH3sEeyivuDeOiJBMg" name="PayersSectionCoverageActivity" constrainedElement="_2MV_UBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DHaDEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::CoverageActivity))</body>
         </specification>
@@ -5958,53 +5958,53 @@ value.code = '48768-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_2NICchSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_q9lJkl9xEey5t-mahoHmrg" name="getCoverageActivities" bodyCondition="_q9lJlV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_q9lJlV9xEey5t-mahoHmrg" name="body" constrainedElement="_q9lJkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_q9lJll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DHaDEn3sEeyivuDeOiJBMg" name="getCoverageActivities" bodyCondition="_DHaqIn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DHaqIn3sEeyivuDeOiJBMg" name="body" constrainedElement="_DHaDEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DHaqI33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::CoverageActivity)).oclAsType(consol::CoverageActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_q9lJk19xEey5t-mahoHmrg" type="_Cg3pkBUmEeGvPruliC3crg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_q9lJlF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DHaqIH3sEeyivuDeOiJBMg" type="_Cg3pkBUmEeGvPruliC3crg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DHaqIX3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_2NIpgBSVEeGGzu7fmW9pXw" name="MedicationsSection">
-      <ownedRule xmi:id="_qbIj0V9xEey5t-mahoHmrg" name="MedicationsSectionEntriesOptionalTemplateId" constrainedElement="_2NIpgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qbIj0l9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Co13wX3sEeyivuDeOiJBMg" name="MedicationsSectionEntriesOptionalTemplateId" constrainedElement="_2NIpgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Co13wn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.1.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qbLAEF9xEey5t-mahoHmrg" name="MedicationsSectionEntriesOptionalCodeP" constrainedElement="_2NIpgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qbLAEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Co3s8H3sEeyivuDeOiJBMg" name="MedicationsSectionEntriesOptionalCodeP" constrainedElement="_2NIpgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Co3s8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qbJx8F9xEey5t-mahoHmrg" name="MedicationsSectionEntriesOptionalCode" constrainedElement="_2NIpgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qbJx8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Co2e0X3sEeyivuDeOiJBMg" name="MedicationsSectionEntriesOptionalCode" constrainedElement="_2NIpgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Co2e0n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10160-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qbM1QF9xEey5t-mahoHmrg" name="MedicationsSectionTitle" constrainedElement="_2NIpgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qbM1QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Co5iIH3sEeyivuDeOiJBMg" name="MedicationsSectionTitle" constrainedElement="_2NIpgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Co5iIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qbOqcF9xEey5t-mahoHmrg" name="MedicationsSectionText" constrainedElement="_2NIpgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qbOqcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Co6wQH3sEeyivuDeOiJBMg" name="MedicationsSectionText" constrainedElement="_2NIpgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Co6wQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qbxdAF9xEey5t-mahoHmrg" name="MedicationsSectionMedication" constrainedElement="_2NIpgBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qbxdAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CpU_8H3sEeyivuDeOiJBMg" name="MedicationsSectionMedication" constrainedElement="_2NIpgBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CpU_8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.substanceAdministration.oclIsUndefined() and entry.substanceAdministration.oclIsKindOf(consol::MedicationActivity))</body>
         </specification>
@@ -6014,15 +6014,15 @@ value.code = '10160-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>couple</body>
         </ownedComment>
       </generalization>
-      <ownedOperation xmi:id="_qbxdAl9xEey5t-mahoHmrg" name="getMedications" bodyCondition="_qbxdBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qbxdBV9xEey5t-mahoHmrg" name="body" constrainedElement="_qbxdAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qbyEEF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CpU_8n3sEeyivuDeOiJBMg" name="getMedications" bodyCondition="_CpU_9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CpU_9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_CpU_8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CpU_9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity)).oclAsType(consol::MedicationActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qbxdA19xEey5t-mahoHmrg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qbxdBF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_CpU_833sEeyivuDeOiJBMg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CpU_9H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -6030,76 +6030,76 @@ value.code = '10160-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_2N0mCRSVEeGGzu7fmW9pXw" annotatedElement="_2NP-QxSVEeGGzu7fmW9pXw">
         <body>The Plan of Care section contains data that defines pending orders, interventions, encounters, services, and procedures for the patient. It is limited to prospective, unfulfilled, or incomplete orders and requests only, which are indicated by the @moodCode of the entries within this section. All active, incomplete, or pending orders, appointments, referrals, procedures, services, or any other pending event of clinical significance to the current care of the patient should be listed unless constrained due to privacy issues. The plan may also contain information about ongoing care of the patient and information regarding goals and clinical reminders. Clinical reminders are placed here to provide prompts for disease prevention and management, patient safety, and health-care quality improvements, including widely accepted performance measures. The plan may also indicate that patient education was given or will be provided.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qbyEEV9xEey5t-mahoHmrg" name="PlanOfCareSectionTemplateId" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qbyEEl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CpU_933sEeyivuDeOiJBMg" name="PlanOfCareSectionTemplateId" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CpU_-H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.10')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qbzSMF9xEey5t-mahoHmrg" name="PlanOfCareSectionCode" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qbzSMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CpVnAX3sEeyivuDeOiJBMg" name="PlanOfCareSectionCode" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CpVnAn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '18776-5' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qb0gUF9xEey5t-mahoHmrg" name="PlanOfCareSectionCodeP" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qb0gUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CpXcMH3sEeyivuDeOiJBMg" name="PlanOfCareSectionCodeP" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CpXcMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qb2VgF9xEey5t-mahoHmrg" name="PlanOfCareSectionTitle" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qb2VgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CpYqUH3sEeyivuDeOiJBMg" name="PlanOfCareSectionTitle" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CpYqUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qb3joF9xEey5t-mahoHmrg" name="PlanOfCareSectionText" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qb3joV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CpZ4cH3sEeyivuDeOiJBMg" name="PlanOfCareSectionText" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CpZ4cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qdSf8F9xEey5t-mahoHmrg" name="PlanOfCareSectionPlanOfCareActivityAct" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qdSf8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cqh50H3sEeyivuDeOiJBMg" name="PlanOfCareSectionPlanOfCareActivityAct" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cqh50X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::PlanOfCareActivityAct))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qeTMkF9xEey5t-mahoHmrg" name="PlanOfCareSectionPlanOfCareActivityEncounter" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qeTMkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CrwB0H3sEeyivuDeOiJBMg" name="PlanOfCareSectionPlanOfCareActivityEncounter" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CrwB0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.encounter.oclIsUndefined() and entry.encounter.oclIsKindOf(consol::PlanOfCareActivityEncounter))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qfWVcF9xEey5t-mahoHmrg" name="PlanOfCareSectionPlanOfCareActivityObservation" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qfWVcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CssdAH3sEeyivuDeOiJBMg" name="PlanOfCareSectionPlanOfCareActivityObservation" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CssdAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::PlanOfCareActivityObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qgdIsF9xEey5t-mahoHmrg" name="PlanOfCareSectionPlanOfCareActivityProcedure" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qgdIsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CtnDAH3sEeyivuDeOiJBMg" name="PlanOfCareSectionPlanOfCareActivityProcedure" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CtnDAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.procedure.oclIsUndefined() and entry.procedure.oclIsKindOf(consol::PlanOfCareActivityProcedure))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qhkjAF9xEey5t-mahoHmrg" name="PlanOfCareSectionPlanOfCareActivitySubstanceAdministration" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qhkjAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CukFQH3sEeyivuDeOiJBMg" name="PlanOfCareSectionPlanOfCareActivitySubstanceAdministration" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CukFQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.substanceAdministration.oclIsUndefined() and entry.substanceAdministration.oclIsKindOf(consol::PlanOfCareActivitySubstanceAdministration))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qirWQF9xEey5t-mahoHmrg" name="PlanOfCareSectionPlanOfCareActivitySupply" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qirWQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CverQH3sEeyivuDeOiJBMg" name="PlanOfCareSectionPlanOfCareActivitySupply" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CverQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.supply.oclIsUndefined() and entry.supply.oclIsKindOf(consol::PlanOfCareActivitySupply))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uHwmkF9xEey5t-mahoHmrg" name="PlanOfCareSectionInstructions" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uHwmkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FvopkH3sEeyivuDeOiJBMg" name="PlanOfCareSectionInstructions" constrainedElement="_2NP-QxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FvopkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::Instructions))</body>
         </specification>
@@ -6107,107 +6107,107 @@ value.code = '18776-5' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_h0yLgBnTEeGs5a462vYX5Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_qdSf8l9xEey5t-mahoHmrg" name="getPlanOfCareActivityActs" bodyCondition="_qdSf9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qdSf9V9xEey5t-mahoHmrg" name="body" constrainedElement="_qdSf8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qdSf9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Cqh50n3sEeyivuDeOiJBMg" name="getPlanOfCareActivityActs" bodyCondition="_Cqh51X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Cqh51X3sEeyivuDeOiJBMg" name="body" constrainedElement="_Cqh50n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cqh51n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PlanOfCareActivityAct)).oclAsType(consol::PlanOfCareActivityAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qdSf819xEey5t-mahoHmrg" type="_2NWE5xSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qdSf9F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Cqh5033sEeyivuDeOiJBMg" type="_2NWE5xSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Cqh51H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_qeTMkl9xEey5t-mahoHmrg" name="getPlanOfCareActivityEncounters" bodyCondition="_qeTMlV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qeTMlV9xEey5t-mahoHmrg" name="body" constrainedElement="_qeTMkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qeTMll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CrwB0n3sEeyivuDeOiJBMg" name="getPlanOfCareActivityEncounters" bodyCondition="_Crwo4n3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Crwo4n3sEeyivuDeOiJBMg" name="body" constrainedElement="_CrwB0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Crwo433sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getEncounters()->select(encounter : cda::Encounter | not encounter.oclIsUndefined() and encounter.oclIsKindOf(consol::PlanOfCareActivityEncounter)).oclAsType(consol::PlanOfCareActivityEncounter)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qeTMk19xEey5t-mahoHmrg" type="_2NWFBBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qeTMlF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Crwo4H3sEeyivuDeOiJBMg" type="_2NWFBBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Crwo4X3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_qfW8gF9xEey5t-mahoHmrg" name="getPlanOfCareActivityObservations" bodyCondition="_qfW8g19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qfW8g19xEey5t-mahoHmrg" name="body" constrainedElement="_qfW8gF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qfW8hF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CssdAn3sEeyivuDeOiJBMg" name="getPlanOfCareActivityObservations" bodyCondition="_CssdBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CssdBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_CssdAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CssdBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PlanOfCareActivityObservation)).oclAsType(consol::PlanOfCareActivityObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qfW8gV9xEey5t-mahoHmrg" type="_2NcLjhSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qfW8gl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_CssdA33sEeyivuDeOiJBMg" type="_2NcLjhSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CssdBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_qgdIsl9xEey5t-mahoHmrg" name="getPlanOfCareActivityProcedures" bodyCondition="_qgdItV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qgdItV9xEey5t-mahoHmrg" name="body" constrainedElement="_qgdIsl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qgdItl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CtnqEH3sEeyivuDeOiJBMg" name="getPlanOfCareActivityProcedures" bodyCondition="_CtnqE33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CtnqE33sEeyivuDeOiJBMg" name="body" constrainedElement="_CtnqEH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CtnqFH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getProcedures()->select(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::PlanOfCareActivityProcedure)).oclAsType(consol::PlanOfCareActivityProcedure)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qgdIs19xEey5t-mahoHmrg" type="_2NiSKhSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qgdItF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_CtnqEX3sEeyivuDeOiJBMg" type="_2NiSKhSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CtnqEn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_qhkjAl9xEey5t-mahoHmrg" name="getPlanOfCareActivitySubstanceAdministrations" bodyCondition="_qhkjBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qhkjBV9xEey5t-mahoHmrg" name="body" constrainedElement="_qhkjAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qhkjBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CuksUH3sEeyivuDeOiJBMg" name="getPlanOfCareActivitySubstanceAdministrations" bodyCondition="_CuksU33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CuksU33sEeyivuDeOiJBMg" name="body" constrainedElement="_CuksUH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CuksVH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::PlanOfCareActivitySubstanceAdministration)).oclAsType(consol::PlanOfCareActivitySubstanceAdministration)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qhkjA19xEey5t-mahoHmrg" type="_2NoYwxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qhkjBF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_CuksUX3sEeyivuDeOiJBMg" type="_2NoYwxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CuksUn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_qir9UF9xEey5t-mahoHmrg" name="getPlanOfCareActivitySupplies" bodyCondition="_qir9U19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qir9U19xEey5t-mahoHmrg" name="body" constrainedElement="_qir9UF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qir9VF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CverQn3sEeyivuDeOiJBMg" name="getPlanOfCareActivitySupplies" bodyCondition="_CverRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CverRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_CverQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CverRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::PlanOfCareActivitySupply)).oclAsType(consol::PlanOfCareActivitySupply)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qir9UV9xEey5t-mahoHmrg" type="_2NoY5BSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qir9Ul9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_CverQ33sEeyivuDeOiJBMg" type="_2NoY5BSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CverRH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uHwmkl9xEey5t-mahoHmrg" name="getInstructionss" bodyCondition="_uHxNoV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uHxNoV9xEey5t-mahoHmrg" name="body" constrainedElement="_uHwmkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uHxNol9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FvpQoH3sEeyivuDeOiJBMg" name="getInstructionss" bodyCondition="_FvpQo33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FvpQo33sEeyivuDeOiJBMg" name="body" constrainedElement="_FvpQoH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FvpQpH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instructions)).oclAsType(consol::Instructions)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uHwmk19xEey5t-mahoHmrg" type="_2G8h9RSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uHxNoF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_FvpQoX3sEeyivuDeOiJBMg" type="_2G8h9RSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FvpQon3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_2NWE5xSVEeGGzu7fmW9pXw" name="PlanOfCareActivityAct">
-      <ownedRule xmi:id="_qb4xwF9xEey5t-mahoHmrg" name="PlanOfCareActivityActTemplateId" constrainedElement="_2NWE5xSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qb4xwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CpbGkH3sEeyivuDeOiJBMg" name="PlanOfCareActivityActTemplateId" constrainedElement="_2NWE5xSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CpbGkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.39')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qb6m8F9xEey5t-mahoHmrg" name="PlanOfCareActivityActClassCode" constrainedElement="_2NWE5xSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qb6m8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CpcUsH3sEeyivuDeOiJBMg" name="PlanOfCareActivityActClassCode" constrainedElement="_2NWE5xSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CpcUsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qb71EF9xEey5t-mahoHmrg" name="PlanOfCareActivityActMoodCode" constrainedElement="_2NWE5xSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qb71EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cpc7wH3sEeyivuDeOiJBMg" name="PlanOfCareActivityActMoodCode" constrainedElement="_2NWE5xSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cpc7wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentActMood) and 
 let value : vocab::x_DocumentActMood = self.moodCode.oclAsType(vocab::x_DocumentActMood) in 
 value = vocab::x_DocumentActMood::INT or value = vocab::x_DocumentActMood::ARQ or value = vocab::x_DocumentActMood::PRMS or value = vocab::x_DocumentActMood::PRP or value = vocab::x_DocumentActMood::RQO</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qcyJoF9xEey5t-mahoHmrg" name="PlanOfCareActivityActId" constrainedElement="_2NWE5xSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qcyJoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cp9SEH3sEeyivuDeOiJBMg" name="PlanOfCareActivityActId" constrainedElement="_2NWE5xSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cp9SEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
@@ -6217,28 +6217,28 @@ value = vocab::x_DocumentActMood::INT or value = vocab::x_DocumentActMood::ARQ o
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_2NWFBBSVEeGGzu7fmW9pXw" name="PlanOfCareActivityEncounter">
-      <ownedRule xmi:id="_qdSf919xEey5t-mahoHmrg" name="PlanOfCareActivityEncounterTemplateId" constrainedElement="_2NWFBBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qdTHAF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cqig4H3sEeyivuDeOiJBMg" name="PlanOfCareActivityEncounterTemplateId" constrainedElement="_2NWFBBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cqig4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.40')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qdUVIF9xEey5t-mahoHmrg" name="PlanOfCareActivityEncounterClassCode" constrainedElement="_2NWFBBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qdUVIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CqkWEH3sEeyivuDeOiJBMg" name="PlanOfCareActivityEncounterClassCode" constrainedElement="_2NWFBBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CqkWEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClass::ENC</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qdU8MF9xEey5t-mahoHmrg" name="PlanOfCareActivityEncounterMoodCode" constrainedElement="_2NWFBBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qdU8MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CqlkMH3sEeyivuDeOiJBMg" name="PlanOfCareActivityEncounterMoodCode" constrainedElement="_2NWFBBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CqlkMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentEncounterMood) and 
 let value : vocab::x_DocumentEncounterMood = self.moodCode.oclAsType(vocab::x_DocumentEncounterMood) in 
 value = vocab::x_DocumentEncounterMood::INT or value = vocab::x_DocumentEncounterMood::ARQ or value = vocab::x_DocumentEncounterMood::PRMS or value = vocab::x_DocumentEncounterMood::PRP or value = vocab::x_DocumentEncounterMood::RQO</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qd1SgF9xEey5t-mahoHmrg" name="PlanOfCareActivityEncounterId" constrainedElement="_2NWFBBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qd1SgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CrSHwH3sEeyivuDeOiJBMg" name="PlanOfCareActivityEncounterId" constrainedElement="_2NWFBBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CrSHwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
@@ -6248,28 +6248,28 @@ value = vocab::x_DocumentEncounterMood::INT or value = vocab::x_DocumentEncounte
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_2NcLjhSVEeGGzu7fmW9pXw" name="PlanOfCareActivityObservation">
-      <ownedRule xmi:id="_qeTMl19xEey5t-mahoHmrg" name="PlanOfCareActivityObservationTemplateId" constrainedElement="_2NcLjhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qeTMmF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Crwo5H3sEeyivuDeOiJBMg" name="PlanOfCareActivityObservationTemplateId" constrainedElement="_2NcLjhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Crwo5X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.44')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qeUasF9xEey5t-mahoHmrg" name="PlanOfCareActivityObservationClassCode" constrainedElement="_2NcLjhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qeVBwF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CryeEH3sEeyivuDeOiJBMg" name="PlanOfCareActivityObservationClassCode" constrainedElement="_2NcLjhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CryeEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qeVo0F9xEey5t-mahoHmrg" name="PlanOfCareActivityObservationMoodCode" constrainedElement="_2NcLjhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qeVo0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CrzsMH3sEeyivuDeOiJBMg" name="PlanOfCareActivityObservationMoodCode" constrainedElement="_2NcLjhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CrzsMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_ActMoodDocumentObservation) and 
 let value : vocab::x_ActMoodDocumentObservation = self.moodCode.oclAsType(vocab::x_ActMoodDocumentObservation) in 
 value = vocab::x_ActMoodDocumentObservation::INT or value = vocab::x_ActMoodDocumentObservation::GOL or value = vocab::x_ActMoodDocumentObservation::PRMS or value = vocab::x_ActMoodDocumentObservation::PRP or value = vocab::x_ActMoodDocumentObservation::RQO</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qe1YEF9xEey5t-mahoHmrg" name="PlanOfCareActivityObservationId" constrainedElement="_2NcLjhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qe1YEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CsPKAH3sEeyivuDeOiJBMg" name="PlanOfCareActivityObservationId" constrainedElement="_2NcLjhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CsPKAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
@@ -6279,28 +6279,28 @@ value = vocab::x_ActMoodDocumentObservation::INT or value = vocab::x_ActMoodDocu
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_2NiSKhSVEeGGzu7fmW9pXw" name="PlanOfCareActivityProcedure">
-      <ownedRule xmi:id="_qfW8hV9xEey5t-mahoHmrg" name="PlanOfCareActivityProcedureTemplateId" constrainedElement="_2NiSKhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qfW8hl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CssdB33sEeyivuDeOiJBMg" name="PlanOfCareActivityProcedureTemplateId" constrainedElement="_2NiSKhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CssdCH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.41')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qfYKoF9xEey5t-mahoHmrg" name="PlanOfCareActivityProcedureClassCode" constrainedElement="_2NiSKhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qfYKoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CstrIH3sEeyivuDeOiJBMg" name="PlanOfCareActivityProcedureClassCode" constrainedElement="_2NiSKhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CstrIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClass::PROC</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qfZ_0F9xEey5t-mahoHmrg" name="PlanOfCareActivityProcedureMoodCode" constrainedElement="_2NiSKhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qfZ_0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Csu5QH3sEeyivuDeOiJBMg" name="PlanOfCareActivityProcedureMoodCode" constrainedElement="_2NiSKhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Csu5QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentProcedureMood) and 
 let value : vocab::x_DocumentProcedureMood = self.moodCode.oclAsType(vocab::x_DocumentProcedureMood) in 
 value = vocab::x_DocumentProcedureMood::INT or value = vocab::x_DocumentProcedureMood::ARQ or value = vocab::x_DocumentProcedureMood::PRMS or value = vocab::x_DocumentProcedureMood::PRP or value = vocab::x_DocumentProcedureMood::RQO</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qf7kQF9xEey5t-mahoHmrg" name="PlanOfCareActivityProcedureId" constrainedElement="_2NiSKhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qf7kQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CtMMQH3sEeyivuDeOiJBMg" name="PlanOfCareActivityProcedureId" constrainedElement="_2NiSKhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CtMMQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
@@ -6310,28 +6310,28 @@ value = vocab::x_DocumentProcedureMood::INT or value = vocab::x_DocumentProcedur
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_2NoYwxSVEeGGzu7fmW9pXw" name="PlanOfCareActivitySubstanceAdministration">
-      <ownedRule xmi:id="_qgdIt19xEey5t-mahoHmrg" name="PlanOfCareActivitySubstanceAdministrationTemplateId" constrainedElement="_2NoYwxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qgdIuF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CtnqFX3sEeyivuDeOiJBMg" name="PlanOfCareActivitySubstanceAdministrationTemplateId" constrainedElement="_2NoYwxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CtnqFn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.42')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qge94F9xEey5t-mahoHmrg" name="PlanOfCareActivitySubstanceAdministrationClassCode" constrainedElement="_2NoYwxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qge94V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cto4MH3sEeyivuDeOiJBMg" name="PlanOfCareActivitySubstanceAdministrationClassCode" constrainedElement="_2NoYwxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cto4MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClass::SBADM</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qggMAF9xEey5t-mahoHmrg" name="PlanOfCareActivitySubstanceAdministrationMoodCode" constrainedElement="_2NoYwxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qggMAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CtqGUH3sEeyivuDeOiJBMg" name="PlanOfCareActivitySubstanceAdministrationMoodCode" constrainedElement="_2NoYwxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CtqGUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentSubstanceMood) and 
 let value : vocab::x_DocumentSubstanceMood = self.moodCode.oclAsType(vocab::x_DocumentSubstanceMood) in 
 value = vocab::x_DocumentSubstanceMood::INT or value = vocab::x_DocumentSubstanceMood::PRMS or value = vocab::x_DocumentSubstanceMood::PRP or value = vocab::x_DocumentSubstanceMood::RQO</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qhCXgF9xEey5t-mahoHmrg" name="PlanOfCareActivitySubstanceAdministrationId" constrainedElement="_2NoYwxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qhCXgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CuE9EH3sEeyivuDeOiJBMg" name="PlanOfCareActivitySubstanceAdministrationId" constrainedElement="_2NoYwxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CuE9EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
@@ -6341,28 +6341,28 @@ value = vocab::x_DocumentSubstanceMood::INT or value = vocab::x_DocumentSubstanc
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_2NoY5BSVEeGGzu7fmW9pXw" name="PlanOfCareActivitySupply">
-      <ownedRule xmi:id="_qhkjB19xEey5t-mahoHmrg" name="PlanOfCareActivitySupplyTemplateId" constrainedElement="_2NoY5BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qhlKEF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CuksVX3sEeyivuDeOiJBMg" name="PlanOfCareActivitySupplyTemplateId" constrainedElement="_2NoY5BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CuksVn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.43')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qhmYMF9xEey5t-mahoHmrg" name="PlanOfCareActivitySupplyClassCode" constrainedElement="_2NoY5BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qhmYMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cul6cH3sEeyivuDeOiJBMg" name="PlanOfCareActivitySupplyClassCode" constrainedElement="_2NoY5BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cul6cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassSupply::SPLY</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qhnmUF9xEey5t-mahoHmrg" name="PlanOfCareActivitySupplyMoodCode" constrainedElement="_2NoY5BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qhnmUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CunIkH3sEeyivuDeOiJBMg" name="PlanOfCareActivitySupplyMoodCode" constrainedElement="_2NoY5BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CunIkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentSubstanceMood) and 
 let value : vocab::x_DocumentSubstanceMood = self.moodCode.oclAsType(vocab::x_DocumentSubstanceMood) in 
 value = vocab::x_DocumentSubstanceMood::INT or value = vocab::x_DocumentSubstanceMood::PRMS or value = vocab::x_DocumentSubstanceMood::PRP or value = vocab::x_DocumentSubstanceMood::RQO</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qiKY4F9xEey5t-mahoHmrg" name="PlanOfCareActivitySupplyId" constrainedElement="_2NoY5BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qiKY4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CvDNcH3sEeyivuDeOiJBMg" name="PlanOfCareActivitySupplyId" constrainedElement="_2NoY5BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CvDNcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
@@ -6375,68 +6375,68 @@ value = vocab::x_DocumentSubstanceMood::INT or value = vocab::x_DocumentSubstanc
       <ownedComment xmi:id="_9RKMYDyWEeGOm9opnDhYAQ">
         <body>This clinical statement represents current and/or prior pregnancy dates enabling investigators to determine if the subject of the case report was pregnant during the course of a condition.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qir9VV9xEey5t-mahoHmrg" name="PregnancyObservationTemplateId" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qir9Vl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CvfSUH3sEeyivuDeOiJBMg" name="PregnancyObservationTemplateId" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CvfSUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.15.3.8')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qitLcF9xEey5t-mahoHmrg" name="PregnancyObservationClassCode" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qitLcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CvggcH3sEeyivuDeOiJBMg" name="PregnancyObservationClassCode" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CvggcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qivAoF9xEey5t-mahoHmrg" name="PregnancyObservationMoodCode" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qivAoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CvhukH3sEeyivuDeOiJBMg" name="PregnancyObservationMoodCode" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CvhukX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qixc4F9xEey5t-mahoHmrg" name="PregnancyObservationCodeP" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qixc4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CvkK0H3sEeyivuDeOiJBMg" name="PregnancyObservationCodeP" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CvkK0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qiwOwF9xEey5t-mahoHmrg" name="PregnancyObservationCode" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qiwOwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cvi8sH3sEeyivuDeOiJBMg" name="PregnancyObservationCode" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cvi8sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qiyrAF9xEey5t-mahoHmrg" name="PregnancyObservationStatusCode" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qiyrAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CvlY8H3sEeyivuDeOiJBMg" name="PregnancyObservationStatusCode" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CvlY8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qi0gMF9xEey5t-mahoHmrg" name="PregnancyObservationValue" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qi0gMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CvmnEH3sEeyivuDeOiJBMg" name="PregnancyObservationValue" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CvmnEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.code = '77386006' and value.codeSystem = '2.16.840.1.113883.6.96'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qi1uUF9xEey5t-mahoHmrg" name="PregnancyObservationValueP" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qi1uUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cvn1MH3sEeyivuDeOiJBMg" name="PregnancyObservationValueP" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cvn1MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qi3jgF9xEey5t-mahoHmrg" name="PregnancyObservationEffectiveTime" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qi3jgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CvpDUH3sEeyivuDeOiJBMg" name="PregnancyObservationEffectiveTime" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CvpDUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rfBCsF9xEey5t-mahoHmrg" name="PregnancyObservationEstimatedDateOfDelivery" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rfBCsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DkBGkH3sEeyivuDeOiJBMg" name="PregnancyObservationEstimatedDateOfDelivery" constrainedElement="_2N6soBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DkBGkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::EstimatedDateOfDelivery) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
@@ -6444,15 +6444,15 @@ value.code = '77386006' and value.codeSystem = '2.16.840.1.113883.6.96'))</body>
       <generalization xmi:id="_2N6sxxSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_rfBCsl9xEey5t-mahoHmrg" name="getEstimatedDateOfDelivery" bodyCondition="_rfBCtV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rfBCtV9xEey5t-mahoHmrg" name="body" constrainedElement="_rfBCsl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rfBCtl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DkBGkn3sEeyivuDeOiJBMg" name="getEstimatedDateOfDelivery" bodyCondition="_DkBGlX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DkBGlX3sEeyivuDeOiJBMg" name="body" constrainedElement="_DkBGkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DkBGln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::EstimatedDateOfDelivery))->asSequence()->any(true).oclAsType(consol::EstimatedDateOfDelivery)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rfBCs19xEey5t-mahoHmrg" type="_vBswQBtpEeGT89b80j3MTg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rfBCtF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_DkBGk33sEeyivuDeOiJBMg" type="_vBswQBtpEeGT89b80j3MTg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DkBGlH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -6467,52 +6467,52 @@ The length of an encounter is documented in the documentationOf/encompassingEnco
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies self.getActs()->exists(a : cda::Act | a.oclIsKindOf(consol::ProcedureActivityAct)) or self.getObservations()->exists(o : cda::Observation | o.oclIsKindOf(consol::ProcedureActivityObservation)) or self.getProcedures()->exists(p : cda::Procedure | p.oclIsKindOf(consol::ProcedureActivityProcedure))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qi4KkV9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalTemplateId" constrainedElement="_2OAzQRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qi4xoF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CvqRcX3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalTemplateId" constrainedElement="_2OAzQRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CvqRcn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.7.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qi6m0F9xEey5t-mahoHmrg" name="ProceduresSectionTitle" constrainedElement="_2OAzQRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qi6m0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CvrfkH3sEeyivuDeOiJBMg" name="ProceduresSectionTitle" constrainedElement="_2OAzQRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CvrfkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qi9DEF9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalCodeP" constrainedElement="_2OAzQRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qi9DEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cvt70H3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalCodeP" constrainedElement="_2OAzQRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cvt70X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qi708F9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalCode" constrainedElement="_2OAzQRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qi708V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CvstsH3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalCode" constrainedElement="_2OAzQRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CvstsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '47519-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qi-4QF9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalText" constrainedElement="_2OAzQRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qi-4QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CvvJ8H3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalText" constrainedElement="_2OAzQRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CvvJ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uJfr8F9xEey5t-mahoHmrg" name="ProceduresSectionProcedureActivityProcedure" constrainedElement="_2OAzQRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uJfr8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FxDl4H3sEeyivuDeOiJBMg" name="ProceduresSectionProcedureActivityProcedure" constrainedElement="_2OAzQRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FxDl4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.procedure.oclIsUndefined() and entry.procedure.oclIsKindOf(consol::ProcedureActivityProcedure))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uKB3cF9xEey5t-mahoHmrg" name="ProceduresSectionProcedureActivityObservation" constrainedElement="_2OAzQRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uKB3cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FxfDsH3sEeyivuDeOiJBMg" name="ProceduresSectionProcedureActivityObservation" constrainedElement="_2OAzQRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FxfDsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::ProcedureActivityObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uKrXsF9xEey5t-mahoHmrg" name="ProceduresSectionProcedureActivityAct" constrainedElement="_2OAzQRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uKrXsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fx5TYH3sEeyivuDeOiJBMg" name="ProceduresSectionProcedureActivityAct" constrainedElement="_2OAzQRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fx5TYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::ProcedureActivityAct))</body>
         </specification>
@@ -6522,37 +6522,37 @@ value.code = '47519-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>couple</body>
         </ownedComment>
       </generalization>
-      <ownedOperation xmi:id="_uJgTAF9xEey5t-mahoHmrg" name="getConsolProcedureActivityProcedures" bodyCondition="_uJgTA19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uJgTA19xEey5t-mahoHmrg" name="body" constrainedElement="_uJgTAF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uJgTBF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FxDl4n3sEeyivuDeOiJBMg" name="getConsolProcedureActivityProcedures" bodyCondition="_FxDl5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FxDl5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_FxDl4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FxDl5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getProcedures()->select(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::ProcedureActivityProcedure)).oclAsType(consol::ProcedureActivityProcedure)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uJgTAV9xEey5t-mahoHmrg" type="_2OG58RSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uJgTAl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_FxDl433sEeyivuDeOiJBMg" type="_2OG58RSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FxDl5H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uKCegF9xEey5t-mahoHmrg" name="getConsolProcedureActivityObservations" bodyCondition="_uKCeg19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uKCeg19xEey5t-mahoHmrg" name="body" constrainedElement="_uKCegF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uKCehF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FxfDsn3sEeyivuDeOiJBMg" name="getConsolProcedureActivityObservations" bodyCondition="_FxfDtX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FxfDtX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FxfDsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FxfDtn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProcedureActivityObservation)).oclAsType(consol::ProcedureActivityObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uKCegV9xEey5t-mahoHmrg" type="_Aj7JkBg4EeGs5a462vYX5Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uKCegl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_FxfDs33sEeyivuDeOiJBMg" type="_Aj7JkBg4EeGs5a462vYX5Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FxfDtH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uKr-wF9xEey5t-mahoHmrg" name="getConsolProcedureActivityActs" bodyCondition="_uKr-w19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uKr-w19xEey5t-mahoHmrg" name="body" constrainedElement="_uKr-wF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uKr-xF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Fx5TYn3sEeyivuDeOiJBMg" name="getConsolProcedureActivityActs" bodyCondition="_Fx5TZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Fx5TZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Fx5TYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fx5TZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::ProcedureActivityAct)).oclAsType(consol::ProcedureActivityAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uKr-wV9xEey5t-mahoHmrg" type="_awdH4Bg4EeGs5a462vYX5Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uKr-wl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Fx5TY33sEeyivuDeOiJBMg" type="_awdH4Bg4EeGs5a462vYX5Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Fx5TZH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -6615,232 +6615,232 @@ This clinical statement represents procedures whose immediate and primary outcom
           <body>self.entryRelationship->select(er : cda::EntryRelationship | er.act.oclIsTypeOf(consol::Instructions))->forAll(ent : cda::EntryRelationship | ent.inversionInd=true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qjAGYF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureTemplateId" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qjAGYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CvwYEH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureTemplateId" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CvwYEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.14')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qjDwwF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureClassCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qjDwwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CvzbYH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureClassCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CvzbYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClass::PROC</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qjE-4F9xEey5t-mahoHmrg" name="ProcedureActivityProcedureMoodCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qjE-4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cv0pgH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureMoodCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cv0pgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentProcedureMood) and 
 let value : vocab::x_DocumentProcedureMood = self.moodCode.oclAsType(vocab::x_DocumentProcedureMood) in 
 value = vocab::x_DocumentProcedureMood::EVN or value = vocab::x_DocumentProcedureMood::INT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qjl8QF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureId" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qjl8QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CwQHUH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureId" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CwQHUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qjnKYF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qjnKYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CwRVcH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CwRVcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qjoYgF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureStatusCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qjoYgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CwR8gH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureStatusCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CwR8gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed' or value.code = 'active' or value.code = 'aborted' or value.code = 'cancelled')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qkJV4F9xEey5t-mahoHmrg" name="ProcedureActivityProcedureEffectiveTime" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qkJV4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CwsMMH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureEffectiveTime" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CwszQH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qksvgF9xEey5t-mahoHmrg" name="ProcedureActivityProcedurePriorityCodeP" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qksvgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CxHC8H3sEeyivuDeOiJBMg" name="ProcedureActivityProcedurePriorityCodeP" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CxHC8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.priorityCode.oclIsUndefined() or self.priorityCode.isNullFlavorUndefined()) implies (not self.priorityCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qkLLEF9xEey5t-mahoHmrg" name="ProcedureActivityProcedurePriorityCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qkLLEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CwuBYH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedurePriorityCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CwuBYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.priorityCode.oclIsUndefined() or self.priorityCode.isNullFlavorUndefined()) implies (not self.priorityCode.oclIsUndefined() and self.priorityCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.priorityCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.7' and (value.code = 'A' or value.code = 'CR' or value.code = 'CS' or value.code = 'CSP' or value.code = 'CSR' or value.code = 'EL' or value.code = 'EM' or value.code = 'P' or value.code = 'PRN' or value.code = 'R' or value.code = 'RR' or value.code = 'S' or value.code = 'T' or value.code = 'UD' or value.code = 'UR'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qlNs4F9xEey5t-mahoHmrg" name="ProcedureActivityProcedureMethodCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qlNs4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cxju4H3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureMethodCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cxju4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.methodCode->isEmpty() or self.methodCode->exists(element | element.isNullFlavorUndefined())) implies (( not self.methodCode->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qlwfcF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureTargetSiteCodeP" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qlwfcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cx_MsH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureTargetSiteCodeP" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cx_MsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (not self.targetSiteCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qlO7AF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureTargetSiteCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qlO7AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CxkV8H3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureTargetSiteCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CxkV8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (self.targetSiteCode->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qnEHAF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureIndication" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qnEHAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_CzPw8H3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureIndication" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_CzPw8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qnlEYF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureSpecimen" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qnlEYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Cz3cAH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureSpecimen" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Cz3cAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.specimen->exists(specimen : cda::Specimen | not specimen.oclIsUndefined() and specimen.oclIsKindOf(cda::Specimen))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qoFasF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureServiceDeliveryLocation" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qoFasV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C0UvAH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureServiceDeliveryLocation" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C0UvAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant2 | not participant.participantRole.oclIsUndefined() and participant.participantRole.oclIsKindOf(consol::ServiceDeliveryLocation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qomYEF9xEey5t-mahoHmrg" name="ProcedureActivityProcedurePerformer" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qomYEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C0xa8H3sEeyivuDeOiJBMg" name="ProcedureActivityProcedurePerformer" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C0xa8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->exists(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qpGHUF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureMedicationActivity" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qpGuYF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C1Nf0H3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureMedicationActivity" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C1Nf0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::MedicationActivity) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qpkocF9xEey5t-mahoHmrg" name="ProcedureActivityProcedurePatientInstruction" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qplPgF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C1nvgH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedurePatientInstruction" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C1nvgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instructions) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rYbSgF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureProductInstance" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rYbSgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DeY_sH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureProductInstance" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DeY_sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant2 | not participant.participantRole.oclIsUndefined() and participant.participantRole.oclIsKindOf(consol::ProductInstance))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uGy9QF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureEntryRelationship" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uGy9QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fu0xQH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureEntryRelationship" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fu0xQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->select(entryRelationship : cda::EntryRelationship | not entryRelationship.oclIsUndefined() and entryRelationship.oclIsKindOf(cda::EntryRelationship))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5wFUkF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureProcedureSpecimenSpecimenRole" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5wFUkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PyKecH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureProcedureSpecimenSpecimenRole" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PyKecX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.specimen->excluding(null)->reject(specimenRole->size() = 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5wF7oF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureProcedureSpecimenSpecimentRoleId" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5wF7oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PyKecn3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureProcedureSpecimenSpecimentRoleId" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PyKec33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.specimen->excluding(null)->reject(specimenRole.id->size() > 0)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5xmXgF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityProcedureActivityRepresentedOrganizationId" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5xmXgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PzkzsH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityProcedureActivityRepresentedOrganizationId" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PzkzsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).representedOrganization->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5xmXgl9xEey5t-mahoHmrg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityProcedureActivityRepresentedOrganizationName" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5xmXg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PzlawH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityProcedureActivityRepresentedOrganizationName" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PzlawX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).representedOrganization->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (not name->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5xmXhF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityProcedureActivityRepresentedOrganizationTelecom" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5xm-kF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pzlawn3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityProcedureActivityRepresentedOrganizationTelecom" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pzlaw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).representedOrganization->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (telecom->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5xm-kV9xEey5t-mahoHmrg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityProcedureActivityRepresentedOrganizationAddr" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5xm-kl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PzlaxH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityProcedureActivityRepresentedOrganizationAddr" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PzlaxX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).representedOrganization->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (addr->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5xm-k19xEey5t-mahoHmrg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityId" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5xm-lF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PzmB0H3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityId" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PzmB0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5xm-lV9xEey5t-mahoHmrg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityAddr" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5xm-ll9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PzmB0n3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityAddr" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PzmB033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (addr->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5xnloF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityTelecom" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5xnloV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PzmB1H3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityTelecom" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PzmB1X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (telecom->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5xnlol9xEey5t-mahoHmrg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityRepresentedOrganization" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5xnlo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pzmo4H3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityRepresentedOrganization" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pzmo4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject(representedOrganization->one(representedOrganization : cda::Organization | not representedOrganization.oclIsUndefined() and representedOrganization.oclIsKindOf(cda::Organization)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5xnlpF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureProcedureActivityPerformerAssignedEntity" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5xnlpV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Pzmo4n3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureProcedureActivityPerformerAssignedEntity" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Pzmo433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5yoSQF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounterClassCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5yoSQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P0eyoH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounterClassCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P0eyoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter)).encounter->excluding(null)->reject(classCode=vocab::ActClass::ENC)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5yo5UF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounterMoodCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5yo5UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P0eyon3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounterMoodCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P0eyo33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter)).encounter->excluding(null)->reject(moodCode=vocab::x_DocumentEncounterMood::EVN)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5yo5Ul9xEey5t-mahoHmrg" name="ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounterId" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5yo5U19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P0eypH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounterId" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P0eypX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter)).encounter->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (id->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ypgYF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureEntryRelationshipInversionInd" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ypgYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P0fZsH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureEntryRelationshipInversionInd" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P0fZsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->reject(not inversionInd.oclIsUndefined() and inversionInd=true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ypgYl9xEey5t-mahoHmrg" name="ProcedureActivityProcedureEntryRelationshipTypeCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ypgY19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P0fZsn3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureEntryRelationshipTypeCode" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P0fZs33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->reject(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ypgZF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounter" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ypgZV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P0fZtH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounter" constrainedElement="_2OG58RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P0fZtX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->reject(encounter->one(encounter : cda::Encounter | not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter)))</body>
         </specification>
@@ -6848,97 +6848,97 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
       <generalization xmi:id="_2OZN6RSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_-jiisEbuEd6besF9iFIJkQ"/>
       </generalization>
-      <ownedOperation xmi:id="_qnEHAl9xEey5t-mahoHmrg" name="getIndications" bodyCondition="_qnEHBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qnEHBV9xEey5t-mahoHmrg" name="body" constrainedElement="_qnEHAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qnEHBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_CzPw8n3sEeyivuDeOiJBMg" name="getIndications" bodyCondition="_CzPw9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_CzPw9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_CzPw8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_CzPw9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication)).oclAsType(consol::Indication)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qnEHA19xEey5t-mahoHmrg" type="_sHrUoBUSEeG6PvUxSTZnaw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qnEHBF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_CzPw833sEeyivuDeOiJBMg" type="_sHrUoBUSEeG6PvUxSTZnaw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CzPw9H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_qoFasl9xEey5t-mahoHmrg" name="getServiceDeliveryLocations" bodyCondition="_qoFatV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qoFatV9xEey5t-mahoHmrg" name="body" constrainedElement="_qoFasl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qoFatl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_C0UvAn3sEeyivuDeOiJBMg" name="getServiceDeliveryLocations" bodyCondition="_C0UvBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_C0UvBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_C0UvAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_C0UvBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getParticipantRoles()->select(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(consol::ServiceDeliveryLocation)).oclAsType(consol::ServiceDeliveryLocation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qoFas19xEey5t-mahoHmrg" type="_2LiHABSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qoFatF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_C0UvA33sEeyivuDeOiJBMg" type="_2LiHABSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C0UvBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_qpGuYV9xEey5t-mahoHmrg" name="getMedicationActivities" bodyCondition="_qpGuZF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qpGuZF9xEey5t-mahoHmrg" name="body" constrainedElement="_qpGuYV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qpGuZV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_C1Nf0n3sEeyivuDeOiJBMg" name="getMedicationActivities" bodyCondition="_C1Nf1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_C1Nf1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_C1Nf0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_C1Nf1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity)).oclAsType(consol::MedicationActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qpGuYl9xEey5t-mahoHmrg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qpGuY19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_C1Nf033sEeyivuDeOiJBMg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C1Nf1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_qplPgV9xEey5t-mahoHmrg" name="getPatientInstruction" bodyCondition="_qplPhF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qplPhF9xEey5t-mahoHmrg" name="body" constrainedElement="_qplPgV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qplPhV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_C1nvgn3sEeyivuDeOiJBMg" name="getPatientInstruction" bodyCondition="_C1nvhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_C1nvhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_C1nvgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_C1nvhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instructions))->asSequence()->any(true).oclAsType(consol::Instructions)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qplPgl9xEey5t-mahoHmrg" type="_2G8h9RSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qplPg19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_C1nvg33sEeyivuDeOiJBMg" type="_2G8h9RSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C1nvhH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rYbSgl9xEey5t-mahoHmrg" name="getProductInstances" bodyCondition="_rYbShV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rYbShV9xEey5t-mahoHmrg" name="body" constrainedElement="_rYbSgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rYbShl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DeZmwH3sEeyivuDeOiJBMg" name="getProductInstances" bodyCondition="_DeZmw33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DeZmw33sEeyivuDeOiJBMg" name="body" constrainedElement="_DeZmwH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DeZmxH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getParticipantRoles()->select(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(consol::ProductInstance)).oclAsType(consol::ProductInstance)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rYbSg19xEey5t-mahoHmrg" type="_2G2bUxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rYbShF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DeZmwX3sEeyivuDeOiJBMg" type="_2G2bUxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DeZmwn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_2OfUcxSVEeGGzu7fmW9pXw" name="VitalSignsSection">
-      <ownedRule xmi:id="_qpl2kV9xEey5t-mahoHmrg" name="VitalSignsSectionEntriesOptionalTemplateId" constrainedElement="_2OfUcxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qpl2kl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C1oWkH3sEeyivuDeOiJBMg" name="VitalSignsSectionEntriesOptionalTemplateId" constrainedElement="_2OfUcxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C1oWkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.4.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qpqvEF9xEey5t-mahoHmrg" name="VitalSignsSectionEntriesOptionalCodeP" constrainedElement="_2OfUcxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qpqvEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C1qLwH3sEeyivuDeOiJBMg" name="VitalSignsSectionEntriesOptionalCodeP" constrainedElement="_2OfUcxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C1qLwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qpnrwF9xEey5t-mahoHmrg" name="VitalSignsSectionEntriesOptionalCode" constrainedElement="_2OfUcxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qpnrwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C1o9oH3sEeyivuDeOiJBMg" name="VitalSignsSectionEntriesOptionalCode" constrainedElement="_2OfUcxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C1o9oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '8716-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qpr9MF9xEey5t-mahoHmrg" name="VitalSignsSectionText" constrainedElement="_2OfUcxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qpr9MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C1rZ4H3sEeyivuDeOiJBMg" name="VitalSignsSectionText" constrainedElement="_2OfUcxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C1rZ4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qptyYF9xEey5t-mahoHmrg" name="VitalSignsSectionEntriesOptionalTitle" constrainedElement="_2OfUcxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qptyYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C1soAH3sEeyivuDeOiJBMg" name="VitalSignsSectionEntriesOptionalTitle" constrainedElement="_2OfUcxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C1soAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsD7wF9xEey5t-mahoHmrg" name="VitalSignsSectionVitalSignsOrganizer" constrainedElement="_2OfUcxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsD7wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C33yQH3sEeyivuDeOiJBMg" name="VitalSignsSectionVitalSignsOrganizer" constrainedElement="_2OfUcxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C33yQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.organizer.oclIsUndefined() and entry.organizer.oclIsKindOf(consol::VitalSignsOrganizer))</body>
         </specification>
@@ -6948,15 +6948,15 @@ value.code = '8716-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>couple</body>
         </ownedComment>
       </generalization>
-      <ownedOperation xmi:id="_qsD7wl9xEey5t-mahoHmrg" name="getConsolVitalSignsOrganizers" bodyCondition="_qsD7xV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qsD7xV9xEey5t-mahoHmrg" name="body" constrainedElement="_qsD7wl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsD7xl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_C33yQn3sEeyivuDeOiJBMg" name="getConsolVitalSignsOrganizers" bodyCondition="_C33yRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_C33yRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_C33yQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_C33yRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::VitalSignsOrganizer)).oclAsType(consol::VitalSignsOrganizer)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qsD7w19xEey5t-mahoHmrg" type="_2OlbCRSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qsD7xF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_C33yQ33sEeyivuDeOiJBMg" type="_2OlbCRSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C33yRH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -6966,66 +6966,66 @@ value.code = '8716-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
 &#xD;
 &lt;p>An appropriate nullFlavor can be used when organizer/code or organizer/id is unknown.&lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_qpuZcF9xEey5t-mahoHmrg" name="VitalSignsOrganizerTemplateId" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qpuZcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C1t2IH3sEeyivuDeOiJBMg" name="VitalSignsOrganizerTemplateId" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C1t2IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.26')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qpvnkF9xEey5t-mahoHmrg" name="VitalSignsOrganizerClassCode" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qpvnkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C1vEQH3sEeyivuDeOiJBMg" name="VitalSignsOrganizerClassCode" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C1vEQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryOrganizer::CLUSTER</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qpw1sF9xEey5t-mahoHmrg" name="VitalSignsOrganizerMoodCode" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qpw1sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C1wSYH3sEeyivuDeOiJBMg" name="VitalSignsOrganizerMoodCode" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C1wSYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::ActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qpyD0F9xEey5t-mahoHmrg" name="VitalSignsOrganizerId" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qpyD0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C1xggH3sEeyivuDeOiJBMg" name="VitalSignsOrganizerId" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C1xggX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qpzR8F9xEey5t-mahoHmrg" name="VitalSignsOrganizerCode" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qpzR8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C1yuoH3sEeyivuDeOiJBMg" name="VitalSignsOrganizerCode" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C1yuoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '46680005' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qp0gEF9xEey5t-mahoHmrg" name="VitalSignsOrganizerCodeP" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qp0gEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C1z8wH3sEeyivuDeOiJBMg" name="VitalSignsOrganizerCodeP" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C1z8wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qp2VQF9xEey5t-mahoHmrg" name="VitalSignsOrganizerStatusCodeP" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qp2VQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C11x8H3sEeyivuDeOiJBMg" name="VitalSignsOrganizerStatusCodeP" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C11x8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qp1HIF9xEey5t-mahoHmrg" name="VitalSignsOrganizerStatusCode" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qp1HIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C10j0H3sEeyivuDeOiJBMg" name="VitalSignsOrganizerStatusCode" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C10j0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qp4KcF9xEey5t-mahoHmrg" name="VitalSignsOrganizerEffectiveTime" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qp4KcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C13AEH3sEeyivuDeOiJBMg" name="VitalSignsOrganizerEffectiveTime" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C13AEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qqUPUF9xEey5t-mahoHmrg" name="VitalSignsOrganizerVitalSignObservation" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qqUPUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C2TsAH3sEeyivuDeOiJBMg" name="VitalSignsOrganizerVitalSignObservation" constrainedElement="_2OlbCRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C2TsAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->exists(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::VitalSignObservation))</body>
         </specification>
@@ -7033,15 +7033,15 @@ value.code = 'completed')</body>
       <generalization xmi:id="_2O91oRSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_B6aX4EbvEd6besF9iFIJkQ"/>
       </generalization>
-      <ownedOperation xmi:id="_qqU2YF9xEey5t-mahoHmrg" name="getVitalSignObservations" bodyCondition="_qqU2Y19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qqU2Y19xEey5t-mahoHmrg" name="body" constrainedElement="_qqU2YF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qqU2ZF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_C2TsAn3sEeyivuDeOiJBMg" name="getVitalSignObservations" bodyCondition="_C2TsBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_C2TsBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_C2TsAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_C2TsBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::VitalSignObservation)).oclAsType(consol::VitalSignObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qqU2YV9xEey5t-mahoHmrg" type="_2OrhsRSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qqU2Yl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_C2TsA33sEeyivuDeOiJBMg" type="_2OrhsRSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C2TsBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -7067,96 +7067,96 @@ value.code = 'completed')</body>
           <body>not self.text.reference.value.oclIsUndefined() implies not self.getSection().text.getText(self.text.reference.value.substring(2, self.text.reference.value.size())).oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qqU2ZV9xEey5t-mahoHmrg" name="VitalSignObservationTemplateId" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qqU2Zl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C2UTEH3sEeyivuDeOiJBMg" name="VitalSignObservationTemplateId" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C2UTEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.27')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qqWrkF9xEey5t-mahoHmrg" name="VitalSignObservationClassCode" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qqWrkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C2WIQH3sEeyivuDeOiJBMg" name="VitalSignObservationClassCode" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C2WIQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qqX5sF9xEey5t-mahoHmrg" name="VitalSignObservationMoodCode" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qqX5sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C2XWYH3sEeyivuDeOiJBMg" name="VitalSignObservationMoodCode" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C2XWYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qqZu4F9xEey5t-mahoHmrg" name="VitalSignObservationId" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qqZu4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C2YkgH3sEeyivuDeOiJBMg" name="VitalSignObservationId" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C2YkgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qq5eIF9xEey5t-mahoHmrg" name="VitalSignObservationCodeP" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qq5eIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C20CUH3sEeyivuDeOiJBMg" name="VitalSignObservationCodeP" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C20CUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qqaV8F9xEey5t-mahoHmrg" name="VitalSignObservationCode" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qqaV8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C2ZyoH3sEeyivuDeOiJBMg" name="VitalSignObservationCode" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C2ZyoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qrYmUF9xEey5t-mahoHmrg" name="VitalSignObservationStatusCode" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qrYmUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C3TxkH3sEeyivuDeOiJBMg" name="VitalSignObservationStatusCode" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C3TxkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qrZ0cF9xEey5t-mahoHmrg" name="VitalSignObservationStatusCodeP" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qrZ0cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C3VmwH3sEeyivuDeOiJBMg" name="VitalSignObservationStatusCodeP" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C3VmwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qrbpoF9xEey5t-mahoHmrg" name="VitalSignObservationEffectiveTime" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qrbpoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C3W04H3sEeyivuDeOiJBMg" name="VitalSignObservationEffectiveTime" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C3W04X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qrc3wF9xEey5t-mahoHmrg" name="VitalSignObservationValue" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qrc3wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C3YDAH3sEeyivuDeOiJBMg" name="VitalSignObservationValue" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C3YDAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::PQ)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qreF4F9xEey5t-mahoHmrg" name="VitalSignObservationInterpretationCode" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qreF4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C3ZRIH3sEeyivuDeOiJBMg" name="VitalSignObservationInterpretationCode" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C3ZRIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.interpretationCode->isEmpty() or self.interpretationCode->exists(element | element.isNullFlavorUndefined())) implies (( not self.interpretationCode->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qrfUAF9xEey5t-mahoHmrg" name="VitalSignObservationMethodCode" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qrfUAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C3afQH3sEeyivuDeOiJBMg" name="VitalSignObservationMethodCode" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C3afQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.methodCode->isEmpty() or self.methodCode->exists(element | element.isNullFlavorUndefined())) implies (( not self.methodCode->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qrgiIF9xEey5t-mahoHmrg" name="VitalSignObservationTargetSiteCode" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qrgiIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C3btYH3sEeyivuDeOiJBMg" name="VitalSignObservationTargetSiteCode" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C3btYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (( not self.targetSiteCode->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qriXUF9xEey5t-mahoHmrg" name="VitalSignObservationText" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qriXUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C3c7gH3sEeyivuDeOiJBMg" name="VitalSignObservationText" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C3c7gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uHTTkF9xEey5t-mahoHmrg" name="VitalSignObservationAuthor" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uHTTkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FvPA8H3sEeyivuDeOiJBMg" name="VitalSignObservationAuthor" constrainedElement="_2OrhsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FvPA8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->one(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(rim::Participation))</body>
         </specification>
@@ -7169,40 +7169,40 @@ value.code = 'completed')</body>
       <ownedComment xmi:id="_2PWQBRSVEeGGzu7fmW9pXw" annotatedElement="_2PQJcxSVEeGGzu7fmW9pXw">
         <body>This section contains a record of the patient's past complaints, problems, and diagnoses. It contains data from the patient's past up to the patient's current complaint or reason for seeking medical care.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qsEi0F9xEey5t-mahoHmrg" name="HistoryOfPastIllnessSectionTemplateId" constrainedElement="_2PQJcxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsEi0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C33yR33sEeyivuDeOiJBMg" name="HistoryOfPastIllnessSectionTemplateId" constrainedElement="_2PQJcxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C33ySH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.20')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsFw8F9xEey5t-mahoHmrg" name="HistoryOfPastIllnessSectionCode" constrainedElement="_2PQJcxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsFw8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C35AYH3sEeyivuDeOiJBMg" name="HistoryOfPastIllnessSectionCode" constrainedElement="_2PQJcxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C35AYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '11348-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsG_EF9xEey5t-mahoHmrg" name="HistoryOfPastIllnessSectionCodeP" constrainedElement="_2PQJcxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsG_EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C36OgH3sEeyivuDeOiJBMg" name="HistoryOfPastIllnessSectionCodeP" constrainedElement="_2PQJcxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C36OgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsINMF9xEey5t-mahoHmrg" name="HistoryOfPastIllnessSectionTitle" constrainedElement="_2PQJcxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsI0QF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C37coH3sEeyivuDeOiJBMg" name="HistoryOfPastIllnessSectionTitle" constrainedElement="_2PQJcxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C37coX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsKCYF9xEey5t-mahoHmrg" name="HistoryOfPastIllnessSectionText" constrainedElement="_2PQJcxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsKCYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C38qwH3sEeyivuDeOiJBMg" name="HistoryOfPastIllnessSectionText" constrainedElement="_2PQJcxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C38qwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r0oGUF9xEey5t-mahoHmrg" name="HistoryOfPastIllnessSectionProblemObservation" constrainedElement="_2PQJcxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r0oGUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D2R7QH3sEeyivuDeOiJBMg" name="HistoryOfPastIllnessSectionProblemObservation" constrainedElement="_2PQJcxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D2R7QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::ProblemObservation))</body>
         </specification>
@@ -7210,15 +7210,15 @@ value.code = '11348-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_2PWQBxSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_r0oGUl9xEey5t-mahoHmrg" name="getProblemObservations" bodyCondition="_r0oGVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_r0oGVV9xEey5t-mahoHmrg" name="body" constrainedElement="_r0oGUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_r0oGVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_D2R7Qn3sEeyivuDeOiJBMg" name="getProblemObservations" bodyCondition="_D2R7RX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_D2R7RX3sEeyivuDeOiJBMg" name="body" constrainedElement="_D2R7Qn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_D2R7Rn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation)).oclAsType(consol::ProblemObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_r0oGU19xEey5t-mahoHmrg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r0oGVF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_D2R7Q33sEeyivuDeOiJBMg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_D2R7RH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -7226,34 +7226,34 @@ value.code = '11348-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_2PWQFRSVEeGGzu7fmW9pXw" annotatedElement="_2PWQCBSVEeGGzu7fmW9pXw">
         <body>This section records the patient's chief complaint (the patient's own description).</body>
       </ownedComment>
-      <ownedRule xmi:id="_qsKpcF9xEey5t-mahoHmrg" name="ChiefComplaintSectionTemplateId" constrainedElement="_2PWQCBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsLQgF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C39R0H3sEeyivuDeOiJBMg" name="ChiefComplaintSectionTemplateId" constrainedElement="_2PWQCBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C39R0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '1.3.6.1.4.1.19376.1.5.3.1.1.13.2.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsL3kF9xEey5t-mahoHmrg" name="ChiefComplaintSectionCode" constrainedElement="_2PWQCBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsL3kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C3944H3sEeyivuDeOiJBMg" name="ChiefComplaintSectionCode" constrainedElement="_2PWQCBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C3944X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10154-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsNFsF9xEey5t-mahoHmrg" name="ChiefComplaintSectionCodeP" constrainedElement="_2PWQCBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsNFsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C3_HAH3sEeyivuDeOiJBMg" name="ChiefComplaintSectionCodeP" constrainedElement="_2PWQCBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C3_HAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsO64F9xEey5t-mahoHmrg" name="ChiefComplaintSectionText" constrainedElement="_2PWQCBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsO64V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4AVIH3sEeyivuDeOiJBMg" name="ChiefComplaintSectionText" constrainedElement="_2PWQCBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4AVIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsQJAF9xEey5t-mahoHmrg" name="ChiefComplaintSectionTitle" constrainedElement="_2PWQCBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsQJAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4BjQH3sEeyivuDeOiJBMg" name="ChiefComplaintSectionTitle" constrainedElement="_2PWQCBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4BjQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
@@ -7266,34 +7266,34 @@ value.code = '10154-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_2PcWrxSVEeGGzu7fmW9pXw" annotatedElement="_2PWQFxSVEeGGzu7fmW9pXw">
         <body>A Reason for Referral section records the reason the patient is being referred for a consultation by a provider. An optional Chief Complaint section may capture the patient's description of the reason for the consultation.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qsRXIF9xEey5t-mahoHmrg" name="ReasonForReferralSectionTemplateId" constrainedElement="_2PWQFxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsRXIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4CKUH3sEeyivuDeOiJBMg" name="ReasonForReferralSectionTemplateId" constrainedElement="_2PWQFxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4CKUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '1.3.6.1.4.1.19376.1.5.3.1.3.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsSlQF9xEey5t-mahoHmrg" name="ReasonForReferralSectionCode" constrainedElement="_2PWQFxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsSlQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4CxYH3sEeyivuDeOiJBMg" name="ReasonForReferralSectionCode" constrainedElement="_2PWQFxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4CxYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '42349-1' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsTzYF9xEey5t-mahoHmrg" name="ReasonForReferralSectionCodeP" constrainedElement="_2PWQFxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsTzYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4D_gH3sEeyivuDeOiJBMg" name="ReasonForReferralSectionCodeP" constrainedElement="_2PWQFxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4D_gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsVokF9xEey5t-mahoHmrg" name="ReasonForReferralSectionTitle" constrainedElement="_2PWQFxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsVokV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4FNoH3sEeyivuDeOiJBMg" name="ReasonForReferralSectionTitle" constrainedElement="_2PWQFxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4FNoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsW2sF9xEey5t-mahoHmrg" name="ReasonForReferralSectionText" constrainedElement="_2PWQFxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsW2sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4F0sH3sEeyivuDeOiJBMg" name="ReasonForReferralSectionText" constrainedElement="_2PWQFxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4F0sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
@@ -7306,34 +7306,34 @@ value.code = '42349-1' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_2PidQBSVEeGGzu7fmW9pXw" annotatedElement="_2PcWsRSVEeGGzu7fmW9pXw">
         <body>The History of Present Illness section describes the history related to the reason for the encounter.  It contains the historical details leading up to and pertaining to the patient's current complaint or reason for seeking medical care.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qsXdwF9xEey5t-mahoHmrg" name="HistoryOfPresentIllnessSectionTemplateId" constrainedElement="_2PcWsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsXdwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4GbwH3sEeyivuDeOiJBMg" name="HistoryOfPresentIllnessSectionTemplateId" constrainedElement="_2PcWsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4GbwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '1.3.6.1.4.1.19376.1.5.3.1.3.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsYr4F9xEey5t-mahoHmrg" name="HistoryOfPresentIllnessSectionCode" constrainedElement="_2PcWsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsYr4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4Hp4H3sEeyivuDeOiJBMg" name="HistoryOfPresentIllnessSectionCode" constrainedElement="_2PcWsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4Hp4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10164-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsZ6AF9xEey5t-mahoHmrg" name="HistoryOfPresentIllnessSectionCodeP" constrainedElement="_2PcWsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsZ6AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4IQ8H3sEeyivuDeOiJBMg" name="HistoryOfPresentIllnessSectionCodeP" constrainedElement="_2PcWsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4IQ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsbvMF9xEey5t-mahoHmrg" name="HistoryOfPresentIllnessSectionTitle" constrainedElement="_2PcWsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsbvMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4JfEH3sEeyivuDeOiJBMg" name="HistoryOfPresentIllnessSectionTitle" constrainedElement="_2PcWsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4JfEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsc9UF9xEey5t-mahoHmrg" name="HistoryOfPresentIllnessSectionText" constrainedElement="_2PcWsRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsc9UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4KtMH3sEeyivuDeOiJBMg" name="HistoryOfPresentIllnessSectionText" constrainedElement="_2PcWsRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4KtMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
@@ -7346,40 +7346,40 @@ value.code = '10164-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_2PidTxSVEeGGzu7fmW9pXw" annotatedElement="_2PidQhSVEeGGzu7fmW9pXw">
         <body>The Hospital Admitting Diagnosis section contains a narrative description of the primary reason for admission to a hospital facility. The section includes an optional entry to record patient conditions.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qseLcF9xEey5t-mahoHmrg" name="HospitalAdmissionDiagnosisSectionTemplateId" constrainedElement="_2PidQhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qseLcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4LUQH3sEeyivuDeOiJBMg" name="HospitalAdmissionDiagnosisSectionTemplateId" constrainedElement="_2PidQhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4LUQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.43')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qseygF9xEey5t-mahoHmrg" name="HospitalAdmissionDiagnosisSectionCode" constrainedElement="_2PidQhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qseygV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4L7UX3sEeyivuDeOiJBMg" name="HospitalAdmissionDiagnosisSectionCode" constrainedElement="_2PidQhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4L7Un3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '46241-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsgnsF9xEey5t-mahoHmrg" name="HospitalAdmissionDiagnosisSectionCodeP" constrainedElement="_2PidQhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsgnsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4NJcH3sEeyivuDeOiJBMg" name="HospitalAdmissionDiagnosisSectionCodeP" constrainedElement="_2PidQhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4NJcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsic4F9xEey5t-mahoHmrg" name="HospitalAdmissionDiagnosisSectionTitle" constrainedElement="_2PidQhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsic4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4OXkH3sEeyivuDeOiJBMg" name="HospitalAdmissionDiagnosisSectionTitle" constrainedElement="_2PidQhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4OXkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsjrAF9xEey5t-mahoHmrg" name="HospitalAdmissionDiagnosisSectionText" constrainedElement="_2PidQhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsjrAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4PlsH3sEeyivuDeOiJBMg" name="HospitalAdmissionDiagnosisSectionText" constrainedElement="_2PidQhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4PlsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_t7FcgF9xEey5t-mahoHmrg" name="HospitalAdmissionDiagnosisSectionHospitalAdmissionDiagnosis" constrainedElement="_2PidQhSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_t7FcgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FlJQ0H3sEeyivuDeOiJBMg" name="HospitalAdmissionDiagnosisSectionHospitalAdmissionDiagnosis" constrainedElement="_2PidQhSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FlJQ0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->one(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::HospitalAdmissionDiagnosis))</body>
         </specification>
@@ -7387,15 +7387,15 @@ value.code = '46241-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_2PidUBSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_t7GDkF9xEey5t-mahoHmrg" name="getHospitalAdmissionDiagnosis" bodyCondition="_t7GDk19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_t7GDk19xEey5t-mahoHmrg" name="body" constrainedElement="_t7GDkF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_t7GDlF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FlJQ0n3sEeyivuDeOiJBMg" name="getHospitalAdmissionDiagnosis" bodyCondition="_FlJQ1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FlJQ1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_FlJQ0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FlJQ1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::HospitalAdmissionDiagnosis))->asSequence()->any(true).oclAsType(consol::HospitalAdmissionDiagnosis)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_t7GDkV9xEey5t-mahoHmrg" type="_5K6mAEFHEeGorO80f-Cppg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t7GDkl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FlJQ033sEeyivuDeOiJBMg" type="_5K6mAEFHEeGorO80f-Cppg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FlJQ1H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -7403,40 +7403,40 @@ value.code = '46241-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_2Poj6xSVEeGGzu7fmW9pXw" annotatedElement="_2Poj5BSVEeGGzu7fmW9pXw">
         <body>The Hospital Admission Medications section defines the relevant medications administered prior to admission to the facility. The currently active medications must be listed.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qsk5IF9xEey5t-mahoHmrg" name="HospitalAdmissionMedicationsSectionEntriesOptionalTemplateId" constrainedElement="_2Poj5BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsk5IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4QMwH3sEeyivuDeOiJBMg" name="HospitalAdmissionMedicationsSectionEntriesOptionalTemplateId" constrainedElement="_2Poj5BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4QMwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.44')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsmHQF9xEey5t-mahoHmrg" name="HospitalAdmissionMedicationsSectionEntriesOptionalCode" constrainedElement="_2Poj5BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsmHQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4Qz0H3sEeyivuDeOiJBMg" name="HospitalAdmissionMedicationsSectionEntriesOptionalCode" constrainedElement="_2Poj5BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4Qz0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '42346-7' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsnVYF9xEey5t-mahoHmrg" name="HospitalAdmissionMedicationsSectionEntriesOptionalCodeP" constrainedElement="_2Poj5BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsnVYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4SB8H3sEeyivuDeOiJBMg" name="HospitalAdmissionMedicationsSectionEntriesOptionalCodeP" constrainedElement="_2Poj5BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4SB8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsojgF9xEey5t-mahoHmrg" name="HospitalAdmissionMedicationsSectionEntriesOptionalTitle" constrainedElement="_2Poj5BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsojgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4TQEH3sEeyivuDeOiJBMg" name="HospitalAdmissionMedicationsSectionEntriesOptionalTitle" constrainedElement="_2Poj5BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4TQEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsqYsF9xEey5t-mahoHmrg" name="HospitalAdmissionMedicationsSectionEntriesOptionalText" constrainedElement="_2Poj5BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsqYsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4UeMH3sEeyivuDeOiJBMg" name="HospitalAdmissionMedicationsSectionEntriesOptionalText" constrainedElement="_2Poj5BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4UeMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tZl5AF9xEey5t-mahoHmrg" name="HospitalAdmissionMedicationsSectionEntriesOptionalAdmissionMedication" constrainedElement="_2Poj5BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tZmgEF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FJ5fQH3sEeyivuDeOiJBMg" name="HospitalAdmissionMedicationsSectionEntriesOptionalAdmissionMedication" constrainedElement="_2Poj5BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FJ5fQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::AdmissionMedication))</body>
         </specification>
@@ -7444,15 +7444,15 @@ value.code = '42346-7' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_2Poj7BSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_tZmgEV9xEey5t-mahoHmrg" name="getAdmissionMedications" bodyCondition="_tZmgFF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tZmgFF9xEey5t-mahoHmrg" name="body" constrainedElement="_tZmgEV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tZmgFV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FJ5fQn3sEeyivuDeOiJBMg" name="getAdmissionMedications" bodyCondition="_FJ5fRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FJ5fRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FJ5fQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FJ5fRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::AdmissionMedication)).oclAsType(consol::AdmissionMedication)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tZmgEl9xEey5t-mahoHmrg" type="_LNP08EFGEeGorO80f-Cppg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tZmgE19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_FJ5fQ33sEeyivuDeOiJBMg" type="_LNP08EFGEeGorO80f-Cppg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FJ5fRH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -7460,40 +7460,40 @@ value.code = '42346-7' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_2Pxt0BSVEeGGzu7fmW9pXw" annotatedElement="_2Poj_BSVEeGGzu7fmW9pXw">
         <body>The Medications Administered section defines medications and fluids administered during the procedure, encounter, or other activity excluding anesthetic medications. This guide recommends anesthesia medications be documented as described in the section on Anesthesia.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qsq_wF9xEey5t-mahoHmrg" name="MedicationsAdministeredSectionTemplateId" constrainedElement="_2Poj_BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsq_wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4VFQH3sEeyivuDeOiJBMg" name="MedicationsAdministeredSectionTemplateId" constrainedElement="_2Poj_BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4VFQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.38')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qssN4F9xEey5t-mahoHmrg" name="MedicationsAdministeredSectionCode" constrainedElement="_2Poj_BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qssN4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4VsUH3sEeyivuDeOiJBMg" name="MedicationsAdministeredSectionCode" constrainedElement="_2Poj_BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4VsUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '29549-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qstcAF9xEey5t-mahoHmrg" name="MedicationsAdministeredSectionCodeP" constrainedElement="_2Poj_BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qstcAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4W6cH3sEeyivuDeOiJBMg" name="MedicationsAdministeredSectionCodeP" constrainedElement="_2Poj_BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4W6cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsvRMF9xEey5t-mahoHmrg" name="MedicationsAdministeredSectionTitle" constrainedElement="_2Poj_BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsvRMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4YIkH3sEeyivuDeOiJBMg" name="MedicationsAdministeredSectionTitle" constrainedElement="_2Poj_BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4YIkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qswfUF9xEey5t-mahoHmrg" name="MedicationsAdministeredSectionText" constrainedElement="_2Poj_BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qswfUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4ZWsH3sEeyivuDeOiJBMg" name="MedicationsAdministeredSectionText" constrainedElement="_2Poj_BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4ZWsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_t7wK4F9xEey5t-mahoHmrg" name="MedicationsAdministeredSectionMedicationActivity" constrainedElement="_2Poj_BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_t7wK4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FlkHkH3sEeyivuDeOiJBMg" name="MedicationsAdministeredSectionMedicationActivity" constrainedElement="_2Poj_BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FlkHkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.substanceAdministration.oclIsUndefined() and entry.substanceAdministration.oclIsKindOf(consol::MedicationActivity))</body>
         </specification>
@@ -7501,15 +7501,15 @@ value.code = '29549-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_2Pxt0RSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_t7wx8F9xEey5t-mahoHmrg" name="getMedicationActivities" bodyCondition="_t7wx819xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_t7wx819xEey5t-mahoHmrg" name="body" constrainedElement="_t7wx8F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_t7wx9F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FlkHkn3sEeyivuDeOiJBMg" name="getMedicationActivities" bodyCondition="_FlkHlX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FlkHlX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FlkHkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FlkHln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity)).oclAsType(consol::MedicationActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_t7wx8V9xEey5t-mahoHmrg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t7wx8l9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_FlkHk33sEeyivuDeOiJBMg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FlkHlH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -7518,52 +7518,52 @@ value.code = '29549-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         <body>The Physical Exam section includes direct observations made by the clinician. The examination may include the use of simple instruments and may also describe simple maneuvers performed directly on the patient's body. This section includes only observations made by the examining clinician using inspection, palpation, auscultation, and percussion; it does not include laboratory or imaging findings. The exam may be limited to pertinent body systems based on the patient's chief complaint or it may include a comprehensive examination. The examination may be reported as a collection of random clinical statements or it may be reported categorically. &#xD;
 The Physical Exam section may contain multiple nested subsections: Vital Signs, General Status, and those listed in the Additional Physical Examination Subsections appendix.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qsxtcF9xEey5t-mahoHmrg" name="PhysicalExamSectionTemplateId" constrainedElement="_2Pxt0hSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsxtcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4Z9wH3sEeyivuDeOiJBMg" name="PhysicalExamSectionTemplateId" constrainedElement="_2Pxt0hSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4Z9wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.2.10')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qsy7kF9xEey5t-mahoHmrg" name="PhysicalExamSectionCode" constrainedElement="_2Pxt0hSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qsy7kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4ak0H3sEeyivuDeOiJBMg" name="PhysicalExamSectionCode" constrainedElement="_2Pxt0hSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4ak0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '29545-1' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qs0JsF9xEey5t-mahoHmrg" name="PhysicalExamSectionCodeP" constrainedElement="_2Pxt0hSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qs0JsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4caAH3sEeyivuDeOiJBMg" name="PhysicalExamSectionCodeP" constrainedElement="_2Pxt0hSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4caAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qs1-4F9xEey5t-mahoHmrg" name="PhysicalExamSectionTitle" constrainedElement="_2Pxt0hSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qs1-4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4doIH3sEeyivuDeOiJBMg" name="PhysicalExamSectionTitle" constrainedElement="_2Pxt0hSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4doIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qs3NAF9xEey5t-mahoHmrg" name="PhysicalExamSectionText" constrainedElement="_2Pxt0hSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qs3NAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4e2QH3sEeyivuDeOiJBMg" name="PhysicalExamSectionText" constrainedElement="_2Pxt0hSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4e2QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_usnnIF9xEey5t-mahoHmrg" name="PhysicalExamSectionPressureUlcerObservation" constrainedElement="_2Pxt0hSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_usnnIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GORGUH3sEeyivuDeOiJBMg" name="PhysicalExamSectionPressureUlcerObservation" constrainedElement="_2Pxt0hSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GORGUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::PressureUlcerObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_utIkgF9xEey5t-mahoHmrg" name="PhysicalExamSectionNumberOfPressureUlcersObservation" constrainedElement="_2Pxt0hSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_utIkgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GOrWAH3sEeyivuDeOiJBMg" name="PhysicalExamSectionNumberOfPressureUlcersObservation" constrainedElement="_2Pxt0hSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GOrWAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::NumberOfPressureUlcersObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_utnFoF9xEey5t-mahoHmrg" name="PhysicalExamSectionHighestPressureUlcerStage" constrainedElement="_2Pxt0hSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_utnFoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GPFlsH3sEeyivuDeOiJBMg" name="PhysicalExamSectionHighestPressureUlcerStage" constrainedElement="_2Pxt0hSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GPFlsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::HighestPressureUlcerStage))</body>
         </specification>
@@ -7571,37 +7571,37 @@ value.code = '29545-1' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_2RkdqxSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_usoOMF9xEey5t-mahoHmrg" name="getPressureUlcerObservations" bodyCondition="_usoOM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_usoOM19xEey5t-mahoHmrg" name="body" constrainedElement="_usoOMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_usoONF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GORGUn3sEeyivuDeOiJBMg" name="getPressureUlcerObservations" bodyCondition="_GORGVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GORGVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GORGUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GORGVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PressureUlcerObservation)).oclAsType(consol::PressureUlcerObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_usoOMV9xEey5t-mahoHmrg" type="_9rQowOZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_usoOMl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GORGU33sEeyivuDeOiJBMg" type="_9rQowOZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GORGVH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_utJLkF9xEey5t-mahoHmrg" name="getNumberOfPressureUlcersObservations" bodyCondition="_utJLk19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_utJLk19xEey5t-mahoHmrg" name="body" constrainedElement="_utJLkF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_utJLlF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GOrWAn3sEeyivuDeOiJBMg" name="getNumberOfPressureUlcersObservations" bodyCondition="_GOrWBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GOrWBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GOrWAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GOrWBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::NumberOfPressureUlcersObservation)).oclAsType(consol::NumberOfPressureUlcersObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_utJLkV9xEey5t-mahoHmrg" type="_7c4ssOZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_utJLkl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GOrWA33sEeyivuDeOiJBMg" type="_7c4ssOZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GOrWBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_utnFol9xEey5t-mahoHmrg" name="getHighestPressureUlcerStages" bodyCondition="_utnFpV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_utnFpV9xEey5t-mahoHmrg" name="body" constrainedElement="_utnFol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_utnFpl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GPFlsn3sEeyivuDeOiJBMg" name="getHighestPressureUlcerStages" bodyCondition="_GPFltX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GPFltX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GPFlsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GPFltn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::HighestPressureUlcerStage)).oclAsType(consol::HighestPressureUlcerStage)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_utnFo19xEey5t-mahoHmrg" type="_4YgVsOZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_utnFpF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GPFls33sEeyivuDeOiJBMg" type="_4YgVsOZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GPFltH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -7609,34 +7609,34 @@ value.code = '29545-1' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_2Pxt7BSVEeGGzu7fmW9pXw" annotatedElement="_2Pxt6xSVEeGGzu7fmW9pXw">
         <body>The General Status section describes general observations and readily observable attributes of the patient, including affect and demeanor, apparent age compared to actual age, gender, ethnicity, nutritional status based on appearance, body build and habitus (e.g., muscular, cachectic, obese), developmental or other deformities, gait and mobility, personal hygiene, evidence of distress, and voice quality and speech.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qs4bIF9xEey5t-mahoHmrg" name="GeneralStatusSectionTemplateId" constrainedElement="_2Pxt6xSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qs4bIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4fdUH3sEeyivuDeOiJBMg" name="GeneralStatusSectionTemplateId" constrainedElement="_2Pxt6xSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4fdUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.2.5')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qs5CMF9xEey5t-mahoHmrg" name="GeneralStatusSectionCode" constrainedElement="_2Pxt6xSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qs5CMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4grcH3sEeyivuDeOiJBMg" name="GeneralStatusSectionCode" constrainedElement="_2Pxt6xSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4grcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10210-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qs63YF9xEey5t-mahoHmrg" name="GeneralStatusSectionCodeP" constrainedElement="_2Pxt6xSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qs63YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4h5kH3sEeyivuDeOiJBMg" name="GeneralStatusSectionCodeP" constrainedElement="_2Pxt6xSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4h5kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qs8FgF9xEey5t-mahoHmrg" name="GeneralStatusSectionTitle" constrainedElement="_2Pxt6xSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qs8FgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4jHsH3sEeyivuDeOiJBMg" name="GeneralStatusSectionTitle" constrainedElement="_2Pxt6xSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4jHsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qs96sF9xEey5t-mahoHmrg" name="GeneralStatusSectionText" constrainedElement="_2Pxt6xSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qs96sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4kV0H3sEeyivuDeOiJBMg" name="GeneralStatusSectionText" constrainedElement="_2Pxt6xSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4kV0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
@@ -7649,34 +7649,34 @@ value.code = '10210-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_2RqkOBSVEeGGzu7fmW9pXw" annotatedElement="_2RqkMBSVEeGGzu7fmW9pXw">
         <body>The Review of Systems section contains a relevant collection of symptoms and functions systematically gathered by a clinician. It includes symptoms the patient is currently experiencing, some of which were not elicited during the history of present illness, as well as a potentially large number of pertinent negatives, for example, symptoms that the patient denied experiencing.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qs-hwF9xEey5t-mahoHmrg" name="ReviewOfSystemsSectionTemplateId" constrainedElement="_2RqkMBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qs-hwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4k84H3sEeyivuDeOiJBMg" name="ReviewOfSystemsSectionTemplateId" constrainedElement="_2RqkMBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4k84X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '1.3.6.1.4.1.19376.1.5.3.1.3.18')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qs_v4F9xEey5t-mahoHmrg" name="ReviewOfSystemsSectionCode" constrainedElement="_2RqkMBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qs_v4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4lj8H3sEeyivuDeOiJBMg" name="ReviewOfSystemsSectionCode" constrainedElement="_2RqkMBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4lj8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10187-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qtA-AF9xEey5t-mahoHmrg" name="ReviewOfSystemsSectionCodeP" constrainedElement="_2RqkMBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtA-AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4myEH3sEeyivuDeOiJBMg" name="ReviewOfSystemsSectionCodeP" constrainedElement="_2RqkMBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4myEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qtCzMF9xEey5t-mahoHmrg" name="ReviewOfSystemsSectionTitle" constrainedElement="_2RqkMBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtCzMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4oAMH3sEeyivuDeOiJBMg" name="ReviewOfSystemsSectionTitle" constrainedElement="_2RqkMBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4oAMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qtEBUF9xEey5t-mahoHmrg" name="ReviewOfSystemsSectionText" constrainedElement="_2RqkMBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtEBUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4onQH3sEeyivuDeOiJBMg" name="ReviewOfSystemsSectionText" constrainedElement="_2RqkMBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4onQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
@@ -7690,34 +7690,34 @@ value.code = '10187-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         <body>The Assessment and Plan sections may be combined or separated to meet local policy requirements.&#xD;
 The Assessment and Plan section represents both the clinician's conclusions and working assumptions that will guide treatment of the patient (see Assessment Section above) and pending orders, interventions, encounters, services, and procedures for the patient (see Plan of Care Section below).</body>
       </ownedComment>
-      <ownedRule xmi:id="_qtEoYF9xEey5t-mahoHmrg" name="AssessmentAndPlanSectionTemplateId" constrainedElement="_2Rwq0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtFPcF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4pOUH3sEeyivuDeOiJBMg" name="AssessmentAndPlanSectionTemplateId" constrainedElement="_2Rwq0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4p1YH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.9')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qtF2gF9xEey5t-mahoHmrg" name="AssessmentAndPlanSectionCode" constrainedElement="_2Rwq0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtF2gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4qccH3sEeyivuDeOiJBMg" name="AssessmentAndPlanSectionCode" constrainedElement="_2Rwq0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4qccX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '51847-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qtHEoF9xEey5t-mahoHmrg" name="AssessmentAndPlanSectionCodeP" constrainedElement="_2Rwq0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtHEoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4rDgH3sEeyivuDeOiJBMg" name="AssessmentAndPlanSectionCodeP" constrainedElement="_2Rwq0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4rDgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qtISwF9xEey5t-mahoHmrg" name="AssessmentAndPlanSectionText" constrainedElement="_2Rwq0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtISwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4s4sH3sEeyivuDeOiJBMg" name="AssessmentAndPlanSectionText" constrainedElement="_2Rwq0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4s4sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r0IXEF9xEey5t-mahoHmrg" name="AssessmentAndPlanSectionPlanOfCareActivityAct" constrainedElement="_2Rwq0BSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r0IXEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D13rkH3sEeyivuDeOiJBMg" name="AssessmentAndPlanSectionPlanOfCareActivityAct" constrainedElement="_2Rwq0BSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D13rkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::PlanOfCareActivityAct))</body>
         </specification>
@@ -7725,15 +7725,15 @@ value.code = '51847-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_2Rwq8hSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_r0IXEl9xEey5t-mahoHmrg" name="getPlanOfCareActivityActs" bodyCondition="_r0IXFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_r0IXFV9xEey5t-mahoHmrg" name="body" constrainedElement="_r0IXEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_r0IXFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_D13rkn3sEeyivuDeOiJBMg" name="getPlanOfCareActivityActs" bodyCondition="_D14Son3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_D14Son3sEeyivuDeOiJBMg" name="body" constrainedElement="_D13rkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_D14So33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PlanOfCareActivityAct)).oclAsType(consol::PlanOfCareActivityAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_r0IXE19xEey5t-mahoHmrg" type="_2NWE5xSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r0IXFF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_D14SoH3sEeyivuDeOiJBMg" type="_2NWE5xSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_D14SoX3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -7741,50 +7741,50 @@ value.code = '51847-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_fqbbcCHkEeGFLIX-2_sWzA">
         <body>This clinical statement records whether the family member is deceased</body>
       </ownedComment>
-      <ownedRule xmi:id="_qtJg4F9xEey5t-mahoHmrg" name="FamilyHistoryDeathObservationTemplateId" constrainedElement="_2SC-sBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtJg4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4tfwH3sEeyivuDeOiJBMg" name="FamilyHistoryDeathObservationTemplateId" constrainedElement="_2SC-sBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4tfwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.47')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qtKvAF9xEey5t-mahoHmrg" name="FamilyHistoryDeathObservationClassCode" constrainedElement="_2SC-sBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtKvAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4ut4H3sEeyivuDeOiJBMg" name="FamilyHistoryDeathObservationClassCode" constrainedElement="_2SC-sBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4ut4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qtMkMF9xEey5t-mahoHmrg" name="FamilyHistoryDeathObservationMoodCode" constrainedElement="_2SC-sBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtMkMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4v8AH3sEeyivuDeOiJBMg" name="FamilyHistoryDeathObservationMoodCode" constrainedElement="_2SC-sBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4v8AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qtNyUF9xEey5t-mahoHmrg" name="FamilyHistoryDeathObservationCode" constrainedElement="_2SC-sBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtNyUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4xKIH3sEeyivuDeOiJBMg" name="FamilyHistoryDeathObservationCode" constrainedElement="_2SC-sBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4xKIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qtPngF9xEey5t-mahoHmrg" name="FamilyHistoryDeathObservationStatusCode" constrainedElement="_2SC-sBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtPngV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4yYQH3sEeyivuDeOiJBMg" name="FamilyHistoryDeathObservationStatusCode" constrainedElement="_2SC-sBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4yYQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qtQ1oF9xEey5t-mahoHmrg" name="FamilyHistoryDeathObservationValue" constrainedElement="_2SC-sBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtQ1oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C4zmYH3sEeyivuDeOiJBMg" name="FamilyHistoryDeathObservationValue" constrainedElement="_2SC-sBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C4zmYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.code = '419099009' and value.codeSystem = '2.16.840.1.113883.6.96'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qtSq0F9xEey5t-mahoHmrg" name="FamilyHistoryDeathObservationValueP" constrainedElement="_2SC-sBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtSq0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C400gH3sEeyivuDeOiJBMg" name="FamilyHistoryDeathObservationValueP" constrainedElement="_2SC-sBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C400gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
@@ -7797,34 +7797,34 @@ value.code = '419099009' and value.codeSystem = '2.16.840.1.113883.6.96'))</body
       <ownedComment xmi:id="_SOgPAEE3EeGdmoWy_aLP0Q">
         <body>The Surgical Drains section may be used to record drains placed during the surgical procedure. Optionally, surgical drain placement may be represented with a text element in the Procedure Description Section.</body>
       </ownedComment>
-      <ownedRule xmi:id="_qtTR4F9xEey5t-mahoHmrg" name="SurgicalDrainsSectionTemplateId" constrainedElement="_luQh8DVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtTR4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C41bkH3sEeyivuDeOiJBMg" name="SurgicalDrainsSectionTemplateId" constrainedElement="_luQh8DVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C41bkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.7.13')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qtUgAF9xEey5t-mahoHmrg" name="SurgicalDrainsSectionCode" constrainedElement="_luQh8DVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtUgAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C42psH3sEeyivuDeOiJBMg" name="SurgicalDrainsSectionCode" constrainedElement="_luQh8DVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C42psX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '11537-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qtVuIF9xEey5t-mahoHmrg" name="SurgicalDrainsSectionCodeP" constrainedElement="_luQh8DVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtVuIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C43QwH3sEeyivuDeOiJBMg" name="SurgicalDrainsSectionCodeP" constrainedElement="_luQh8DVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C43QwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qtW8QF9xEey5t-mahoHmrg" name="SurgicalDrainsSectionText" constrainedElement="_luQh8DVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtW8QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C44e4H3sEeyivuDeOiJBMg" name="SurgicalDrainsSectionText" constrainedElement="_luQh8DVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C44e4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qtYxcF9xEey5t-mahoHmrg" name="SurgicalDrainsSectionTitle" constrainedElement="_luQh8DVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtYxcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C45tAH3sEeyivuDeOiJBMg" name="SurgicalDrainsSectionTitle" constrainedElement="_luQh8DVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C45tAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
@@ -7842,98 +7842,98 @@ For guidance on how to handle multiple files, on the selection of media types fo
 IHE's XDS-SD (Cross-Transaction Specifications and Content Specifications, Scanned Documents Module) profile addresses a similar, more restricted use case, specifically for scanned documents or documents electronically created from existing text sources, and limits content to PDF-A or text. This Unstructured Documents implementation guide is applicable not only for scanned documents in non-PDF formats, but also for clinical documents produced through word processing applications, etc. &#xD;
 For conformance with both specifications, please review the appendix on XDS-SD and US Realm Clinical Document Header Comparison and ensure that your documents at a minimum conform to all the SHALL constraints from either specification .</body>
       </ownedComment>
-      <ownedRule xmi:id="_qtZYgF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtZYgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C46UEH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C46UEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.10')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tRJHoF9xEey5t-mahoHmrg" name="UnstructuredDocumentRecordTarget" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tRJusF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FC3qMH3sEeyivuDeOiJBMg" name="UnstructuredDocumentRecordTarget" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FC3qMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->one(recordTarget : cda::RecordTarget | not recordTarget.oclIsUndefined() and recordTarget.oclIsKindOf(cda::RecordTarget))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tRnowF9xEey5t-mahoHmrg" name="UnstructuredDocumentAuthor" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tRnowV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FDWyYH3sEeyivuDeOiJBMg" name="UnstructuredDocumentAuthor" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FDWyYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->one(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(cda::Author))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tTFoYF9xEey5t-mahoHmrg" name="UnstructuredDocumentComponent" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tTFoYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FEkTUH3sEeyivuDeOiJBMg" name="UnstructuredDocumentComponent" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FEkTUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->one(component : cda::Component2 | not component.oclIsUndefined() and component.oclIsKindOf(cda::Component2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tUFt8F9xEey5t-mahoHmrg" name="UnstructuredDocumentCustodian" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tUFt8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FFYLoH3sEeyivuDeOiJBMg" name="UnstructuredDocumentCustodian" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FFYLoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->one(custodian : cda::Custodian | not custodian.oclIsUndefined() and custodian.oclIsKindOf(cda::Custodian))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5zq0EF9xEey5t-mahoHmrg" name="UnstructuredDocumentRecordTargetPatientRole2Id" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5zq0EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P1ZYoH3sEeyivuDeOiJBMg" name="UnstructuredDocumentRecordTargetPatientRole2Id" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P1ZYoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (id->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5zq0El9xEey5t-mahoHmrg" name="UnstructuredDocumentRecordTargetPatientRole2" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5zq0E19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P1ZYon3sEeyivuDeOiJBMg" name="UnstructuredDocumentRecordTargetPatientRole2" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P1ZYo33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null)->reject(patientRole->one(patientRole : cda::PatientRole | not patientRole.oclIsUndefined() and patientRole.oclIsKindOf(cda::PatientRole)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_50rgsF9xEey5t-mahoHmrg" name="UnstructuredDocumentAuthorAssignedAuthor2Addr" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_50rgsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P2RiYH3sEeyivuDeOiJBMg" name="UnstructuredDocumentAuthorAssignedAuthor2Addr" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P2RiYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (addr->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_50rgsl9xEey5t-mahoHmrg" name="UnstructuredDocumentAuthorAssignedAuthor2Telecom" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_50rgs19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P2RiYn3sEeyivuDeOiJBMg" name="UnstructuredDocumentAuthorAssignedAuthor2Telecom" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P2RiY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (telecom->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_50sHwF9xEey5t-mahoHmrg" name="UnstructuredDocumentAuthorAssignedAuthor2" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_50sHwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P2SJcH3sEeyivuDeOiJBMg" name="UnstructuredDocumentAuthorAssignedAuthor2" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P2SJcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null)->reject(assignedAuthor->one(assignedAuthor : cda::AssignedAuthor | not assignedAuthor.oclIsUndefined() and assignedAuthor.oclIsKindOf(cda::AssignedAuthor)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_52rr0F9xEey5t-mahoHmrg" name="UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationAddr" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_52rr0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P4X0IH3sEeyivuDeOiJBMg" name="UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationAddr" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P4X0IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null)->reject((addr.oclIsUndefined() or addr.isNullFlavorUndefined()) implies (not addr.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_52sS4F9xEey5t-mahoHmrg" name="UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationId" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_52sS4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P4YbMH3sEeyivuDeOiJBMg" name="UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationId" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P4YbMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (id->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_52sS4l9xEey5t-mahoHmrg" name="UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationName" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_52sS419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P4YbMn3sEeyivuDeOiJBMg" name="UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationName" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P4YbM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null)->reject((name.oclIsUndefined() or name.isNullFlavorUndefined()) implies (not name.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_52sS5F9xEey5t-mahoHmrg" name="UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationTelecom" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_52sS5V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P4ZCQH3sEeyivuDeOiJBMg" name="UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationTelecom" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P4ZCQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null)->reject((telecom.oclIsUndefined() or telecom.isNullFlavorUndefined()) implies (not telecom.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_52sS5l9xEey5t-mahoHmrg" name="UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganization" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_52sS519xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P4ZCQn3sEeyivuDeOiJBMg" name="UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganization" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P4ZCQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null)->reject(representedCustodianOrganization->one(representedCustodianOrganization : cda::CustodianOrganization | not representedCustodianOrganization.oclIsUndefined() and representedCustodianOrganization.oclIsKindOf(cda::CustodianOrganization)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_52s58F9xEey5t-mahoHmrg" name="UnstructuredDocumentCustodianAssignedCustodian2" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_52s58V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P4ZCRH3sEeyivuDeOiJBMg" name="UnstructuredDocumentCustodianAssignedCustodian2" constrainedElement="_2TeiIRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P4ZCRX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null)->reject(assignedCustodian->one(assignedCustodian : cda::AssignedCustodian | not assignedCustodian.oclIsUndefined() and assignedCustodian.oclIsKindOf(cda::AssignedCustodian)))</body>
         </specification>
@@ -7944,62 +7944,62 @@ For conformance with both specifications, please review the appendix on XDS-SD a
       <ownedComment xmi:id="_RzpgUCAMEeGKirKJsFylGA">
         <body>The medication can be recorded as a precoordinated product strength, product form, or product concentration (e.g. &quot;metoprolol 25mg tablet&quot;, &quot;amoxicillin 400mg/5mL suspension&quot;); or not pre-coordinated (e.g. &quot;metoprolol product&quot;).</body>
       </ownedComment>
-      <ownedRule xmi:id="_qtmz4F9xEey5t-mahoHmrg" name="MedicationInformationTemplateId" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtmz4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C5EFEH3sEeyivuDeOiJBMg" name="MedicationInformationTemplateId" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C5EsIH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.23')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qtoCAF9xEey5t-mahoHmrg" name="MedicationInformationId" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtoCAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C5FTMH3sEeyivuDeOiJBMg" name="MedicationInformationId" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C5FTMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (not self.id->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qtpQIF9xEey5t-mahoHmrg" name="MedicationInformationClassCode" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qtpQIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C5GhUH3sEeyivuDeOiJBMg" name="MedicationInformationClassCode" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C5GhUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('classCode') and self.classCode=vocab::RoleClassManufacturedProduct::MANU</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rgqBcF9xEey5t-mahoHmrg" name="MedicationInformationManufacturerOrganization" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rgqBcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DlQcsH3sEeyivuDeOiJBMg" name="MedicationInformationManufacturerOrganization" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DlQcsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturerOrganization->one(manufacturerOrganization : cda::Organization | not manufacturerOrganization.oclIsUndefined() and manufacturerOrganization.oclIsKindOf(rim::Entity))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tk9bgF9xEey5t-mahoHmrg" name="MedicationInformationManufacturedMaterial" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tk9bgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FTs7gH3sEeyivuDeOiJBMg" name="MedicationInformationManufacturedMaterial" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FTs7gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->one(manufacturedMaterial : cda::Material | not manufacturedMaterial.oclIsUndefined() and manufacturedMaterial.oclIsKindOf(cda::Material))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_53MCIF9xEey5t-mahoHmrg" name="MedicationInformationMedicationInformationManufacturedMaterialCodeOriginalText" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_53MCIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P48b4H3sEeyivuDeOiJBMg" name="MedicationInformationMedicationInformationManufacturedMaterialCodeOriginalText" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P49C8H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject(code.originalText->size() = 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_53MCIl9xEey5t-mahoHmrg" name="MedicationInformationMedicationInformationManufacturedMaterialReference" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_53MCI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P49C8X3sEeyivuDeOiJBMg" name="MedicationInformationMedicationInformationManufacturedMaterialReference" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P49C8n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject(code.originalText->size() = 1 implies code.originalText->one(reference->size() = 1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_53MpMF9xEey5t-mahoHmrg" name="MedicationInformationMedicationInformationManufacturedMaterialOriginalTextReferenceValue" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_53MpMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P49C833sEeyivuDeOiJBMg" name="MedicationInformationMedicationInformationManufacturedMaterialOriginalTextReferenceValue" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P49qAH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject(code.originalText.reference->size() = 1 implies code.originalText.reference.value->size() = 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_53MpMl9xEey5t-mahoHmrg" name="MedicationInformationMedicationInformationManufacturedMaterialCodeTranslation" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_53MpM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P49qAX3sEeyivuDeOiJBMg" name="MedicationInformationMedicationInformationManufacturedMaterialCodeTranslation" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P49qAn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject(code->size() = 1 implies code.translation->size() > 0)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_53MpNF9xEey5t-mahoHmrg" name="MedicationInformationMedicationInformationManufacturedMaterialCode" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_53MpNV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P4-REH3sEeyivuDeOiJBMg" name="MedicationInformationMedicationInformationManufacturedMaterialCode" constrainedElement="_2T9DQBSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P4-REX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
@@ -8017,534 +8017,534 @@ value.codeSystem = '2.16.840.1.113883.6.88' and not value.code.oclIsUndefined())
           <body>( self.getAllSections()->exists(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection)) ) implies not ( self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection)) or self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection)) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_quJmcF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_quJmcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C5jNQH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C5jNQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.8')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qusZAF9xEey5t-mahoHmrg" name="DischargeSummaryCodeP" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qusZAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C6BHUH3sEeyivuDeOiJBMg" name="DischargeSummaryCodeP" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C6BHUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_quK0kF9xEey5t-mahoHmrg" name="DischargeSummaryCode" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_quK0kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C5lCcH3sEeyivuDeOiJBMg" name="DischargeSummaryCode" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C5lCcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '18842-5' or value.code = '11490-0' or value.code = '28655-9' or value.code = '29761-4' or value.code = '34745-0' or value.code = '34105-7' or value.code = '34106-5'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qwKYoF9xEey5t-mahoHmrg" name="DischargeSummaryHospitalAdmissionMedicationsSectionEntriesOptional" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qwKYoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C654IH3sEeyivuDeOiJBMg" name="DischargeSummaryHospitalAdmissionMedicationsSectionEntriesOptional" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C654IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalAdmissionMedicationsSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qwrWAF9xEey5t-mahoHmrg" name="DischargeSummaryHospitalAdmissionDiagnosisSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qwrWAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C7TgwH3sEeyivuDeOiJBMg" name="DischargeSummaryHospitalAdmissionDiagnosisSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C7UH0H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalAdmissionDiagnosisSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qxLsUF9xEey5t-mahoHmrg" name="DischargeSummaryHospitalDischargeDiagnosisSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qxLsUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C7twcH3sEeyivuDeOiJBMg" name="DischargeSummaryHospitalDischargeDiagnosisSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C7twcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalDischargeDiagnosisSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qxrbkF9xEey5t-mahoHmrg" name="DischargeSummaryDischargeDietSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qxrbkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C8M4oH3sEeyivuDeOiJBMg" name="DischargeSummaryDischargeDietSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C8M4oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::DischargeDietSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qyJ8sF9xEey5t-mahoHmrg" name="DischargeSummaryHospitalDischargeMedicationsSectionEntriesOptional" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qyJ8sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C8sn4H3sEeyivuDeOiJBMg" name="DischargeSummaryHospitalDischargeMedicationsSectionEntriesOptional" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C8sn4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalDischargeMedicationsSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qyrhIF9xEey5t-mahoHmrg" name="DischargeSummaryFunctionalStatusSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qyrhIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C9US8H3sEeyivuDeOiJBMg" name="DischargeSummaryFunctionalStatusSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C9U6AH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FunctionalStatusSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qzJbMF9xEey5t-mahoHmrg" name="DischargeSummaryHistoryOfPresentIllnessSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qzJbMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C9yNAH3sEeyivuDeOiJBMg" name="DischargeSummaryHistoryOfPresentIllnessSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C9yNAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_qzpKcF9xEey5t-mahoHmrg" name="DischargeSummaryHospitalCourseSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qzpKcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C-O48H3sEeyivuDeOiJBMg" name="DischargeSummaryHospitalCourseSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C-O48X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalCourseSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q0GdcF9xEey5t-mahoHmrg" name="DischargeSummaryPlanOfCareSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q0GdcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C-q90H3sEeyivuDeOiJBMg" name="DischargeSummaryPlanOfCareSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C-q90X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfCareSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q0mMsF9xEey5t-mahoHmrg" name="DischargeSummaryHistoryOfPastIllnessSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q0mMsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C_FNgH3sEeyivuDeOiJBMg" name="DischargeSummaryHistoryOfPastIllnessSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C_FNgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sMLDoF9xEey5t-mahoHmrg" name="DischargeSummaryComponentOf" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sMLDoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EKepoH3sEeyivuDeOiJBMg" name="DischargeSummaryComponentOf" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EKepoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->one(componentOf : cda::Component1 | not componentOf.oclIsUndefined() and componentOf.oclIsKindOf(cda::Component1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sOG9UF9xEey5t-mahoHmrg" name="DischargeSummaryChiefComplaintAndReasonForVisitSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sOG9UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EMGaQH3sEeyivuDeOiJBMg" name="DischargeSummaryChiefComplaintAndReasonForVisitSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EMGaQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sOk3YF9xEey5t-mahoHmrg" name="DischargeSummaryChiefComplaintSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sOk3YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EMjtQH3sEeyivuDeOiJBMg" name="DischargeSummaryChiefComplaintSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EMjtQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sPD_kF9xEey5t-mahoHmrg" name="DischargeSummaryFamilyHistorySection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sPD_kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EM988H3sEeyivuDeOiJBMg" name="DischargeSummaryFamilyHistorySection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EM988X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sPjHwF9xEey5t-mahoHmrg" name="DischargeSummaryHospitalConsultationsSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sPjHwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ENYMoH3sEeyivuDeOiJBMg" name="DischargeSummaryHospitalConsultationsSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ENYMoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalConsultationsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sQCP8F9xEey5t-mahoHmrg" name="DischargeSummaryHospitalDischargeInstructionsSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sQCP8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EN2GsH3sEeyivuDeOiJBMg" name="DischargeSummaryHospitalDischargeInstructionsSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EN2GsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalDischargeInstructionsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sQfi8F9xEey5t-mahoHmrg" name="DischargeSummaryHospitalDischargePhysicalSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sQfi8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EORkgH3sEeyivuDeOiJBMg" name="DischargeSummaryHospitalDischargePhysicalSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EORkgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalDischargePhysicalSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sQ-rIF9xEey5t-mahoHmrg" name="DischargeSummaryHospitalDischargeStudiesSummarySection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sQ-rIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EOsbQH3sEeyivuDeOiJBMg" name="DischargeSummaryHospitalDischargeStudiesSummarySection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EOsbQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalDischargeStudiesSummarySection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sRfBcF9xEey5t-mahoHmrg" name="DischargeSummaryImmunizationsSectionEntriesOptional" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sRfBcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EPFc0H3sEeyivuDeOiJBMg" name="DischargeSummaryImmunizationsSectionEntriesOptional" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EPFc0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sR_XwF9xEey5t-mahoHmrg" name="DischargeSummaryProblemSectionEntriesOptional" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sR_XwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EPfFcH3sEeyivuDeOiJBMg" name="DischargeSummaryProblemSectionEntriesOptional" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EPfFcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sSfHAF9xEey5t-mahoHmrg" name="DischargeSummaryProceduresSectionEntriesOptional" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sSfHAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EP4uEH3sEeyivuDeOiJBMg" name="DischargeSummaryProceduresSectionEntriesOptional" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EP4uEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sS_dUF9xEey5t-mahoHmrg" name="DischargeSummaryReasonForVisitSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sS_dUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EQS9wH3sEeyivuDeOiJBMg" name="DischargeSummaryReasonForVisitSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EQS9wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sTfzoF9xEey5t-mahoHmrg" name="DischargeSummaryReviewOfSystemsSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sTfzoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EQsmYH3sEeyivuDeOiJBMg" name="DischargeSummaryReviewOfSystemsSection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EQsmYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sUAJ8F9xEey5t-mahoHmrg" name="DischargeSummarySocialHistorySection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sUAxAF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ERHdIH3sEeyivuDeOiJBMg" name="DischargeSummarySocialHistorySection" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ERHdIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_u_ZZMF9xEey5t-mahoHmrg" name="DischargeSummaryAllergiesSectionEntriesOptional" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_u_ZZMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gd1zYH3sEeyivuDeOiJBMg" name="DischargeSummaryAllergiesSectionEntriesOptional" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gd1zYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_u_5IcF9xEey5t-mahoHmrg" name="DischargeSummaryVitalSignsSectionEntriesOptional" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_u_5vgF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GeRRMH3sEeyivuDeOiJBMg" name="DischargeSummaryVitalSignsSectionEntriesOptional" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GeRRMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_54tFEF9xEey5t-mahoHmrg" name="DischargeSummaryComponentOfEncompassingEncounter3ResponsiblePartyAssignedEntityHasPersonOrOrganization" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_54tFEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P6de0H3sEeyivuDeOiJBMg" name="DischargeSummaryComponentOfEncompassingEncounter3ResponsiblePartyAssignedEntityHasPersonOrOrganization" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P6de0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).responsibleParty->excluding(null)->reject(not assignedEntity.assignedPerson.oclIsUndefined() or not assignedEntity.representedOrganization->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_54tsIF9xEey5t-mahoHmrg" name="DischargeSummaryComponentOfEncompassingEncounter3ResponsiblePartyAssignedEntity" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_54tsIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P6de0n3sEeyivuDeOiJBMg" name="DischargeSummaryComponentOfEncompassingEncounter3ResponsiblePartyAssignedEntity" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P6de033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).responsibleParty->excluding(null)->reject(assignedEntity->exists(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(rim::Role)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_55OCcF9xEey5t-mahoHmrg" name="DischargeSummaryComponentOfEncompassingEncounter3EncounterParticipantAssignedEntityHasPersonOrOrganization" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_55OCcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P66x0H3sEeyivuDeOiJBMg" name="DischargeSummaryComponentOfEncompassingEncounter3EncounterParticipantAssignedEntityHasPersonOrOrganization" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P66x0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).encounterParticipant->excluding(null)->reject(not assignedEntity.assignedPerson.oclIsUndefined() or not assignedEntity.representedOrganization->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_55OpgF9xEey5t-mahoHmrg" name="DischargeSummaryComponentOfEncompassingEncounter3EncounterParticipantAssignedEntity" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_55OpgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P67Y4H3sEeyivuDeOiJBMg" name="DischargeSummaryComponentOfEncompassingEncounter3EncounterParticipantAssignedEntity" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P67Y4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).encounterParticipant->excluding(null)->reject(assignedEntity->exists(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(rim::Role)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_55Opgl9xEey5t-mahoHmrg" name="DischargeSummaryComponentOfEncompassingEncounter3EncompassingEncounterHasEffectiveTimeLow" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_55Opg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P67Y4n3sEeyivuDeOiJBMg" name="DischargeSummaryComponentOfEncompassingEncounter3EncompassingEncounterHasEffectiveTimeLow" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P67Y433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(not effectiveTime.low.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_55OphF9xEey5t-mahoHmrg" name="DischargeSummaryComponentOfEncompassingEncounter3EncompassingEncounterHasEffectiveTimeHigh" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_55OphV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P67_8H3sEeyivuDeOiJBMg" name="DischargeSummaryComponentOfEncompassingEncounter3EncompassingEncounterHasEffectiveTimeHigh" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P67_8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(not effectiveTime.high.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_55PQkF9xEey5t-mahoHmrg" name="DischargeSummaryComponentOfEncompassingEncounter3DischargeDispositionCodeValueSet" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_55PQkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P67_8n3sEeyivuDeOiJBMg" name="DischargeSummaryComponentOfEncompassingEncounter3DischargeDispositionCodeValueSet" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P67_833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(dischargeDispositionCode.oclIsUndefined() or dischargeDispositionCode.isNullFlavorUndefined() implies let value : datatypes::CE = dischargeDispositionCode.oclAsType(datatypes::CE) in value.codeSystem &lt;> '2.16.840.1.113883.12.112' implies value.codeSystem = '2.16.840.1.113883.6.301.5' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_55PQkl9xEey5t-mahoHmrg" name="DischargeSummaryComponentOfEncompassingEncounter3DischargeDispositionCodeCodeSystem" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_55PQk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P67_9H3sEeyivuDeOiJBMg" name="DischargeSummaryComponentOfEncompassingEncounter3DischargeDispositionCodeCodeSystem" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P67_9X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(dischargeDispositionCode.oclIsUndefined() or dischargeDispositionCode.isNullFlavorUndefined() implies let value : datatypes::CE = dischargeDispositionCode.oclAsType(datatypes::CE) in value.codeSystem &lt;> '2.16.840.1.113883.6.301.5' implies value.codeSystem = '2.16.840.1.113883.12.112' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_55P3oF9xEey5t-mahoHmrg" name="DischargeSummaryComponentOfEncompassingEncounter3DischargeDispositionCode" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_55P3oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P68nAH3sEeyivuDeOiJBMg" name="DischargeSummaryComponentOfEncompassingEncounter3DischargeDispositionCode" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P68nAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((dischargeDispositionCode.oclIsUndefined() or dischargeDispositionCode.isNullFlavorUndefined()) implies (not dischargeDispositionCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_55P3ol9xEey5t-mahoHmrg" name="DischargeSummaryComponentOfEncompassingEncounter3EffectiveTime" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_55P3o19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P68nAn3sEeyivuDeOiJBMg" name="DischargeSummaryComponentOfEncompassingEncounter3EffectiveTime" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P68nA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_55P3pF9xEey5t-mahoHmrg" name="DischargeSummaryComponentOfEncompassingEncounter3ResponsibleParty" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_55P3pV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P69OEH3sEeyivuDeOiJBMg" name="DischargeSummaryComponentOfEncompassingEncounter3ResponsibleParty" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P69OEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(responsibleParty->one(responsibleParty : cda::ResponsibleParty | not responsibleParty.oclIsUndefined() and responsibleParty.oclIsKindOf(cda::ResponsibleParty)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_55QesF9xEey5t-mahoHmrg" name="DischargeSummaryComponentOfEncompassingEncounter3EncounterParticipant" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_55QesV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P69OEn3sEeyivuDeOiJBMg" name="DischargeSummaryComponentOfEncompassingEncounter3EncounterParticipant" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P69OE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(encounterParticipant->one(encounterParticipant : cda::EncounterParticipant | not encounterParticipant.oclIsUndefined() and encounterParticipant.oclIsKindOf(cda::EncounterParticipant)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_55Qesl9xEey5t-mahoHmrg" name="DischargeSummaryComponentOfEncompassingEncounter" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_55Qes19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P69OFH3sEeyivuDeOiJBMg" name="DischargeSummaryComponentOfEncompassingEncounter" constrainedElement="_2UnxkRSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P69OFX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null)->reject(encompassingEncounter->one(encompassingEncounter : cda::EncompassingEncounter | not encompassingEncounter.oclIsUndefined() and encompassingEncounter.oclIsKindOf(cda::EncompassingEncounter)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_2U6FfBSVEeGGzu7fmW9pXw" general="_2DNRcBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_qwKYol9xEey5t-mahoHmrg" name="getHospitalAdmissionMedicationsSectionEntriesOptional" bodyCondition="_qwK_sF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qwK_sF9xEey5t-mahoHmrg" name="body" constrainedElement="_qwKYol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qwK_sV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_C654In3sEeyivuDeOiJBMg" name="getHospitalAdmissionMedicationsSectionEntriesOptional" bodyCondition="_C654JX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_C654JX3sEeyivuDeOiJBMg" name="body" constrainedElement="_C654In3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_C654Jn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalAdmissionMedicationsSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::HospitalAdmissionMedicationsSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qwKYo19xEey5t-mahoHmrg" type="_2Poj5BSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qwKYpF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_C654I33sEeyivuDeOiJBMg" type="_2Poj5BSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C654JH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_qwr9EF9xEey5t-mahoHmrg" name="getHospitalAdmissionDiagnosisSection" bodyCondition="_qwr9E19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qwr9E19xEey5t-mahoHmrg" name="body" constrainedElement="_qwr9EF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qwr9FF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_C7UH0X3sEeyivuDeOiJBMg" name="getHospitalAdmissionDiagnosisSection" bodyCondition="_C7UH1H3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_C7UH1H3sEeyivuDeOiJBMg" name="body" constrainedElement="_C7UH0X3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_C7UH1X3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalAdmissionDiagnosisSection))->asSequence()->any(true).oclAsType(consol::HospitalAdmissionDiagnosisSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qwr9EV9xEey5t-mahoHmrg" type="_2PidQhSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qwr9El9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_C7UH0n3sEeyivuDeOiJBMg" type="_2PidQhSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C7UH033sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_qxLsUl9xEey5t-mahoHmrg" name="getHospitalDischargeDiagnosisSection" bodyCondition="_qxMTYF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qxMTYF9xEey5t-mahoHmrg" name="body" constrainedElement="_qxLsUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qxMTYV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_C7twcn3sEeyivuDeOiJBMg" name="getHospitalDischargeDiagnosisSection" bodyCondition="_C7twdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_C7twdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_C7twcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_C7twdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalDischargeDiagnosisSection))->asSequence()->any(true).oclAsType(consol::HospitalDischargeDiagnosisSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qxLsU19xEey5t-mahoHmrg" type="_2PidURSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qxLsVF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_C7twc33sEeyivuDeOiJBMg" type="_2PidURSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C7twdH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_qxrbkl9xEey5t-mahoHmrg" name="getDischargeDietSection" bodyCondition="_qxsCoV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qxsCoV9xEey5t-mahoHmrg" name="body" constrainedElement="_qxrbkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qxsCol9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_C8NfsH3sEeyivuDeOiJBMg" name="getDischargeDietSection" bodyCondition="_C8Nfs33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_C8Nfs33sEeyivuDeOiJBMg" name="body" constrainedElement="_C8NfsH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_C8NftH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::DischargeDietSection))->asSequence()->any(true).oclAsType(consol::DischargeDietSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qxrbk19xEey5t-mahoHmrg" type="_2Uz-4xSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qxsCoF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_C8NfsX3sEeyivuDeOiJBMg" type="_2Uz-4xSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C8Nfsn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_qyJ8sl9xEey5t-mahoHmrg" name="getHospitalDischargeMedicationsSectionEntriesOptional" bodyCondition="_qyJ8tV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qyJ8tV9xEey5t-mahoHmrg" name="body" constrainedElement="_qyJ8sl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qyJ8tl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_C8tO8H3sEeyivuDeOiJBMg" name="getHospitalDischargeMedicationsSectionEntriesOptional" bodyCondition="_C8tO833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_C8tO833sEeyivuDeOiJBMg" name="body" constrainedElement="_C8tO8H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_C8tO9H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalDischargeMedicationsSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::HospitalDischargeMedicationsSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qyJ8s19xEey5t-mahoHmrg" type="_2Poj7RSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qyJ8tF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_C8tO8X3sEeyivuDeOiJBMg" type="_2Poj7RSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C8tO8n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_qyrhIl9xEey5t-mahoHmrg" name="getFunctionalStatusSection" bodyCondition="_qyrhJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qyrhJV9xEey5t-mahoHmrg" name="body" constrainedElement="_qyrhIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qyrhJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_C9U6AX3sEeyivuDeOiJBMg" name="getFunctionalStatusSection" bodyCondition="_C9U6BH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_C9U6BH3sEeyivuDeOiJBMg" name="body" constrainedElement="_C9U6AX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_C9U6BX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FunctionalStatusSection))->asSequence()->any(true).oclAsType(consol::FunctionalStatusSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qyrhI19xEey5t-mahoHmrg" type="_2KKOBhSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qyrhJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_C9U6An3sEeyivuDeOiJBMg" type="_2KKOBhSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C9U6A33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_qzJbMl9xEey5t-mahoHmrg" name="getHistoryOfPresentIllnessSection" bodyCondition="_qzJbNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qzJbNV9xEey5t-mahoHmrg" name="body" constrainedElement="_qzJbMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qzJbNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_C9yNAn3sEeyivuDeOiJBMg" name="getHistoryOfPresentIllnessSection" bodyCondition="_C9y0EH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_C9y0EH3sEeyivuDeOiJBMg" name="body" constrainedElement="_C9yNAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_C9y0EX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))->asSequence()->any(true).oclAsType(consol::HistoryOfPresentIllnessSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qzJbM19xEey5t-mahoHmrg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qzJbNF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_C9yNA33sEeyivuDeOiJBMg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C9yNBH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_qzpKcl9xEey5t-mahoHmrg" name="getHospitalCourseSection" bodyCondition="_qzpKdV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_qzpKdV9xEey5t-mahoHmrg" name="body" constrainedElement="_qzpKcl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_qzpKdl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_C-PgAH3sEeyivuDeOiJBMg" name="getHospitalCourseSection" bodyCondition="_C-PgA33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_C-PgA33sEeyivuDeOiJBMg" name="body" constrainedElement="_C-PgAH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_C-PgBH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalCourseSection))->asSequence()->any(true).oclAsType(consol::HospitalCourseSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_qzpKc19xEey5t-mahoHmrg" type="_2RqkOxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qzpKdF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_C-PgAX3sEeyivuDeOiJBMg" type="_2RqkOxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C-PgAn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_q0Gdcl9xEey5t-mahoHmrg" name="getPlanOfCareSection" bodyCondition="_q0GddV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_q0GddV9xEey5t-mahoHmrg" name="body" constrainedElement="_q0Gdcl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_q0Gddl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_C-q90n3sEeyivuDeOiJBMg" name="getPlanOfCareSection" bodyCondition="_C-q91X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_C-q91X3sEeyivuDeOiJBMg" name="body" constrainedElement="_C-q90n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_C-q91n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfCareSection))->asSequence()->any(true).oclAsType(consol::PlanOfCareSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_q0Gdc19xEey5t-mahoHmrg" type="_2NP-QxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_q0GddF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_C-q9033sEeyivuDeOiJBMg" type="_2NP-QxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C-q91H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_q0mMsl9xEey5t-mahoHmrg" name="getHistoryOfPastIllnessSection" bodyCondition="_q0mMtV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_q0mMtV9xEey5t-mahoHmrg" name="body" constrainedElement="_q0mMsl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_q0mMtl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_C_F0kH3sEeyivuDeOiJBMg" name="getHistoryOfPastIllnessSection" bodyCondition="_C_F0k33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_C_F0k33sEeyivuDeOiJBMg" name="body" constrainedElement="_C_F0kH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_C_F0lH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection))->asSequence()->any(true).oclAsType(consol::HistoryOfPastIllnessSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_q0mMs19xEey5t-mahoHmrg" type="_2PQJcxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_q0mMtF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_C_F0kX3sEeyivuDeOiJBMg" type="_2PQJcxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C_F0kn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sOG9Ul9xEey5t-mahoHmrg" name="getChiefComplaintAndReasonForVisitSection" bodyCondition="_sOG9VV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sOG9VV9xEey5t-mahoHmrg" name="body" constrainedElement="_sOG9Ul9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sOG9Vl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EMHBUH3sEeyivuDeOiJBMg" name="getChiefComplaintAndReasonForVisitSection" bodyCondition="_EMHBU33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EMHBU33sEeyivuDeOiJBMg" name="body" constrainedElement="_EMHBUH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EMHBVH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))->asSequence()->any(true).oclAsType(consol::ChiefComplaintAndReasonForVisitSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sOG9U19xEey5t-mahoHmrg" type="_oI7CQCsaEeGHF88-qhhUMA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sOG9VF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EMHBUX3sEeyivuDeOiJBMg" type="_oI7CQCsaEeGHF88-qhhUMA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EMHBUn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sOlecF9xEey5t-mahoHmrg" name="getChiefComplaintSection" bodyCondition="_sOlec19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sOlec19xEey5t-mahoHmrg" name="body" constrainedElement="_sOlecF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sOledF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EMkUUH3sEeyivuDeOiJBMg" name="getChiefComplaintSection" bodyCondition="_EMkUU33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EMkUU33sEeyivuDeOiJBMg" name="body" constrainedElement="_EMkUUH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EMkUVH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))->asSequence()->any(true).oclAsType(consol::ChiefComplaintSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sOlecV9xEey5t-mahoHmrg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sOlecl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EMkUUX3sEeyivuDeOiJBMg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EMkUUn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sPD_kl9xEey5t-mahoHmrg" name="getFamilyHistorySection" bodyCondition="_sPEmoF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sPEmoF9xEey5t-mahoHmrg" name="body" constrainedElement="_sPD_kl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sPEmoV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EM-kAH3sEeyivuDeOiJBMg" name="getFamilyHistorySection" bodyCondition="_EM-kA33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EM-kA33sEeyivuDeOiJBMg" name="body" constrainedElement="_EM-kAH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EM-kBH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection))->asSequence()->any(true).oclAsType(consol::FamilyHistorySection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sPD_k19xEey5t-mahoHmrg" type="_2IWQIxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sPD_lF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EM-kAX3sEeyivuDeOiJBMg" type="_2IWQIxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EM-kAn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sPjHwl9xEey5t-mahoHmrg" name="getHospitalConsultationsSection" bodyCondition="_sPjHxV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sPjHxV9xEey5t-mahoHmrg" name="body" constrainedElement="_sPjHwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sPjHxl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_ENYzsH3sEeyivuDeOiJBMg" name="getHospitalConsultationsSection" bodyCondition="_ENYzs33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ENYzs33sEeyivuDeOiJBMg" name="body" constrainedElement="_ENYzsH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ENYztH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalConsultationsSection))->asSequence()->any(true).oclAsType(consol::HospitalConsultationsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sPjHw19xEey5t-mahoHmrg" type="_eKFbUDVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sPjHxF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_ENYzsX3sEeyivuDeOiJBMg" type="_eKFbUDVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ENYzsn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sQC3AF9xEey5t-mahoHmrg" name="getHospitalDischargeInstructionsSection" bodyCondition="_sQC3A19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sQC3A19xEey5t-mahoHmrg" name="body" constrainedElement="_sQC3AF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sQC3BF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EN2Gsn3sEeyivuDeOiJBMg" name="getHospitalDischargeInstructionsSection" bodyCondition="_EN2twX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EN2twX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EN2Gsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EN2twn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalDischargeInstructionsSection))->asSequence()->any(true).oclAsType(consol::HospitalDischargeInstructionsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sQC3AV9xEey5t-mahoHmrg" type="_lBergCUMEeGiOPpZVnfEJA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sQC3Al9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EN2Gs33sEeyivuDeOiJBMg" type="_lBergCUMEeGiOPpZVnfEJA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EN2twH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sQfi8l9xEey5t-mahoHmrg" name="getHospitalDischargePhysicalSection" bodyCondition="_sQfi9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sQfi9V9xEey5t-mahoHmrg" name="body" constrainedElement="_sQfi8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sQfi9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EORkgn3sEeyivuDeOiJBMg" name="getHospitalDischargePhysicalSection" bodyCondition="_EORkhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EORkhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EORkgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EORkhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalDischargePhysicalSection))->asSequence()->any(true).oclAsType(consol::HospitalDischargePhysicalSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sQfi819xEey5t-mahoHmrg" type="_WikGsCUTEeGiOPpZVnfEJA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sQfi9F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EORkg33sEeyivuDeOiJBMg" type="_WikGsCUTEeGiOPpZVnfEJA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EORkhH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sQ-rIl9xEey5t-mahoHmrg" name="getHospitalDischargeStudiesSummarySection" bodyCondition="_sQ_SMV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sQ_SMV9xEey5t-mahoHmrg" name="body" constrainedElement="_sQ-rIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sQ_SMl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EOsbQn3sEeyivuDeOiJBMg" name="getHospitalDischargeStudiesSummarySection" bodyCondition="_EOsbRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EOsbRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EOsbQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EOsbRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalDischargeStudiesSummarySection))->asSequence()->any(true).oclAsType(consol::HospitalDischargeStudiesSummarySection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sQ-rI19xEey5t-mahoHmrg" type="_38AXoCUTEeGiOPpZVnfEJA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sQ_SMF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EOsbQ33sEeyivuDeOiJBMg" type="_38AXoCUTEeGiOPpZVnfEJA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EOsbRH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sRfBcl9xEey5t-mahoHmrg" name="getImmunizationsSectionEntriesOptional" bodyCondition="_sRfBdV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sRfBdV9xEey5t-mahoHmrg" name="body" constrainedElement="_sRfBcl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sRfBdl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EPFc0n3sEeyivuDeOiJBMg" name="getImmunizationsSectionEntriesOptional" bodyCondition="_EPFc1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EPFc1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_EPFc0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EPFc1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::ImmunizationsSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sRfBc19xEey5t-mahoHmrg" type="_EuPloBVeEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sRfBdF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EPFc033sEeyivuDeOiJBMg" type="_EuPloBVeEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EPFc1H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sR_-0F9xEey5t-mahoHmrg" name="getProblemSectionEntriesOptional" bodyCondition="_sR_-019xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sR_-019xEey5t-mahoHmrg" name="body" constrainedElement="_sR_-0F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sR_-1F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EPfsgH3sEeyivuDeOiJBMg" name="getProblemSectionEntriesOptional" bodyCondition="_EPfsg33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EPfsg33sEeyivuDeOiJBMg" name="body" constrainedElement="_EPfsgH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EPfshH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::ProblemSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sR_-0V9xEey5t-mahoHmrg" type="_naxrkBVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sR_-0l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EPfsgX3sEeyivuDeOiJBMg" type="_naxrkBVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EPfsgn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sSfHAl9xEey5t-mahoHmrg" name="getProceduresSectionEntriesOptional" bodyCondition="_sSfHBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sSfHBV9xEey5t-mahoHmrg" name="body" constrainedElement="_sSfHAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sSfHBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EP5VIH3sEeyivuDeOiJBMg" name="getProceduresSectionEntriesOptional" bodyCondition="_EP5VI33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EP5VI33sEeyivuDeOiJBMg" name="body" constrainedElement="_EP5VIH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EP5VJH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::ProceduresSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sSfHA19xEey5t-mahoHmrg" type="_s9Ig4BVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sSfHBF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EP5VIX3sEeyivuDeOiJBMg" type="_s9Ig4BVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EP5VIn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sTAEYF9xEey5t-mahoHmrg" name="getReasonForVisitSection" bodyCondition="_sTAEY19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sTAEY19xEey5t-mahoHmrg" name="body" constrainedElement="_sTAEYF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sTAEZF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EQS9wn3sEeyivuDeOiJBMg" name="getReasonForVisitSection" bodyCondition="_EQS9xX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EQS9xX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EQS9wn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EQS9xn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))->asSequence()->any(true).oclAsType(consol::ReasonForVisitSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sTAEYV9xEey5t-mahoHmrg" type="_Nm64UCscEeGHF88-qhhUMA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sTAEYl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EQS9w33sEeyivuDeOiJBMg" type="_Nm64UCscEeGHF88-qhhUMA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EQS9xH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sTgasF9xEey5t-mahoHmrg" name="getReviewOfSystemsSection" bodyCondition="_sTgas19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sTgas19xEey5t-mahoHmrg" name="body" constrainedElement="_sTgasF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sTgatF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EQsmYn3sEeyivuDeOiJBMg" name="getReviewOfSystemsSection" bodyCondition="_EQtNcH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EQtNcH3sEeyivuDeOiJBMg" name="body" constrainedElement="_EQsmYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EQtNcX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))->asSequence()->any(true).oclAsType(consol::ReviewOfSystemsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sTgasV9xEey5t-mahoHmrg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sTgasl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EQsmY33sEeyivuDeOiJBMg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EQsmZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sUAxAV9xEey5t-mahoHmrg" name="getSocialHistorySection" bodyCondition="_sUAxBF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sUAxBF9xEey5t-mahoHmrg" name="body" constrainedElement="_sUAxAV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sUAxBV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_ERHdIn3sEeyivuDeOiJBMg" name="getSocialHistorySection" bodyCondition="_ERHdJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ERHdJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_ERHdIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ERHdJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection))->asSequence()->any(true).oclAsType(consol::SocialHistorySection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sUAxAl9xEey5t-mahoHmrg" type="_2JKvgBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sUAxA19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_ERHdI33sEeyivuDeOiJBMg" type="_2JKvgBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ERHdJH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_u_aAQF9xEey5t-mahoHmrg" name="getAllergiesSectionEntriesOptional" bodyCondition="_u_aAQ19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_u_aAQ19xEey5t-mahoHmrg" name="body" constrainedElement="_u_aAQF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_u_aARF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Gd1zYn3sEeyivuDeOiJBMg" name="getAllergiesSectionEntriesOptional" bodyCondition="_Gd1zZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Gd1zZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Gd1zYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gd1zZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::AllergiesSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_u_aAQV9xEey5t-mahoHmrg" type="_bGzYgBVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_u_aAQl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Gd1zY33sEeyivuDeOiJBMg" type="_bGzYgBVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Gd1zZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_u_5vgV9xEey5t-mahoHmrg" name="getVitalSignsSectionEntriesOptional" bodyCondition="_u_5vhF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_u_5vhF9xEey5t-mahoHmrg" name="body" constrainedElement="_u_5vgV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_u_5vhV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GeRRMn3sEeyivuDeOiJBMg" name="getVitalSignsSectionEntriesOptional" bodyCondition="_GeRRNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GeRRNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GeRRMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GeRRNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::VitalSignsSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_u_5vgl9xEey5t-mahoHmrg" type="_bRH8sBVeEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_u_5vg19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_GeRRM33sEeyivuDeOiJBMg" type="_bRH8sBVeEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GeRRNH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -8558,68 +8558,68 @@ value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '18842-5' or value.
           <body>self.value.nullFlavor->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q0mzwF9xEey5t-mahoHmrg" name="IndicationTemplateId" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q0mzwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C_F0lX3sEeyivuDeOiJBMg" name="IndicationTemplateId" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C_F0ln3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.19')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q0oB4F9xEey5t-mahoHmrg" name="IndicationClassCode" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q0oB4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C_IQ0H3sEeyivuDeOiJBMg" name="IndicationClassCode" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C_IQ0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q0p3EF9xEey5t-mahoHmrg" name="IndicationMoodCode" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q0p3EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C_Je8H3sEeyivuDeOiJBMg" name="IndicationMoodCode" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C_Je8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q0rFMF9xEey5t-mahoHmrg" name="IndicationId" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q0rFMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C_LUIH3sEeyivuDeOiJBMg" name="IndicationId" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C_LUIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (self.id->size() =  1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q1JmUF9xEey5t-mahoHmrg" name="IndicationCodeP" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q1JmUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C_mK4H3sEeyivuDeOiJBMg" name="IndicationCodeP" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C_mK4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q0sTUF9xEey5t-mahoHmrg" name="IndicationCode" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q0sTUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_C_L7MH3sEeyivuDeOiJBMg" name="IndicationCode" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_C_L7MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '404684003' or value.code = '409586006' or value.code = '282291009' or value.code = '64572001' or value.code = '248536006' or value.code = '418799008' or value.code = '55607006' or value.code = '373930000'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q1p8oF9xEey5t-mahoHmrg" name="IndicationStatusCode" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q1p8oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DABosH3sEeyivuDeOiJBMg" name="IndicationStatusCode" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DABosX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q1rKwF9xEey5t-mahoHmrg" name="IndicationEffectiveTime" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q1rKwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DADd4H3sEeyivuDeOiJBMg" name="IndicationEffectiveTime" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DADd4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q1sY4F9xEey5t-mahoHmrg" name="IndicationValue" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q1sY4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DAEE8H3sEeyivuDeOiJBMg" name="IndicationValue" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DAEE8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q2KS8F9xEey5t-mahoHmrg" name="IndicationValueP" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q2KS8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DAkbQH3sEeyivuDeOiJBMg" name="IndicationValueP" constrainedElement="_sHrUoBUSEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DAkbQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (( not self.value->isEmpty())  and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
@@ -8644,28 +8644,28 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
           <body>not self.playingEntity.oclIsUndefined() implies self.playingEntity.name->size() =1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q3GHF19xEey5t-mahoHmrg" name="DrugVehicleTemplateId" constrainedElement="_VBXq8BUTEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q3GHGF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DBbW4H3sEeyivuDeOiJBMg" name="DrugVehicleTemplateId" constrainedElement="_VBXq8BUTEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DBbW4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.24')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q3H8QF9xEey5t-mahoHmrg" name="DrugVehicleClassCode" constrainedElement="_VBXq8BUTEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q3H8QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DBclAH3sEeyivuDeOiJBMg" name="DrugVehicleClassCode" constrainedElement="_VBXq8BUTEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DBclAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('classCode') and self.classCode=vocab::RoleClassRoot::MANU</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q3IjUF9xEey5t-mahoHmrg" name="DrugVehicleCode" constrainedElement="_VBXq8BUTEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q3JKYF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DBdMEH3sEeyivuDeOiJBMg" name="DrugVehicleCode" constrainedElement="_VBXq8BUTEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DBdMEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '412307009' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rRxQ4F9xEey5t-mahoHmrg" name="DrugVehiclePlayingEntity" constrainedElement="_VBXq8BUTEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rRxQ4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DZGQAH3sEeyivuDeOiJBMg" name="DrugVehiclePlayingEntity" constrainedElement="_VBXq8BUTEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DZG3EH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.playingEntity->one(playingEntity : cda::PlayingEntity | not playingEntity.oclIsUndefined() and playingEntity.oclIsKindOf(rim::Entity))</body>
         </specification>
@@ -8681,138 +8681,138 @@ value.code = '412307009' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
           <body>self.product.manufacturedProduct.oclIsTypeOf(consol::MedicationInformation) xor self.product.manufacturedProduct.oclIsTypeOf(consol::ImmunizationMedicationInformation)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q3KYgF9xEey5t-mahoHmrg" name="MedicationDispenseTemplateId" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q3KYgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DBeaMH3sEeyivuDeOiJBMg" name="MedicationDispenseTemplateId" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DBeaMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.18')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q3LmoF9xEey5t-mahoHmrg" name="MedicationDispenseClassCode" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q3LmoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DBfoUH3sEeyivuDeOiJBMg" name="MedicationDispenseClassCode" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DBfoUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassSupply::SPLY</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q3Nb0F9xEey5t-mahoHmrg" name="MedicationDispenseEffectiveTime" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q3Nb0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DBg2cH3sEeyivuDeOiJBMg" name="MedicationDispenseEffectiveTime" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DBg2cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime->isEmpty() or self.effectiveTime->exists(element | element.isNullFlavorUndefined())) implies (( not self.effectiveTime->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q3P4EF9xEey5t-mahoHmrg" name="MedicationDispenseId" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q3P4EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DBiEkH3sEeyivuDeOiJBMg" name="MedicationDispenseId" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DBiEkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q3RtQF9xEey5t-mahoHmrg" name="MedicationDispenseMoodCode" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q3RtQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DBjSsH3sEeyivuDeOiJBMg" name="MedicationDispenseMoodCode" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DBjSsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentSubstanceMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q3TicF9xEey5t-mahoHmrg" name="MedicationDispenseRepeatNumber" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q3TicV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DBj5wH3sEeyivuDeOiJBMg" name="MedicationDispenseRepeatNumber" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DBj5wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.repeatNumber.oclIsUndefined() or self.repeatNumber.isNullFlavorUndefined()) implies (not self.repeatNumber.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q3UJgF9xEey5t-mahoHmrg" name="MedicationDispenseStatusCode" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q3UJgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DBlH4H3sEeyivuDeOiJBMg" name="MedicationDispenseStatusCode" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DBlH4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'aborted' or value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q3yqoF9xEey5t-mahoHmrg" name="MedicationDispenseQuantity" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q3yqoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DB_-oH3sEeyivuDeOiJBMg" name="MedicationDispenseQuantity" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DB_-oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.quantity.oclIsUndefined() or self.quantity.isNullFlavorUndefined()) implies (not self.quantity.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rTwN4F9xEey5t-mahoHmrg" name="MedicationDispenseMedicationSupplyOrder" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rTwN4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Daf-MH3sEeyivuDeOiJBMg" name="MedicationDispenseMedicationSupplyOrder" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Daf-MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::MedicationSupplyOrder) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uD1I0F9xEey5t-mahoHmrg" name="MedicationDispensePerformer" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uD1I0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FsSaoH3sEeyivuDeOiJBMg" name="MedicationDispensePerformer" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FsSaoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->one(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_56cKcF9xEey5t-mahoHmrg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_56cKcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P8A-AH3sEeyivuDeOiJBMg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P8A-AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ( streetAddressLine->size() >=1 and streetAddressLine->size() &lt;=4))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_56cKcl9xEey5t-mahoHmrg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_56cxgF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P8A-An3sEeyivuDeOiJBMg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P8A-A33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies state->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_56cxgV9xEey5t-mahoHmrg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_56cxgl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P8BlEH3sEeyivuDeOiJBMg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P8BlEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies postalCode->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_56dYkF9xEey5t-mahoHmrg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_56dYkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P8CMIH3sEeyivuDeOiJBMg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P8CMIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::PostalAddressUse) and 
 let value : vocab::PostalAddressUse = element.oclAsType(vocab::PostalAddressUse) in 
 value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or value = vocab::PostalAddressUse::H or value = vocab::PostalAddressUse::HP or value = vocab::PostalAddressUse::HV or value = vocab::PostalAddressUse::PHYS or value = vocab::PostalAddressUse::PST or value = vocab::PostalAddressUse::PUB or value = vocab::PostalAddressUse::TMP or value = vocab::PostalAddressUse::WP) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_56dYkl9xEey5t-mahoHmrg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_56dYk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P8CMIn3sEeyivuDeOiJBMg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P8CMI33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_56d_oF9xEey5t-mahoHmrg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_56d_oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P8CzMH3sEeyivuDeOiJBMg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P8CzMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((country->isEmpty() or country->exists(element | element.isNullFlavorUndefined())) implies (( not country->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_56d_ol9xEey5t-mahoHmrg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_56d_o19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P8DaQH3sEeyivuDeOiJBMg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P8DaQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((state->isEmpty() or state->exists(element | element.isNullFlavorUndefined())) implies (( not state->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_56emsF9xEey5t-mahoHmrg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_56emsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P8EBUH3sEeyivuDeOiJBMg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P8EBUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((city->isEmpty() or city->exists(element | element.isNullFlavorUndefined())) implies (city->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_56emsl9xEey5t-mahoHmrg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_56ems19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P8EoYH3sEeyivuDeOiJBMg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P8EoYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((postalCode->isEmpty() or postalCode->exists(element | element.isNullFlavorUndefined())) implies (( not postalCode->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_56fNwF9xEey5t-mahoHmrg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_56fNwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P8FPcH3sEeyivuDeOiJBMg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P8FPcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((streetAddressLine->isEmpty() or streetAddressLine->exists(element | element.isNullFlavorUndefined())) implies (( not streetAddressLine->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_56fNwl9xEey5t-mahoHmrg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityAddr" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_56fNw19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P8FPcn3sEeyivuDeOiJBMg" name="MedicationDispensePerformerMedicationDispenseAssignedEntityAddr" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P8FPc33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (( not addr->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_56f00F9xEey5t-mahoHmrg" name="MedicationDispensePerformerMedicationDispenseAssignedEntity" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_56f00V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P8F2gH3sEeyivuDeOiJBMg" name="MedicationDispensePerformerMedicationDispenseAssignedEntity" constrainedElement="_DpoGkBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P8F2gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
@@ -8820,39 +8820,39 @@ value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or
       <generalization xmi:id="_DpoGkRUUEeG6PvUxSTZnaw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_3gL0sEbuEd6besF9iFIJkQ"/>
       </generalization>
-      <ownedOperation xmi:id="_rTwN4l9xEey5t-mahoHmrg" name="getMedicationSupplyOrder" bodyCondition="_rTwN5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rTwN5V9xEey5t-mahoHmrg" name="body" constrainedElement="_rTwN4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rTwN5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Daf-Mn3sEeyivuDeOiJBMg" name="getMedicationSupplyOrder" bodyCondition="_Daf-NX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Daf-NX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Daf-Mn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Daf-Nn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::MedicationSupplyOrder))->asSequence()->any(true).oclAsType(consol::MedicationSupplyOrder)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rTwN419xEey5t-mahoHmrg" type="_j3aTQBrTEeGo461UQq-B1g" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rTwN5F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Daf-M33sEeyivuDeOiJBMg" type="_j3aTQBrTEeGo461UQq-B1g" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Daf-NH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_chEhQBUUEeG6PvUxSTZnaw" name="PreconditionForSubstanceAdministration">
-      <ownedRule xmi:id="_q4VdNV9xEey5t-mahoHmrg" name="PreconditionForSubstanceAdministrationTemplateId" constrainedElement="_chEhQBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q4VdNl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DCdRoH3sEeyivuDeOiJBMg" name="PreconditionForSubstanceAdministrationTemplateId" constrainedElement="_chEhQBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DCdRoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.25')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q4WrUF9xEey5t-mahoHmrg" name="PreconditionForSubstanceAdministrationCode" constrainedElement="_chEhQBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q4WrUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DCefwH3sEeyivuDeOiJBMg" name="PreconditionForSubstanceAdministrationCode" constrainedElement="_chEhQBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DCefwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q4X5cF9xEey5t-mahoHmrg" name="PreconditionForSubstanceAdministrationText" constrainedElement="_chEhQBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q4X5cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DCfG0H3sEeyivuDeOiJBMg" name="PreconditionForSubstanceAdministrationText" constrainedElement="_chEhQBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DCfG0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q4ZHkF9xEey5t-mahoHmrg" name="PreconditionForSubstanceAdministrationValue" constrainedElement="_chEhQBUUEeG6PvUxSTZnaw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q4ZHkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DCgU8H3sEeyivuDeOiJBMg" name="PreconditionForSubstanceAdministrationValue" constrainedElement="_chEhQBUUEeG6PvUxSTZnaw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DCgU8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value.oclIsUndefined() or self.value.isNullFlavorUndefined()) implies (self.value.oclIsTypeOf(datatypes::CD))</body>
         </specification>
@@ -8865,572 +8865,572 @@ value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or
       <ownedComment xmi:id="_p8E5gFzAEeGt2doqSDULjA">
         <body>A policy activity represents the policy or program providing the coverage.</body>
       </ownedComment>
-      <ownedRule xmi:id="_q43osV9xEey5t-mahoHmrg" name="PolicyActivityTemplateId" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q43osl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DC9n933sEeyivuDeOiJBMg" name="PolicyActivityTemplateId" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DC9n-H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.61')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q4420F9xEey5t-mahoHmrg" name="PolicyActivityClassCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q4420V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DC_dIH3sEeyivuDeOiJBMg" name="PolicyActivityClassCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DC_dIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q46E8F9xEey5t-mahoHmrg" name="PolicyActivityMoodCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q46E8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DDArQH3sEeyivuDeOiJBMg" name="PolicyActivityMoodCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DDArQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q47TEF9xEey5t-mahoHmrg" name="PolicyActivityId" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q47TEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DDB5YH3sEeyivuDeOiJBMg" name="PolicyActivityId" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DDB5YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q5essF9xEey5t-mahoHmrg" name="PolicyActivityCodeP" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q5essV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DDfMYH3sEeyivuDeOiJBMg" name="PolicyActivityCodeP" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DDfMYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q48hMF9xEey5t-mahoHmrg" name="PolicyActivityCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q48hMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DDDHgH3sEeyivuDeOiJBMg" name="PolicyActivityCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DDDHgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '12' or value.code = '13' or value.code = '14' or value.code = '15' or value.code = '16' or value.code = '41' or value.code = '42' or value.code = '43' or value.code = '47' or value.code = 'AP' or value.code = 'C1' or value.code = 'CO' or value.code = 'CP' or value.code = 'D' or value.code = 'DB' or value.code = 'EP' or value.code = 'FF' or value.code = 'GP' or value.code = 'HM' or value.code = 'HN' or value.code = 'HS' or value.code = 'IN' or value.code = 'IP' or value.code = 'LC' or value.code = 'LD' or value.code = 'LI' or value.code = 'LT' or value.code = 'MA' or value.code = 'MB' or value.code = 'MC' or value.code = 'MH' or value.code = 'MI' or value.code = 'MP' or value.code = 'OT' or value.code = 'PE' or value.code = 'PL' or value.code = 'PP' or value.code = 'PR' or value.code = 'PS' or value.code = 'QM' or value.code = 'RP' or value.code = 'SP' or value.code = 'TF' or value.code = 'WC' or value.code = 'WU')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q57_sF9xEey5t-mahoHmrg" name="PolicyActivityStatusCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q58mwF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DD5cEH3sEeyivuDeOiJBMg" name="PolicyActivityStatusCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DD5cEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_t3umgF9xEey5t-mahoHmrg" name="PolicyActivityPayer" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_t3umgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FiiBsH3sEeyivuDeOiJBMg" name="PolicyActivityPayer" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FiiBsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->select(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer2))->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87'))->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_t4vTIF9xEey5t-mahoHmrg" name="PolicyActivityGuarantor" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_t4vTIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FjcAoH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantor" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FjcAoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->select(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer2))->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88'))->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_t81I8F9xEey5t-mahoHmrg" name="PolicyActivityCoverage" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_t81I8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FmYm8H3sEeyivuDeOiJBMg" name="PolicyActivityCoverage" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FmYm8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->select(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))->select(typeCode=vocab::ParticipationType::COV)->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_t-U9wF9xEey5t-mahoHmrg" name="PolicyActivityHolder" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_t-U9wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FnrAYH3sEeyivuDeOiJBMg" name="PolicyActivityHolder" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FnrAYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->select(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))->select(typeCode=vocab::ParticipationType::HLD)->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uPC6UF9xEey5t-mahoHmrg" name="PolicyActivityEntryRelationship" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uPC6UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F1HmgH3sEeyivuDeOiJBMg" name="PolicyActivityEntryRelationship" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F1HmgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->select(entryRelationship : cda::EntryRelationship | not entryRelationship.oclIsUndefined() and entryRelationship.oclIsKindOf(cda::EntryRelationship))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::REFR)->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_57ghcF9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_57ghcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P_H8YH3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P_H8YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ( streetAddressLine->size() >=1 and streetAddressLine->size() &lt;=4))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_57ghcl9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_57hIgF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P_IjcH3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P_IjcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies state->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_57hIgV9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_57hIgl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P_JxkH3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P_JxkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies postalCode->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_57hvkF9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_57hvkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P_KYoH3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P_KYoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::PostalAddressUse) and 
 let value : vocab::PostalAddressUse = element.oclAsType(vocab::PostalAddressUse) in 
 value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or value = vocab::PostalAddressUse::H or value = vocab::PostalAddressUse::HP or value = vocab::PostalAddressUse::HV or value = vocab::PostalAddressUse::PHYS or value = vocab::PostalAddressUse::PST or value = vocab::PostalAddressUse::PUB or value = vocab::PostalAddressUse::TMP or value = vocab::PostalAddressUse::WP) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_57hvkl9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_57hvk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P_K_sH3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P_K_sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_57iWoF9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_57iWoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P_MN0H3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P_MN0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((country->isEmpty() or country->exists(element | element.isNullFlavorUndefined())) implies (( not country->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_57iWol9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_57iWo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P_M04H3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P_M04X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((state->isEmpty() or state->exists(element | element.isNullFlavorUndefined())) implies (( not state->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_57i9sF9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_57i9sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P_ODAH3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P_ODAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((city->isEmpty() or city->exists(element | element.isNullFlavorUndefined())) implies (city->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_57i9sl9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_57i9s19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P_RtYH3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P_RtYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((postalCode->isEmpty() or postalCode->exists(element | element.isNullFlavorUndefined())) implies (( not postalCode->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_57jkwF9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_57jkwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_P_aQQH3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_P_aQQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((streetAddressLine->isEmpty() or streetAddressLine->exists(element | element.isNullFlavorUndefined())) implies (( not streetAddressLine->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_58Be0F9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityPayerOrganizationName" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_58Be0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QAIB8H3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityPayerOrganizationName" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QAIpAH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).representedOrganization->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_58Be0l9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityId" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_58Be019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QAIpAX3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityId" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QAIpAn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_58CF4F9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityCodeP" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_58CF4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QAJQEH3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityCodeP" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QAJQEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_58Cs8F9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_58Cs8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QAJQEn3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QAJ3IH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.110' and (value.code = 'AFFL' or value.code = 'AGNT' or value.code = 'CIT' or value.code = 'CRINV' or value.code = 'CRSPNSR' or value.code = 'SPNSR' or value.code = 'COVPTY' or value.code = 'EMP' or value.code = 'GUAR' or value.code = 'INVSBJ' or value.code = 'PAYOR' or value.code = 'LIC' or value.code = 'PAT' or value.code = 'PAYEE' or value.code = 'POLHOLD' or value.code = 'QUAL' or value.code = 'STD' or value.code = 'UNDWRT')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_58Cs8l9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityAddr" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_58DUAF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QAJ3IX3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityAddr" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QAJ3In3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (( not addr->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_58DUAV9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityTelecom" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_58DUAl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QAKeMH3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityTelecom" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QAKeMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_58D7EF9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityPayerOrganization" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_58D7EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QAKeMn3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityPayerOrganization" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QAKeM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null)->reject(representedOrganization->one(representedOrganization : cda::Organization | not representedOrganization.oclIsUndefined() and representedOrganization.oclIsKindOf(cda::Organization)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_58D7El9xEey5t-mahoHmrg" name="PolicyActivityPayerTemplateId" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_58EiIF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QALFQH3sEeyivuDeOiJBMg" name="PolicyActivityPayerTemplateId" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QALFQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87'))->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87'))->reject(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_58EiIV9xEey5t-mahoHmrg" name="PolicyActivityPayerTypeCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_58EiIl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QALsUH3sEeyivuDeOiJBMg" name="PolicyActivityPayerTypeCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QALsUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87'))->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87'))->reject(isDefined('typeCode') and typeCode=vocab::ParticipationPhysicalPerformer::PRF)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_58FJMF9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntity" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_58FJMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QAMTYH3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntity" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QAMTYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87'))->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87'))->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59FOwF9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59FOwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBkMYH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBkMYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ( streetAddressLine->size() >=1 and streetAddressLine->size() &lt;=4))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59F10F9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59F10V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBkzcH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBkzcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies state->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59F10l9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59F1019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBlagH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBmBkH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies postalCode->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59Gc4F9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59Gc4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBmooH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBmooX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::PostalAddressUse) and 
 let value : vocab::PostalAddressUse = element.oclAsType(vocab::PostalAddressUse) in 
 value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or value = vocab::PostalAddressUse::H or value = vocab::PostalAddressUse::HP or value = vocab::PostalAddressUse::HV or value = vocab::PostalAddressUse::PHYS or value = vocab::PostalAddressUse::PST or value = vocab::PostalAddressUse::PUB or value = vocab::PostalAddressUse::TMP or value = vocab::PostalAddressUse::WP) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59Gc4l9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59Gc419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBnPsH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBnPsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59HD8F9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59HD8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBod0H3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBod0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((country->isEmpty() or country->exists(element | element.isNullFlavorUndefined())) implies (( not country->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59HrAF9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59HrAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBpE4H3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBpE4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((state->isEmpty() or state->exists(element | element.isNullFlavorUndefined())) implies (( not state->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59HrAl9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59HrA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBpr8H3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBqTAH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((city->isEmpty() or city->exists(element | element.isNullFlavorUndefined())) implies (city->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59ISEF9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59ISEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBq6EH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBq6EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((postalCode->isEmpty() or postalCode->exists(element | element.isNullFlavorUndefined())) implies (( not postalCode->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59ISEl9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59ISE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBrhIH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBrhIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((streetAddressLine->isEmpty() or streetAddressLine->exists(element | element.isNullFlavorUndefined())) implies (( not streetAddressLine->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59I5IF9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityPersonNameAndOrOrgName" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59I5IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBsIMH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityPersonNameAndOrOrgName" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBsIMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null)->reject((performer.assignedEntity.assignedPerson->exists(not oclIsUndefined()) and performer.assignedEntity.assignedPerson.name->size() >0) or (performer.assignedEntity.representedOrganization->exists(not oclIsUndefined()) and performer.assignedEntity.representedOrganization.name->size() >0 ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59I5Il9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59I5I19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBsvQH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBsvQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.code = 'GUAR' and value.codeSystem = '2.16.840.1.113883.5.110'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59JgMF9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityCodeP" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59JgMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBsvQn3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityCodeP" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBsvQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59JgMl9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityAddr" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59JgM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBtWUH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityAddr" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBtWUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (( not addr->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59JgNF9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityTelecom" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59JgNV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBt9YH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityTelecom" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBt9YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59KHQF9xEey5t-mahoHmrg" name="PolicyActivityGuarantorTemplateId" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59KHQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBukcH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorTemplateId" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBukcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88'))->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88'))->reject(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59KHQl9xEey5t-mahoHmrg" name="PolicyActivityGuarantorTime" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59KHQ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBvLgH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorTime" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBvLgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88'))->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88'))->reject((time.oclIsUndefined() or time.isNullFlavorUndefined()) implies (not time.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59KuUF9xEey5t-mahoHmrg" name="PolicyActivityGuarantorTypeCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59KuUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBvykH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorTypeCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBvykX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88'))->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88'))->reject(typeCode=vocab::ParticipationPhysicalPerformer::PRF)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_59KuUl9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntity" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_59KuU19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QBvykn3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntity" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QBvyk33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88'))->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88'))->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-JlwF9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-JlwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QDT40H3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QDT40X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ( streetAddressLine->size() >=1 and streetAddressLine->size() &lt;=4))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-KM0F9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-KM0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QDUf4H3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QDUf4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies state->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-KM0l9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-KM019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QDVG8H3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QDVG8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies postalCode->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-Kz4F9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-Kz4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QDWVEH3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QDWVEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::PostalAddressUse) and 
 let value : vocab::PostalAddressUse = element.oclAsType(vocab::PostalAddressUse) in 
 value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or value = vocab::PostalAddressUse::H or value = vocab::PostalAddressUse::HP or value = vocab::PostalAddressUse::HV or value = vocab::PostalAddressUse::PHYS or value = vocab::PostalAddressUse::PST or value = vocab::PostalAddressUse::PUB or value = vocab::PostalAddressUse::TMP or value = vocab::PostalAddressUse::WP) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-La8F9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-La8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QDW8IH3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QDW8IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-La8l9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-La819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QDXjMH3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QDXjMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((country->isEmpty() or country->exists(element | element.isNullFlavorUndefined())) implies (( not country->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-MCAF9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-MCAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QDYKQH3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QDYKQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((state->isEmpty() or state->exists(element | element.isNullFlavorUndefined())) implies (( not state->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-MCAl9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-MpEF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QDYxUH3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QDYxUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((city->isEmpty() or city->exists(element | element.isNullFlavorUndefined())) implies (city->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-MpEV9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-MpEl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QDZYYH3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QDZYYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((postalCode->isEmpty() or postalCode->exists(element | element.isNullFlavorUndefined())) implies (( not postalCode->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-NQIF9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-NQIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QDZ_cH3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QDZ_cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((streetAddressLine->isEmpty() or streetAddressLine->exists(element | element.isNullFlavorUndefined())) implies (( not streetAddressLine->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-tmcF9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleCoveragePlayingEntityName" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-tmcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QD_OQH3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleCoveragePlayingEntityName" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QD_OQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null).playingEntity->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (name->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-tmcl9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleId" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-tmc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QD_OQn3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleId" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QD_OQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-uNgF9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-uNgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QD_1UH3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QD_1UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.111' and (value.code = 'FAMDEP' or value.code = 'FSTUD' or value.code = 'HANDIC' or value.code = 'INJ' or value.code = 'PSTUD' or value.code = 'SELF' or value.code = 'SPON' or value.code = 'STUD')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-uNgl9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleCodeP" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-uNg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QD_1Un3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleCodeP" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QD_1U33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-u0kF9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleAddr" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-u0kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QD_1VH3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleAddr" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QD_1VX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (( not addr->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-u0kl9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleCoveragePlayingEntity" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-u0k19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QEAcYH3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleCoveragePlayingEntity" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QEAcYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null)->reject(playingEntity->one(playingEntity : cda::PlayingEntity | not playingEntity.oclIsUndefined() and playingEntity.oclIsKindOf(cda::PlayingEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-vboF9xEey5t-mahoHmrg" name="PolicyActivityCoverageLowTime" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-vboV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QEAcYn3sEeyivuDeOiJBMg" name="PolicyActivityCoverageLowTime" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QEAcY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV)->select(typeCode=vocab::ParticipationType::COV)->reject(not time.oclIsUndefined() implies not time.low.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-vbol9xEey5t-mahoHmrg" name="PolicyActivityCoverageHighTime" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-vbo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QEBDcH3sEeyivuDeOiJBMg" name="PolicyActivityCoverageHighTime" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QEBDcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV)->select(typeCode=vocab::ParticipationType::COV)->reject(not time.oclIsUndefined() implies not time.high.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-wCsF9xEey5t-mahoHmrg" name="PolicyActivityCoverageTemplateId" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-wCsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QEBDcn3sEeyivuDeOiJBMg" name="PolicyActivityCoverageTemplateId" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QEBDc33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV)->select(typeCode=vocab::ParticipationType::COV)->reject(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.89'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-wCsl9xEey5t-mahoHmrg" name="PolicyActivityCoverageTypeCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-wCs19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QEBqgH3sEeyivuDeOiJBMg" name="PolicyActivityCoverageTypeCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QEBqgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV)->select(typeCode=vocab::ParticipationType::COV)->reject(typeCode=vocab::ParticipationType::COV)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-wpwF9xEey5t-mahoHmrg" name="PolicyActivityCoverageTime" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-wpwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QEBqgn3sEeyivuDeOiJBMg" name="PolicyActivityCoverageTime" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QEBqg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV)->select(typeCode=vocab::ParticipationType::COV)->reject((time.oclIsUndefined() or time.isNullFlavorUndefined()) implies (not time.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5-wpwl9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRole" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5-wpw19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QECRkH3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRole" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QECRkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV)->select(typeCode=vocab::ParticipationType::COV)->reject(participantRole->one(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(cda::ParticipantRole)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5_ykgF9xEey5t-mahoHmrg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5_ykgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QFRAoH3sEeyivuDeOiJBMg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QFRAoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::HLD).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ( streetAddressLine->size() >=1 and streetAddressLine->size() &lt;=4))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5_zLkF9xEey5t-mahoHmrg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5_zLkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QFRnsH3sEeyivuDeOiJBMg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QFSOwH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::HLD).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies state->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5_zyoF9xEey5t-mahoHmrg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5_zyoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QFS10H3sEeyivuDeOiJBMg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QFS10X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::HLD).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies postalCode->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5_0ZsF9xEey5t-mahoHmrg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5_0ZsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QFTc4H3sEeyivuDeOiJBMg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QFTc4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::HLD).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::PostalAddressUse) and 
 let value : vocab::PostalAddressUse = element.oclAsType(vocab::PostalAddressUse) in 
 value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or value = vocab::PostalAddressUse::H or value = vocab::PostalAddressUse::HP or value = vocab::PostalAddressUse::HV or value = vocab::PostalAddressUse::PHYS or value = vocab::PostalAddressUse::PST or value = vocab::PostalAddressUse::PUB or value = vocab::PostalAddressUse::TMP or value = vocab::PostalAddressUse::WP) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5_0Zsl9xEey5t-mahoHmrg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5_0Zs19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QFTc4n3sEeyivuDeOiJBMg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QFTc433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::HLD).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5_1AwF9xEey5t-mahoHmrg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5_1AwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QFUD8H3sEeyivuDeOiJBMg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QFUD8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::HLD).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((country->isEmpty() or country->exists(element | element.isNullFlavorUndefined())) implies (( not country->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5_1n0F9xEey5t-mahoHmrg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5_1n0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QFUrAH3sEeyivuDeOiJBMg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QFUrAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::HLD).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((state->isEmpty() or state->exists(element | element.isNullFlavorUndefined())) implies (( not state->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5_1n0l9xEey5t-mahoHmrg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5_1n019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QFUrAn3sEeyivuDeOiJBMg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QFVSEH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::HLD).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((city->isEmpty() or city->exists(element | element.isNullFlavorUndefined())) implies (city->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5_2O4F9xEey5t-mahoHmrg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5_2O4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QFVSEX3sEeyivuDeOiJBMg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QFVSEn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::HLD).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((postalCode->isEmpty() or postalCode->exists(element | element.isNullFlavorUndefined())) implies (( not postalCode->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5_218F9xEey5t-mahoHmrg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5_218V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QFV5IH3sEeyivuDeOiJBMg" name="PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QFV5IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::HLD).participantRole->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((streetAddressLine->isEmpty() or streetAddressLine->exists(element | element.isNullFlavorUndefined())) implies (( not streetAddressLine->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5_218l9xEey5t-mahoHmrg" name="PolicyActivityHolderHolderRoleId" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5_21819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QFWgMH3sEeyivuDeOiJBMg" name="PolicyActivityHolderHolderRoleId" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QFWgMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::HLD).participantRole->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5_3dAF9xEey5t-mahoHmrg" name="PolicyActivityHolderHolderRoleAddr" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5_3dAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QFWgMn3sEeyivuDeOiJBMg" name="PolicyActivityHolderHolderRoleAddr" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QFWgM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::HLD).participantRole->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (( not addr->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5_3dAl9xEey5t-mahoHmrg" name="PolicyActivityHolderTemplateId" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5_3dA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QFXHQH3sEeyivuDeOiJBMg" name="PolicyActivityHolderTemplateId" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QFXHQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::HLD)->select(typeCode=vocab::ParticipationType::HLD)->reject(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.90'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5_4EEF9xEey5t-mahoHmrg" name="PolicyActivityHolderTypeCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5_4EEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QFXHQn3sEeyivuDeOiJBMg" name="PolicyActivityHolderTypeCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QFXHQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::HLD)->select(typeCode=vocab::ParticipationType::HLD)->reject(typeCode=vocab::ParticipationType::HLD)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5_4EEl9xEey5t-mahoHmrg" name="PolicyActivityHolderTime" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5_4EE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QFXuUH3sEeyivuDeOiJBMg" name="PolicyActivityHolderTime" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QFXuUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::HLD)->select(typeCode=vocab::ParticipationType::HLD)->reject((time.oclIsUndefined() or time.isNullFlavorUndefined()) implies (not time.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5_4rIF9xEey5t-mahoHmrg" name="PolicyActivityHolderHolderRole" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5_4rIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QFYVYH3sEeyivuDeOiJBMg" name="PolicyActivityHolderHolderRole" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QFYVYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::HLD)->select(typeCode=vocab::ParticipationType::HLD)->reject(participantRole->one(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(cda::ParticipantRole)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6AYaYF9xEey5t-mahoHmrg" name="PolicyActivityEntryRelationshipTargetActActivity" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6AYaYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QF4EoH3sEeyivuDeOiJBMg" name="PolicyActivityEntryRelationshipTargetActActivity" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QF4EoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::REFR)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::REFR)->reject(act->one(a : cda::Act | a.oclIsTypeOf(consol::AuthorizationActivity) or (a.classCode=vocab::x_ActClassDocumentEntryAct::ACT and a.moodCode=vocab::x_DocumentActMood::DEF)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6AZBcF9xEey5t-mahoHmrg" name="PolicyActivityEntryRelationshipDescriptionCoveragePlan" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6AZBcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QF4rsH3sEeyivuDeOiJBMg" name="PolicyActivityEntryRelationshipDescriptionCoveragePlan" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QF4rsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::REFR)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::REFR)->reject(act->select(a : cda::Act | a.classCode=vocab::x_ActClassDocumentEntryAct::ACT and (a.moodCode=vocab::x_DocumentActMood::DEF))->forAll(id->size() > 0 and text->size() = 1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6AZBcl9xEey5t-mahoHmrg" name="PolicyActivityEntryRelationshipTypeCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6AZBc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QF4rsn3sEeyivuDeOiJBMg" name="PolicyActivityEntryRelationshipTypeCode" constrainedElement="_PZBdMBUlEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QF4rs33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::REFR)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::REFR)->reject(typeCode=vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
@@ -9446,48 +9446,48 @@ value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or
           <body>self.entryRelationship->forAll(er : cda::EntryRelationship | not er.sequenceNumber.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q8ar8F9xEey5t-mahoHmrg" name="CoverageActivityTemplateId" constrainedElement="_Cg3pkBUmEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q8bTAF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DGe2AH3sEeyivuDeOiJBMg" name="CoverageActivityTemplateId" constrainedElement="_Cg3pkBUmEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DGe2AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.60')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q8chIF9xEey5t-mahoHmrg" name="CoverageActivityClassCode" constrainedElement="_Cg3pkBUmEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q8chIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DGgEIH3sEeyivuDeOiJBMg" name="CoverageActivityClassCode" constrainedElement="_Cg3pkBUmEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DGgEIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q8eWUF9xEey5t-mahoHmrg" name="CoverageActivityMoodCode" constrainedElement="_Cg3pkBUmEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q8eWUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DGhSQH3sEeyivuDeOiJBMg" name="CoverageActivityMoodCode" constrainedElement="_Cg3pkBUmEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DGhSQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q8fkcF9xEey5t-mahoHmrg" name="CoverageActivityId" constrainedElement="_Cg3pkBUmEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q8fkcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DGigYH3sEeyivuDeOiJBMg" name="CoverageActivityId" constrainedElement="_Cg3pkBUmEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DGigYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q8gykF9xEey5t-mahoHmrg" name="CoverageActivityCode" constrainedElement="_Cg3pkBUmEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q8gykV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DGjHcH3sEeyivuDeOiJBMg" name="CoverageActivityCode" constrainedElement="_Cg3pkBUmEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DGjHcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '48768-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q8iAsF9xEey5t-mahoHmrg" name="CoverageActivityStatusCode" constrainedElement="_Cg3pkBUmEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q8inwF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DGk8oH3sEeyivuDeOiJBMg" name="CoverageActivityStatusCode" constrainedElement="_Cg3pkBUmEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DGk8oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q9EMMF9xEey5t-mahoHmrg" name="CoverageActivityPolicyActivity" constrainedElement="_Cg3pkBUmEeGvPruliC3crg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q9EMMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DG_zYH3sEeyivuDeOiJBMg" name="CoverageActivityPolicyActivity" constrainedElement="_Cg3pkBUmEeGvPruliC3crg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DG_zYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::PolicyActivity) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
@@ -9495,15 +9495,15 @@ value.code = 'completed')</body>
       <generalization xmi:id="_Cg3pkRUmEeGvPruliC3crg">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_q9EMMl9xEey5t-mahoHmrg" name="getPolicyActivities" bodyCondition="_q9EMNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_q9EMNV9xEey5t-mahoHmrg" name="body" constrainedElement="_q9EMMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_q9EMNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DG_zYn3sEeyivuDeOiJBMg" name="getPolicyActivities" bodyCondition="_DG_zZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DG_zZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_DG_zYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DG_zZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PolicyActivity)).oclAsType(consol::PolicyActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_q9EMM19xEey5t-mahoHmrg" type="_PZBdMBUlEeGvPruliC3crg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_q9EMNF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DG_zY33sEeyivuDeOiJBMg" type="_PZBdMBUlEeGvPruliC3crg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DG_zZH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -9573,98 +9573,98 @@ value.code = 'completed')</body>
           <body>self.value.oclAsType(datatypes::CD).translation->size()>0 implies self.value.oclAsType(datatypes::CD).translation->forAll(code->size() = 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q-GG8F9xEey5t-mahoHmrg" name="ProblemObservationTemplateId" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q-GG8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DH1g4H3sEeyivuDeOiJBMg" name="ProblemObservationTemplateId" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DH1g4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q-JxUF9xEey5t-mahoHmrg" name="ProblemObservationClassCode" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q-JxUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DH5LQH3sEeyivuDeOiJBMg" name="ProblemObservationClassCode" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DH5LQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q-LmgF9xEey5t-mahoHmrg" name="ProblemObservationMoodCode" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q-LmgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DH6ZYH3sEeyivuDeOiJBMg" name="ProblemObservationMoodCode" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DH6ZYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q-NbsF9xEey5t-mahoHmrg" name="ProblemObservationNegationInd" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q-NbsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DH8OkH3sEeyivuDeOiJBMg" name="ProblemObservationNegationInd" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DH8OkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.negationInd.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q-PQ4F9xEey5t-mahoHmrg" name="ProblemObservationId" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q-PQ4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DH-DwH3sEeyivuDeOiJBMg" name="ProblemObservationId" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DH-DwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q-xcYF9xEey5t-mahoHmrg" name="ProblemObservationCodeP" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q-xcYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DIYTcH3sEeyivuDeOiJBMg" name="ProblemObservationCodeP" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DIYTcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q-QfAF9xEey5t-mahoHmrg" name="ProblemObservationCode" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q-QfAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DH-q0H3sEeyivuDeOiJBMg" name="ProblemObservationCode" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DH-q0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '404684003' or value.code = '409586006' or value.code = '282291009' or value.code = '64572001' or value.code = '248536006' or value.code = '418799008' or value.code = '55607006' or value.code = '373930000'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q_SZwF9xEey5t-mahoHmrg" name="ProblemObservationText" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q_TA0F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DIyjIH3sEeyivuDeOiJBMg" name="ProblemObservationText" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DIyjIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q_Tn4F9xEey5t-mahoHmrg" name="ProblemObservationStatusCode" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q_Tn4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DIzxQH3sEeyivuDeOiJBMg" name="ProblemObservationStatusCode" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DIzxQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q_VdEF9xEey5t-mahoHmrg" name="ProblemObservationEffectiveTime" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q_VdEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DI0_YH3sEeyivuDeOiJBMg" name="ProblemObservationEffectiveTime" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DI0_YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q_WrMF9xEey5t-mahoHmrg" name="ProblemObservationValue" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q_WrMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DI1mcH3sEeyivuDeOiJBMg" name="ProblemObservationValue" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DI1mcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_q_2acF9xEey5t-mahoHmrg" name="ProblemObservationValueP" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_q_2acV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DJUHkH3sEeyivuDeOiJBMg" name="ProblemObservationValueP" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DJUHkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rBKpEF9xEey5t-mahoHmrg" name="ProblemObservationAgeObservation" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rBLQIF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DKKcIH3sEeyivuDeOiJBMg" name="ProblemObservationAgeObservation" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DKKcIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AgeObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rCMj0F9xEey5t-mahoHmrg" name="ProblemObservationHealthStatusObservation" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rCMj0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DLAwsH3sEeyivuDeOiJBMg" name="ProblemObservationHealthStatusObservation" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DLAwsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::HealthStatusObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rDUlMF9xEey5t-mahoHmrg" name="ProblemObservationProblemStatus" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rDUlMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DL9L4H3sEeyivuDeOiJBMg" name="ProblemObservationProblemStatus" constrainedElement="_5Ha7ABUyEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DL9L4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemStatus) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
@@ -9672,37 +9672,37 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
       <generalization xmi:id="_5Ha7ARUyEeGbmN_W114JUw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_rBLQIV9xEey5t-mahoHmrg" name="getAgeObservation" bodyCondition="_rBLQJF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rBLQJF9xEey5t-mahoHmrg" name="body" constrainedElement="_rBLQIV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rBLQJV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DKLDMH3sEeyivuDeOiJBMg" name="getAgeObservation" bodyCondition="_DKLDM33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DKLDM33sEeyivuDeOiJBMg" name="body" constrainedElement="_DKLDMH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DKLDNH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AgeObservation))->asSequence()->any(true).oclAsType(consol::AgeObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rBLQIl9xEey5t-mahoHmrg" type="_2EqqABSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rBLQI19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_DKLDMX3sEeyivuDeOiJBMg" type="_2EqqABSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DKLDMn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rCMj0l9xEey5t-mahoHmrg" name="getHealthStatusObservation" bodyCondition="_rCMj1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rCMj1V9xEey5t-mahoHmrg" name="body" constrainedElement="_rCMj0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rCMj1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DLAwsn3sEeyivuDeOiJBMg" name="getHealthStatusObservation" bodyCondition="_DLAwtX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DLAwtX3sEeyivuDeOiJBMg" name="body" constrainedElement="_DLAwsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DLAwtn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::HealthStatusObservation))->asSequence()->any(true).oclAsType(consol::HealthStatusObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rCMj019xEey5t-mahoHmrg" type="_2ExXsBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rCMj1F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_DLAws33sEeyivuDeOiJBMg" type="_2ExXsBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DLAwtH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rDUlMl9xEey5t-mahoHmrg" name="getProblemStatus" bodyCondition="_rDUlNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rDUlNV9xEey5t-mahoHmrg" name="body" constrainedElement="_rDUlMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rDUlNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DL9L4n3sEeyivuDeOiJBMg" name="getProblemStatus" bodyCondition="_DL9L5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DL9L5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_DL9L4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DL9L5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemStatus))->asSequence()->any(true).oclAsType(consol::ProblemStatus)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rDUlM19xEey5t-mahoHmrg" type="_SjN_8BUzEeGbmN_W114JUw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rDUlNF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_DL9L433sEeyivuDeOiJBMg" type="_SjN_8BUzEeGbmN_W114JUw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DL9L5H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -9730,48 +9730,48 @@ The Problem Status records whether the indicated problem is active, inactive, or
           <body>not self.text.reference.value.oclIsUndefined() implies not self.getSection().text.getText(self.text.reference.value.substring(2, self.text.reference.value.size())).oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rCMj119xEey5t-mahoHmrg" name="ProblemStatusTemplateId" constrainedElement="_SjN_8BUzEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rCNK4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DLAwt33sEeyivuDeOiJBMg" name="ProblemStatusTemplateId" constrainedElement="_SjN_8BUzEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DLAwuH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.6')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rCPAEF9xEey5t-mahoHmrg" name="ProblemStatusClassCode" constrainedElement="_SjN_8BUzEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rCPAEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DLCl4H3sEeyivuDeOiJBMg" name="ProblemStatusClassCode" constrainedElement="_SjN_8BUzEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DLCl4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rCQ1QF9xEey5t-mahoHmrg" name="ProblemStatusMoodCode" constrainedElement="_SjN_8BUzEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rCQ1QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DLD0AH3sEeyivuDeOiJBMg" name="ProblemStatusMoodCode" constrainedElement="_SjN_8BUzEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DLD0AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rCSDYF9xEey5t-mahoHmrg" name="ProblemStatusCode" constrainedElement="_SjN_8BUzEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rCSDYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DLFCIH3sEeyivuDeOiJBMg" name="ProblemStatusCode" constrainedElement="_SjN_8BUzEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DLFCIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '33999-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rCTRgF9xEey5t-mahoHmrg" name="ProblemStatusText" constrainedElement="_SjN_8BUzEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rCTRgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DLGQQH3sEeyivuDeOiJBMg" name="ProblemStatusText" constrainedElement="_SjN_8BUzEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DLGQQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rCUfoF9xEey5t-mahoHmrg" name="ProblemStatusStatusCode" constrainedElement="_SjN_8BUzEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rCUfoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DLG3UH3sEeyivuDeOiJBMg" name="ProblemStatusStatusCode" constrainedElement="_SjN_8BUzEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DLG3UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rCVtwF9xEey5t-mahoHmrg" name="ProblemStatusValue" constrainedElement="_SjN_8BUzEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rCVtwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DLIsgH3sEeyivuDeOiJBMg" name="ProblemStatusValue" constrainedElement="_SjN_8BUzEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DLIsgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
@@ -9783,40 +9783,40 @@ value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '55561003' or valu
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="__qYdcBVNEeGbmN_W114JUw" name="ImmunizationRefusalReason">
-      <ownedRule xmi:id="_rHVigF9xEey5t-mahoHmrg" name="ImmunizationRefusalReasonTemplateId" constrainedElement="__qYdcBVNEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rHVigV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DPtDc33sEeyivuDeOiJBMg" name="ImmunizationRefusalReasonTemplateId" constrainedElement="__qYdcBVNEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DPtDdH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.53')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rHWwoF9xEey5t-mahoHmrg" name="ImmunizationRefusalReasonClassCode" constrainedElement="__qYdcBVNEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rHWwoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DPuRkH3sEeyivuDeOiJBMg" name="ImmunizationRefusalReasonClassCode" constrainedElement="__qYdcBVNEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DPuRkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rHX-wF9xEey5t-mahoHmrg" name="ImmunizationRefusalReasonCode" constrainedElement="__qYdcBVNEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rHX-wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DPvfsH3sEeyivuDeOiJBMg" name="ImmunizationRefusalReasonCode" constrainedElement="__qYdcBVNEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DPvfsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.5.8' and (value.code = 'IMMUNE' or value.code = 'MEDPREC' or value.code = 'OSTOCK' or value.code = 'PATOBJ' or value.code = 'PHILISOP' or value.code = 'RELIG' or value.code = 'VACEFF' or value.code = 'VACSAF'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rH48IF9xEey5t-mahoHmrg" name="ImmunizationRefusalReasonId" constrainedElement="__qYdcBVNEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rH48IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DQJvYH3sEeyivuDeOiJBMg" name="ImmunizationRefusalReasonId" constrainedElement="__qYdcBVNEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DQJvYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rH6xUF9xEey5t-mahoHmrg" name="ImmunizationRefusalReasonMoodCode" constrainedElement="__qYdcBVNEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rH6xUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DQK9gH3sEeyivuDeOiJBMg" name="ImmunizationRefusalReasonMoodCode" constrainedElement="__qYdcBVNEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DQK9gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rH7_cF9xEey5t-mahoHmrg" name="ImmunizationRefusalReasonStatusCode" constrainedElement="__qYdcBVNEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rH7_cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DQMysH3sEeyivuDeOiJBMg" name="ImmunizationRefusalReasonStatusCode" constrainedElement="__qYdcBVNEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DQMysX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
@@ -9831,70 +9831,70 @@ value.code = 'completed')</body>
       <ownedComment xmi:id="_JOE1QBq0EeGo461UQq-B1g">
         <body>The Immunization Medication Information represents product information about the immunization substance. The vaccine manufacturer and vaccine lot number are typically recorded in the medical record and should be included if known.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rIeyAF9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationTemplateId" constrainedElement="_daTqABVOEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rIeyAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DQoQh33sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationTemplateId" constrainedElement="_daTqABVOEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DQoQiH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.54')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rIgAIF9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationClassCode" constrainedElement="_daTqABVOEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rIgAIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DQpeoH3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationClassCode" constrainedElement="_daTqABVOEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DQpeoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('classCode') and self.classCode=vocab::RoleClassManufacturedProduct::MANU</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rIh1UF9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationId" constrainedElement="_daTqABVOEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rIh1UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DQqswH3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationId" constrainedElement="_daTqABVOEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DQqswX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (not self.id->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rV3GsF9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationManufacturerOrganization" constrainedElement="_daTqABVOEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rV3GsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DcNOYH3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationManufacturerOrganization" constrainedElement="_daTqABVOEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DcNOYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturerOrganization->one(manufacturerOrganization : cda::Organization | not manufacturerOrganization.oclIsUndefined() and manufacturerOrganization.oclIsKindOf(rim::Entity))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tl7E0F9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationManufacturedMaterial" constrainedElement="_daTqABVOEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tl7E0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FUha4H3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationManufacturedMaterial" constrainedElement="_daTqABVOEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FUha4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->one(manufacturedMaterial : cda::Material | not manufacturedMaterial.oclIsUndefined() and manufacturedMaterial.oclIsKindOf(cda::Material))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Ffj4F9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeOriginalText" constrainedElement="_daTqABVOEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Ffj4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QLp8gH3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeOriginalText" constrainedElement="_daTqABVOEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QLp8gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject(code.originalText->size() = 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Ffj4l9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialOriginalTextReference" constrainedElement="_daTqABVOEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Ffj419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QLp8gn3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialOriginalTextReference" constrainedElement="_daTqABVOEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QLp8g33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject(code.originalText->size() = 1 implies code.originalText->one(reference->size() = 1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6FgK8F9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialTextReferenceValue" constrainedElement="_daTqABVOEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6FgK8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QLqjkH3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialTextReferenceValue" constrainedElement="_daTqABVOEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QLqjkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject(code.originalText.reference->size() = 1 implies code.originalText.reference.value->size() = 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6FgK8l9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeTranslation" constrainedElement="_daTqABVOEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6FgK819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QLqjkn3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeTranslation" constrainedElement="_daTqABVOEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QLqjk33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject(code->size() = 1 implies code.translation->size() > 0)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6FgK9F9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCode" constrainedElement="_daTqABVOEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6FgK9V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QLrKoH3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCode" constrainedElement="_daTqABVOEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QLrKoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.12.292' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6FgyAF9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialLotNumberText" constrainedElement="_daTqABVOEeGbmN_W114JUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6FgyAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QLrKon3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialLotNumberText" constrainedElement="_daTqABVOEeGbmN_W114JUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QLrKo33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject((lotNumberText.oclIsUndefined() or lotNumberText.isNullFlavorUndefined()) implies (not lotNumberText.oclIsUndefined()))</body>
         </specification>
@@ -9907,40 +9907,40 @@ value.codeSystem = '2.16.840.1.113883.12.292' and not value.code.oclIsUndefined(
       <ownedComment xmi:id="_bGzYgRVdEeGQCvUGzi1kDQ" annotatedElement="_bGzYgBVdEeGQCvUGzi1kDQ">
         <body>This section lists and describes any medication allergies, adverse reactions, idiosyncratic reactions, anaphylaxis/anaphylactoid reactions to food items, and metabolic variations or adverse reactions/allergies to other substances (such as latex, iodine, tape adhesives) used to assure the safety of health care delivery. At a minimum, it should list currently active and any relevant historical allergies and adverse reactions.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rKGip19xEey5t-mahoHmrg" name="AllergiesSectionEntriesOptionalTemplateId" constrainedElement="_bGzYgBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKGiqF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSClxX3sEeyivuDeOiJBMg" name="AllergiesSectionEntriesOptionalTemplateId" constrainedElement="_bGzYgBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSClxn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.6')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKHwwF9xEey5t-mahoHmrg" name="AllergiesSectionEntriesOptionalCode" constrainedElement="_bGzYgBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKHwwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSDM0X3sEeyivuDeOiJBMg" name="AllergiesSectionEntriesOptionalCode" constrainedElement="_bGzYgBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSDM0n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '48765-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKI-4F9xEey5t-mahoHmrg" name="AllergiesSectionEntriesOptionalCodeP" constrainedElement="_bGzYgBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKI-4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSEa8H3sEeyivuDeOiJBMg" name="AllergiesSectionEntriesOptionalCodeP" constrainedElement="_bGzYgBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSEa8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKK0EF9xEey5t-mahoHmrg" name="AllergiesSectionEntriesOptionalTitle" constrainedElement="_bGzYgBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKK0EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSFpEH3sEeyivuDeOiJBMg" name="AllergiesSectionEntriesOptionalTitle" constrainedElement="_bGzYgBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSFpEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKMCMF9xEey5t-mahoHmrg" name="AllergiesSectionEntriesOptionalText" constrainedElement="_bGzYgBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKMCMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSG3MH3sEeyivuDeOiJBMg" name="AllergiesSectionEntriesOptionalText" constrainedElement="_bGzYgBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSG3MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rfinIF9xEey5t-mahoHmrg" name="AllergiesSectionEntriesOptionalAllergyProblemAct" constrainedElement="_bGzYgBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rfinIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DkckYH3sEeyivuDeOiJBMg" name="AllergiesSectionEntriesOptionalAllergyProblemAct" constrainedElement="_bGzYgBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DkckYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::AllergyProblemAct))</body>
         </specification>
@@ -9948,15 +9948,15 @@ value.code = '48765-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_FHCOMBVgEeGQCvUGzi1kDQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_rfjOMF9xEey5t-mahoHmrg" name="getAllergyProblemActs" bodyCondition="_rfjOM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rfjOM19xEey5t-mahoHmrg" name="body" constrainedElement="_rfjOMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rfjONF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DkckYn3sEeyivuDeOiJBMg" name="getAllergyProblemActs" bodyCondition="_DkckZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DkckZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_DkckYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DkckZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::AllergyProblemAct)).oclAsType(consol::AllergyProblemAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rfjOMV9xEey5t-mahoHmrg" type="_2EAisBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rfjOMl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DkckY33sEeyivuDeOiJBMg" type="_2EAisBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DkckZH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -9965,40 +9965,40 @@ value.code = '48765-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         <body>The Medications section defines a patient's current medications and pertinent medication history. At a minimum, the currently active medications are to be listed, with an entire medication history as an option. The section may also include a patient's prescription and dispense history.&#xD;
 This section requires that there be either an entry indicating the subject is not known to be on any medications, or that there be entries summarizing the subject's medications.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rKMpQF9xEey5t-mahoHmrg" name="MedicationsSectionEntriesOptionalTemplateId" constrainedElement="_iAoXEBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKMpQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSIFUH3sEeyivuDeOiJBMg" name="MedicationsSectionEntriesOptionalTemplateId" constrainedElement="_iAoXEBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSIFUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKN3YF9xEey5t-mahoHmrg" name="MedicationsSectionEntriesOptionalCode" constrainedElement="_iAoXEBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKN3YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSIsYH3sEeyivuDeOiJBMg" name="MedicationsSectionEntriesOptionalCode" constrainedElement="_iAoXEBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSIsYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10160-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKPFgF9xEey5t-mahoHmrg" name="MedicationsSectionEntriesOptionalCodeP" constrainedElement="_iAoXEBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKPFgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSJ6gH3sEeyivuDeOiJBMg" name="MedicationsSectionEntriesOptionalCodeP" constrainedElement="_iAoXEBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSJ6gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKQToF9xEey5t-mahoHmrg" name="MedicationsSectionEntriesOptionalTitle" constrainedElement="_iAoXEBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKQToV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSLIoH3sEeyivuDeOiJBMg" name="MedicationsSectionEntriesOptionalTitle" constrainedElement="_iAoXEBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSLIoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKRhwF9xEey5t-mahoHmrg" name="MedicationsSectionEntriesOptionalText" constrainedElement="_iAoXEBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKRhwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSMWwH3sEeyivuDeOiJBMg" name="MedicationsSectionEntriesOptionalText" constrainedElement="_iAoXEBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSMWwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rgIdAF9xEey5t-mahoHmrg" name="MedicationsSectionEntriesOptionalMedicationActivity" constrainedElement="_iAoXEBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rgIdAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dk2NAH3sEeyivuDeOiJBMg" name="MedicationsSectionEntriesOptionalMedicationActivity" constrainedElement="_iAoXEBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dk2NAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.substanceAdministration.oclIsUndefined() and entry.substanceAdministration.oclIsKindOf(consol::MedicationActivity))</body>
         </specification>
@@ -10006,15 +10006,15 @@ value.code = '10160-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_iAoXIhVdEeGQCvUGzi1kDQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_rgIdAl9xEey5t-mahoHmrg" name="getMedicationActivities" bodyCondition="_rgIdBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rgIdBV9xEey5t-mahoHmrg" name="body" constrainedElement="_rgIdAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rgIdBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Dk20EH3sEeyivuDeOiJBMg" name="getMedicationActivities" bodyCondition="_Dk20E33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Dk20E33sEeyivuDeOiJBMg" name="body" constrainedElement="_Dk20EH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dk20FH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity)).oclAsType(consol::MedicationActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rgIdA19xEey5t-mahoHmrg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rgIdBF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Dk20EX3sEeyivuDeOiJBMg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Dk20En3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -10022,40 +10022,40 @@ value.code = '10160-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_meK94CAoEeGetMjKLkqR8g">
         <body>This section lists and describes all relevant clinical problems at the time the document is generated. At a minimum, all pertinent current and historical problems should be listed.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rKSv4F9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalTemplateId" constrainedElement="_naxrkBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKSv4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSM90H3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalTemplateId" constrainedElement="_naxrkBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSM90X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.5')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKTW8F9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalCode" constrainedElement="_naxrkBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKTW8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSNk4H3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalCode" constrainedElement="_naxrkBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSNk4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '11450-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKUlEF9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalCodeP" constrainedElement="_naxrkBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKUlEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSOzAH3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalCodeP" constrainedElement="_naxrkBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSOzAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKVzMF9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalTitle" constrainedElement="_naxrkBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKVzMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSQBIH3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalTitle" constrainedElement="_naxrkBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSQBIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKXBUF9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalText" constrainedElement="_naxrkBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKXBUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSRPQH3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalText" constrainedElement="_naxrkBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSRPQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ri5dIF9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalProblemConcern" constrainedElement="_naxrkBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ri5dIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dm6pkH3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalProblemConcern" constrainedElement="_naxrkBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dm6pkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::ProblemConcernAct))</body>
         </specification>
@@ -10063,15 +10063,15 @@ value.code = '11450-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_naxrlxVdEeGQCvUGzi1kDQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_ri5dIl9xEey5t-mahoHmrg" name="getProblemConcerns" bodyCondition="_ri5dJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ri5dJV9xEey5t-mahoHmrg" name="body" constrainedElement="_ri5dIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ri5dJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Dm7QoH3sEeyivuDeOiJBMg" name="getProblemConcerns" bodyCondition="_Dm7Qo33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Dm7Qo33sEeyivuDeOiJBMg" name="body" constrainedElement="_Dm7QoH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dm7QpH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::ProblemConcernAct)).oclAsType(consol::ProblemConcernAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ri5dI19xEey5t-mahoHmrg" type="_2H6yUBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ri5dJF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Dm7QoX3sEeyivuDeOiJBMg" type="_2H6yUBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Dm7Qon3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -10080,52 +10080,52 @@ value.code = '11450-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         <body>This section defines all interventional, surgical, diagnostic, or therapeutic procedures or treatments pertinent to the patient historically at the time the document is generated. The section is intended to include notable procedures, but can contain all procedures for the period of time being summarized. The common notion of &quot;procedure&quot; is broader than that specified by the HL7 Version 3 Reference Information Model (RIM). Therefore this section contains procedure templates represented with three RIM classes: Act. Observation, and Procedure. Procedure act is for procedures the alter that physical condition of a patient (Splenectomy). Observation act is for procedures that result in new information about a patient but do not cause physical alteration (EEG). Act is for all other types of procedures (dressing change).&#xD;
 The length of an encounter is documented in the documentationOf/encompassingEncounter/effectiveTime and length of service in documentationOf/ServiceEvent/effectiveTime.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rKXoYF9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalTemplateId" constrainedElement="_s9Ig4BVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKXoYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSR2UH3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalTemplateId" constrainedElement="_s9Ig4BVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSR2UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.7')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKY2gF9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalCode" constrainedElement="_s9Ig4BVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKY2gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSSdYH3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalCode" constrainedElement="_s9Ig4BVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSSdYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '47519-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKaEoF9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalCodeP" constrainedElement="_s9Ig4BVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKaEoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSTrgH3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalCodeP" constrainedElement="_s9Ig4BVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSTrgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKbSwF9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalTitle" constrainedElement="_s9Ig4BVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKbSwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSU5oH3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalTitle" constrainedElement="_s9Ig4BVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSU5oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKcg4F9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalText" constrainedElement="_s9Ig4BVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKcg4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSVgsH3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalText" constrainedElement="_s9Ig4BVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSVgsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rWYrIF9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalProcedureActivityProcedure" constrainedElement="_s9Ig4BVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rWYrIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DcpTQH3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalProcedureActivityProcedure" constrainedElement="_s9Ig4BVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DcpTQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.procedure.oclIsUndefined() and entry.procedure.oclIsKindOf(consol::ProcedureActivityProcedure))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rW5ogF9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalProcedureActivityObservation" constrainedElement="_s9Ig4BVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rW5ogV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DdExEH3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalProcedureActivityObservation" constrainedElement="_s9Ig4BVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DdExEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::ProcedureActivityObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rXal4F9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalProcedureActivityAct" constrainedElement="_s9Ig4BVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rXal4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ddg18H3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalProcedureActivityAct" constrainedElement="_s9Ig4BVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ddg18X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::ProcedureActivityAct))</body>
         </specification>
@@ -10133,37 +10133,37 @@ value.code = '47519-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_s9Ig6RVdEeGQCvUGzi1kDQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_rWYrIl9xEey5t-mahoHmrg" name="getProcedureActivityProcedures" bodyCondition="_rWYrJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rWYrJV9xEey5t-mahoHmrg" name="body" constrainedElement="_rWYrIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rWYrJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Dcp6UH3sEeyivuDeOiJBMg" name="getProcedureActivityProcedures" bodyCondition="_Dcp6U33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Dcp6U33sEeyivuDeOiJBMg" name="body" constrainedElement="_Dcp6UH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dcp6VH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getProcedures()->select(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::ProcedureActivityProcedure)).oclAsType(consol::ProcedureActivityProcedure)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rWYrI19xEey5t-mahoHmrg" type="_2OG58RSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rWYrJF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Dcp6UX3sEeyivuDeOiJBMg" type="_2OG58RSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Dcp6Un3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rW5ogl9xEey5t-mahoHmrg" name="getProcedureActivityObservations" bodyCondition="_rW5ohV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rW5ohV9xEey5t-mahoHmrg" name="body" constrainedElement="_rW5ogl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rW5ohl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DdExEn3sEeyivuDeOiJBMg" name="getProcedureActivityObservations" bodyCondition="_DdExFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DdExFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_DdExEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DdExFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProcedureActivityObservation)).oclAsType(consol::ProcedureActivityObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rW5og19xEey5t-mahoHmrg" type="_Aj7JkBg4EeGs5a462vYX5Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rW5ohF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DdExE33sEeyivuDeOiJBMg" type="_Aj7JkBg4EeGs5a462vYX5Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DdExFH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rXal4l9xEey5t-mahoHmrg" name="getProcedureActivityActs" bodyCondition="_rXal5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rXal5V9xEey5t-mahoHmrg" name="body" constrainedElement="_rXal4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rXal5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ddg18n3sEeyivuDeOiJBMg" name="getProcedureActivityActs" bodyCondition="_Ddg19X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ddg19X3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ddg18n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ddg19n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::ProcedureActivityAct)).oclAsType(consol::ProcedureActivityAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rXal419xEey5t-mahoHmrg" type="_awdH4Bg4EeGs5a462vYX5Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rXal5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Ddg1833sEeyivuDeOiJBMg" type="_awdH4Bg4EeGs5a462vYX5Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ddg19H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -10180,40 +10180,40 @@ Imaging results are typically generated by a clinician reviewing the output of a
 Procedure results are typically generated by a clinician to provide more granular information about component observations made during  a procedure, such as where a gastroenterologist reports the size of a polyp observed during a colonoscopy.
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_rKdH8F9xEey5t-mahoHmrg" name="ResultsSectionEntriesOptionalTemplateId" constrainedElement="_xGqiEBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKdH8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSWu0H3sEeyivuDeOiJBMg" name="ResultsSectionEntriesOptionalTemplateId" constrainedElement="_xGqiEBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSWu0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.3')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKeWEF9xEey5t-mahoHmrg" name="ResultsSectionEntriesOptionalCode" constrainedElement="_xGqiEBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKeWEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSXV4H3sEeyivuDeOiJBMg" name="ResultsSectionEntriesOptionalCode" constrainedElement="_xGqiEBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSXV4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '30954-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKfkMF9xEey5t-mahoHmrg" name="ResultsSectionEntriesOptionalCodeP" constrainedElement="_xGqiEBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKfkMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSYkAH3sEeyivuDeOiJBMg" name="ResultsSectionEntriesOptionalCodeP" constrainedElement="_xGqiEBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSYkAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKgyUF9xEey5t-mahoHmrg" name="ResultsSectionEntriesOptionalTitle" constrainedElement="_xGqiEBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKgyUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSZyIH3sEeyivuDeOiJBMg" name="ResultsSectionEntriesOptionalTitle" constrainedElement="_xGqiEBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSZyIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKiAcF9xEey5t-mahoHmrg" name="ResultsSectionEntriesOptionalText" constrainedElement="_xGqiEBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKiAcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSaZMH3sEeyivuDeOiJBMg" name="ResultsSectionEntriesOptionalText" constrainedElement="_xGqiEBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSaZMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rhQeYF9xEey5t-mahoHmrg" name="ResultsSectionEntriesOptionalResultOrganizer" constrainedElement="_xGqiEBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rhQeYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DlqsYH3sEeyivuDeOiJBMg" name="ResultsSectionEntriesOptionalResultOrganizer" constrainedElement="_xGqiEBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DlqsYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.organizer.oclIsUndefined() and entry.organizer.oclIsKindOf(consol::ResultOrganizer))</body>
         </specification>
@@ -10221,15 +10221,15 @@ value.code = '30954-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_xGqiFRVdEeGQCvUGzi1kDQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_rhQeYl9xEey5t-mahoHmrg" name="getResultOrganizers" bodyCondition="_rhQeZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rhQeZV9xEey5t-mahoHmrg" name="body" constrainedElement="_rhQeYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rhQeZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DlqsYn3sEeyivuDeOiJBMg" name="getResultOrganizers" bodyCondition="_DlqsZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DlqsZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_DlqsYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DlqsZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::ResultOrganizer)).oclAsType(consol::ResultOrganizer)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rhQeY19xEey5t-mahoHmrg" type="_2JxzgBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rhQeZF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DlqsY33sEeyivuDeOiJBMg" type="_2JxzgBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DlqsZH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -10242,40 +10242,40 @@ This section contains data defining the patient's advance directives and any ref
 NOTE: The descriptions in this section differentiate between &quot;advance directives&quot; and &quot;advance directive documents&quot;. The former are the directions whereas the latter are legal documents containing those directions. Thus, an advance directive might be &quot;no cardiopulmonary resuscitation&quot;, and this directive might be stated in a legal advance directive document.
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_rKingF9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptionalTemplateId" constrainedElement="_1RZdIBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKjOkF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSbnUH3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptionalTemplateId" constrainedElement="_1RZdIBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSbnUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.21')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKj1oF9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptionalCode" constrainedElement="_1RZdIBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKj1oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DScOYH3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptionalCode" constrainedElement="_1RZdIBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DScOYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '42348-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKlDwF9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptionalCodeP" constrainedElement="_1RZdIBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKlDwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSdcgH3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptionalCodeP" constrainedElement="_1RZdIBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSdcgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKmR4F9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptionalTitle" constrainedElement="_1RZdIBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKmR4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSeqoH3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptionalTitle" constrainedElement="_1RZdIBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSeqoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKngAF9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptionalText" constrainedElement="_1RZdIBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKngAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSf4wH3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptionalText" constrainedElement="_1RZdIBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSf4wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rl2qgF9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptionalAdvanceDirectiveObservation" constrainedElement="_1RZdIBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rl2qgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DpVrcH3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptionalAdvanceDirectiveObservation" constrainedElement="_1RZdIBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DpVrcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::AdvanceDirectiveObservation))</body>
         </specification>
@@ -10283,15 +10283,15 @@ value.code = '42348-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_1RZdJhVdEeGQCvUGzi1kDQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_rl2qgl9xEey5t-mahoHmrg" name="getAdvanceDirectiveObservations" bodyCondition="_rl3RkV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rl3RkV9xEey5t-mahoHmrg" name="body" constrainedElement="_rl2qgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rl3Rkl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DpWSgH3sEeyivuDeOiJBMg" name="getAdvanceDirectiveObservations" bodyCondition="_DpWSg33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DpWSg33sEeyivuDeOiJBMg" name="body" constrainedElement="_DpWSgH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DpWShH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AdvanceDirectiveObservation)).oclAsType(consol::AdvanceDirectiveObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rl2qg19xEey5t-mahoHmrg" type="_2KlEwBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rl3RkF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DpWSgX3sEeyivuDeOiJBMg" type="_2KlEwBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DpWSgn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -10299,40 +10299,40 @@ value.code = '42348-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_4yj2wRVdEeGQCvUGzi1kDQ" annotatedElement="_4yj2wBVdEeGQCvUGzi1kDQ">
         <body>This section lists and describes any healthcare encounters pertinent to the patient's current health status or historical health history. An Encounter is an interaction, regardless of the setting, between a patient and a practitioner who is vested with primary responsibility for diagnosing, evaluating, or treating the patient's condition. It may include visits, appointments, as well as non face-to-face interactions. It is also a contact between a patient and a practitioner who has primary responsibility for assessing and treating the patient at a given contact, exercising independent judgment. This section may contain all encounters for the time period being summarized, but should include notable encounters.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rKoHEF9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalTemplateId" constrainedElement="_4yj2wBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKouIF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSgf0H3sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalTemplateId" constrainedElement="_4yj2wBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DShG4H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.22')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKpVMF9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalCode" constrainedElement="_4yj2wBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKpVMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSht8H3sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalCode" constrainedElement="_4yj2wBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSht8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '46240-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKqjUF9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalCodeP" constrainedElement="_4yj2wBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKqjUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSi8EH3sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalCodeP" constrainedElement="_4yj2wBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSi8EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKrxcF9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalTitle" constrainedElement="_4yj2wBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKrxcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSjjIH3sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalTitle" constrainedElement="_4yj2wBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSjjIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKs_kF9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalText" constrainedElement="_4yj2wBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKs_kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSkxQH3sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalText" constrainedElement="_4yj2wBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSkxQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r2aPAF9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalEncounterActivities" constrainedElement="_4yj2wBVdEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r2aPAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D3gqUH3sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalEncounterActivities" constrainedElement="_4yj2wBVdEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D3gqUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.encounter.oclIsUndefined() and entry.encounter.oclIsKindOf(consol::EncounterActivities))</body>
         </specification>
@@ -10340,15 +10340,15 @@ value.code = '46240-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_4yj2xxVdEeGQCvUGzi1kDQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_r2a2EF9xEey5t-mahoHmrg" name="getEncounterActivitiess" bodyCondition="_r2a2E19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_r2a2E19xEey5t-mahoHmrg" name="body" constrainedElement="_r2a2EF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_r2a2FF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_D3gqUn3sEeyivuDeOiJBMg" name="getEncounterActivitiess" bodyCondition="_D3gqVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_D3gqVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_D3gqUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_D3gqVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getEncounters()->select(encounter : cda::Encounter | not encounter.oclIsUndefined() and encounter.oclIsKindOf(consol::EncounterActivities)).oclAsType(consol::EncounterActivities)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_r2a2EV9xEey5t-mahoHmrg" type="_2LayQBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r2a2El9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_D3gqU33sEeyivuDeOiJBMg" type="_2LayQBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_D3gqVH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -10356,40 +10356,40 @@ value.code = '46240-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_eb3_0BqgEeGo461UQq-B1g">
         <body>The Immunizations section defines a patient's current immunization status and pertinent immunization history. The primary use case for the Immunization section is to enable communication of a patient's immunization status. The section should include current immunization status, and may contain the entire immunization history that is relevant to the period of time being summarized.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rKuNsF9xEey5t-mahoHmrg" name="ImmunizationsSectionEntriesOptionalTemplateId" constrainedElement="_EuPloBVeEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKuNsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSlYUH3sEeyivuDeOiJBMg" name="ImmunizationsSectionEntriesOptionalTemplateId" constrainedElement="_EuPloBVeEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSlYUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.2')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKu0wF9xEey5t-mahoHmrg" name="ImmunizationsSectionEntriesOptionalCode" constrainedElement="_EuPloBVeEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKu0wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSmmcH3sEeyivuDeOiJBMg" name="ImmunizationsSectionEntriesOptionalCode" constrainedElement="_EuPloBVeEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSmmcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '11369-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKwC4F9xEey5t-mahoHmrg" name="ImmunizationsSectionEntriesOptionalCodeP" constrainedElement="_EuPloBVeEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKwC4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSn0kH3sEeyivuDeOiJBMg" name="ImmunizationsSectionEntriesOptionalCodeP" constrainedElement="_EuPloBVeEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSn0kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKxRAF9xEey5t-mahoHmrg" name="ImmunizationsSectionEntriesOptionalTitle" constrainedElement="_EuPloBVeEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKxRAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSoboH3sEeyivuDeOiJBMg" name="ImmunizationsSectionEntriesOptionalTitle" constrainedElement="_EuPloBVeEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSoboX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rKyfIF9xEey5t-mahoHmrg" name="ImmunizationsSectionEntriesOptionalText" constrainedElement="_EuPloBVeEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKyfIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSppwH3sEeyivuDeOiJBMg" name="ImmunizationsSectionEntriesOptionalText" constrainedElement="_EuPloBVeEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSqQ0H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_riXRoF9xEey5t-mahoHmrg" name="ImmunizationsSectionEntriesOptionalImmunizationActivity" constrainedElement="_EuPloBVeEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_riXRoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DmhA8H3sEeyivuDeOiJBMg" name="ImmunizationsSectionEntriesOptionalImmunizationActivity" constrainedElement="_EuPloBVeEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DmhA8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.substanceAdministration.oclIsUndefined() and entry.substanceAdministration.oclIsKindOf(consol::ImmunizationActivity))</body>
         </specification>
@@ -10397,15 +10397,15 @@ value.code = '11369-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_EuPlsBVeEeGQCvUGzi1kDQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_riXRol9xEey5t-mahoHmrg" name="getImmunizationActivities" bodyCondition="_riX4sF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_riX4sF9xEey5t-mahoHmrg" name="body" constrainedElement="_riXRol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_riX4sV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DmhA8n3sEeyivuDeOiJBMg" name="getImmunizationActivities" bodyCondition="_DmhA9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DmhA9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_DmhA8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DmhA9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::ImmunizationActivity)).oclAsType(consol::ImmunizationActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_riXRo19xEey5t-mahoHmrg" type="_2MAoIBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_riXRpF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DmhA833sEeyivuDeOiJBMg" type="_2MAoIBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DmhA9H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -10415,40 +10415,40 @@ value.code = '11369-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
 
 &lt;p>Vital signs are represented in the same way as other results, but are aggregated into their own section to follow clinical conventions.&lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_rKzGMF9xEey5t-mahoHmrg" name="VitalSignsSectionEntriesOptionalTemplateId" constrainedElement="_bRH8sBVeEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rKztQF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSq34H3sEeyivuDeOiJBMg" name="VitalSignsSectionEntriesOptionalTemplateId" constrainedElement="_bRH8sBVeEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSq34X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rK0UUF9xEey5t-mahoHmrg" name="VitalSignsSectionEntriesOptionalCode" constrainedElement="_bRH8sBVeEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rK0UUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSre8H3sEeyivuDeOiJBMg" name="VitalSignsSectionEntriesOptionalCode" constrainedElement="_bRH8sBVeEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSre8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '8716-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rK1icF9xEey5t-mahoHmrg" name="VitalSignsSectionEntriesOptionalCodeP" constrainedElement="_bRH8sBVeEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rK1icV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSstEH3sEeyivuDeOiJBMg" name="VitalSignsSectionEntriesOptionalCodeP" constrainedElement="_bRH8sBVeEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSstEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rK2wkF9xEey5t-mahoHmrg" name="VitalSignsSectionEntriesOptionalTitle" constrainedElement="_bRH8sBVeEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rK2wkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSt7MH3sEeyivuDeOiJBMg" name="VitalSignsSectionEntriesOptionalTitle" constrainedElement="_bRH8sBVeEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSt7MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rK3-sF9xEey5t-mahoHmrg" name="VitalSignsSectionEntriesOptionalText" constrainedElement="_bRH8sBVeEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rK3-sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSvJUH3sEeyivuDeOiJBMg" name="VitalSignsSectionEntriesOptionalText" constrainedElement="_bRH8sBVeEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSvJUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rX7jQF9xEey5t-mahoHmrg" name="VitalSignsSectionEntriesOptionalVitalSignsOrganizer" constrainedElement="_bRH8sBVeEeGQCvUGzi1kDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rX7jQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dd9h4H3sEeyivuDeOiJBMg" name="VitalSignsSectionEntriesOptionalVitalSignsOrganizer" constrainedElement="_bRH8sBVeEeGQCvUGzi1kDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dd9h4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.organizer.oclIsUndefined() and entry.organizer.oclIsKindOf(consol::VitalSignsOrganizer))</body>
         </specification>
@@ -10459,15 +10459,15 @@ value.code = '8716-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </ownedComment>
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_rX7jQl9xEey5t-mahoHmrg" name="getVitalSignsOrganizers" bodyCondition="_rX7jRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rX7jRV9xEey5t-mahoHmrg" name="body" constrainedElement="_rX7jQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rX7jRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Dd9h4n3sEeyivuDeOiJBMg" name="getVitalSignsOrganizers" bodyCondition="_Dd9h5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Dd9h5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_Dd9h4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dd9h5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::VitalSignsOrganizer)).oclAsType(consol::VitalSignsOrganizer)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rX7jQ19xEey5t-mahoHmrg" type="_2OlbCRSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rX7jRF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Dd9h433sEeyivuDeOiJBMg" type="_2OlbCRSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Dd9h5H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -10524,214 +10524,214 @@ This clinical statement represents procedures that result in new information abo
           <body>self.entryRelationship->select(er : cda::EntryRelationship | er.act.oclIsTypeOf(consol::Instructions))->forAll(ent : cda::EntryRelationship | ent.inversionInd=true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rK4lwF9xEey5t-mahoHmrg" name="ProcedureActivityObservationTemplateId" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rK4lwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSvwYH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationTemplateId" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSwXcH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.13')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rK8QIF9xEey5t-mahoHmrg" name="ProcedureActivityObservationClassCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rK8QIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DSzawH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationClassCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DSzawX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rK-FUF9xEey5t-mahoHmrg" name="ProcedureActivityObservationMoodCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rK-FUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DS0o4H3sEeyivuDeOiJBMg" name="ProcedureActivityObservationMoodCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DS0o4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_ActMoodDocumentObservation) and 
 let value : vocab::x_ActMoodDocumentObservation = self.moodCode.oclAsType(vocab::x_ActMoodDocumentObservation) in 
 value = vocab::x_ActMoodDocumentObservation::EVN or value = vocab::x_ActMoodDocumentObservation::INT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rLbYUF9xEey5t-mahoHmrg" name="ProcedureActivityObservationId" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rLbYUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DTQtwH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationId" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DTQtwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rLcmcF9xEey5t-mahoHmrg" name="ProcedureActivityObservationCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rLcmcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DTR74H3sEeyivuDeOiJBMg" name="ProcedureActivityObservationCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DTR74X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rLd0kF9xEey5t-mahoHmrg" name="ProcedureActivityObservationStatusCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rLd0kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DTTKAH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationStatusCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DTTKAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed' or value.code = 'active' or value.code = 'aborted' or value.code = 'cancelled')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rL8VsF9xEey5t-mahoHmrg" name="ProcedureActivityObservationEffectiveTime" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rL88wF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DTwdAH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationEffectiveTime" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DTwdAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rMfIQF9xEey5t-mahoHmrg" name="ProcedureActivityObservationPriorityCodeP" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rMfIQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DUMh4H3sEeyivuDeOiJBMg" name="ProcedureActivityObservationPriorityCodeP" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DUMh4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.priorityCode.oclIsUndefined() or self.priorityCode.isNullFlavorUndefined()) implies (not self.priorityCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rL-x8F9xEey5t-mahoHmrg" name="ProcedureActivityObservationPriorityCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rL-x8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DTxrIH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationPriorityCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DTxrIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.priorityCode.oclIsUndefined() or self.priorityCode.isNullFlavorUndefined()) implies (not self.priorityCode.oclIsUndefined() and self.priorityCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.priorityCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.7' and (value.code = 'A' or value.code = 'CR' or value.code = 'CS' or value.code = 'CSP' or value.code = 'CSR' or value.code = 'EL' or value.code = 'EM' or value.code = 'P' or value.code = 'PRN' or value.code = 'R' or value.code = 'RR' or value.code = 'S' or value.code = 'T' or value.code = 'UD' or value.code = 'UR'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rM-QcF9xEey5t-mahoHmrg" name="ProcedureActivityObservationValue" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rM-QcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DUpN0H3sEeyivuDeOiJBMg" name="ProcedureActivityObservationValue" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DUpN0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rNAssF9xEey5t-mahoHmrg" name="ProcedureActivityObservationMethodCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rNAssV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DUrDAH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationMethodCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DUrDAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.methodCode->isEmpty() or self.methodCode->exists(element | element.isNullFlavorUndefined())) implies (( not self.methodCode->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rNhqEF9xEey5t-mahoHmrg" name="ProcedureActivityObservationTargetSiteCodeP" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rNhqEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DVGg0H3sEeyivuDeOiJBMg" name="ProcedureActivityObservationTargetSiteCodeP" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DVGg0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (not self.targetSiteCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rNB60F9xEey5t-mahoHmrg" name="ProcedureActivityObservationTargetSiteCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rNB60V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DUrqEH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationTargetSiteCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DUrqEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (self.targetSiteCode->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rbso8F9xEey5t-mahoHmrg" name="ProcedureActivityObservationPerformer" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rbso8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DhpIAH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationPerformer" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DhpIAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->exists(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rcWwQF9xEey5t-mahoHmrg" name="ProcedureActivityObservationServiceDeliveryLocation" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rcWwQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DiHpIH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationServiceDeliveryLocation" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DiHpIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant2 | not participant.participantRole.oclIsUndefined() and participant.participantRole.oclIsKindOf(consol::ServiceDeliveryLocation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rdIMUF9xEey5t-mahoHmrg" name="ProcedureActivityObservationInstructions" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rdIMUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dik8IH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationInstructions" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dik8IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instructions) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rdvQUF9xEey5t-mahoHmrg" name="ProcedureActivityObservationIndication" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rdvQUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DjAZ8H3sEeyivuDeOiJBMg" name="ProcedureActivityObservationIndication" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DjAZ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_reTRAF9xEey5t-mahoHmrg" name="ProcedureActivityObservationMedicationActivity" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_reTRAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DjeUAH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationMedicationActivity" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DjeUAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::MedicationActivity) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uFyQoF9xEey5t-mahoHmrg" name="ProcedureActivityObservationEntryRelationship" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uFyQoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ft91oH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationEntryRelationship" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ft91oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->select(entryRelationship : cda::EntryRelationship | not entryRelationship.oclIsUndefined() and entryRelationship.oclIsKindOf(cda::EntryRelationship))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6HBN4F9xEey5t-mahoHmrg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityProcedureObservationRepresentedOrganizationId" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6HBN4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QObjsH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityProcedureObservationRepresentedOrganizationId" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QOcKwH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).representedOrganization->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6HB08F9xEey5t-mahoHmrg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityProcedureObservationRepresentedOrganizationName" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6HB08V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QOcKwX3sEeyivuDeOiJBMg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityProcedureObservationRepresentedOrganizationName" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QOcKwn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).representedOrganization->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (not name->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6HB08l9xEey5t-mahoHmrg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityProcedureObservationRepresentedOrganizationTelecom" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6HB0819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QOcx0H3sEeyivuDeOiJBMg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityProcedureObservationRepresentedOrganizationTelecom" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QOcx0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).representedOrganization->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (telecom->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6HB09F9xEey5t-mahoHmrg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityProcedureObservationRepresentedOrganizationAddr" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6HB09V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QOcx0n3sEeyivuDeOiJBMg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityProcedureObservationRepresentedOrganizationAddr" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QOdY4H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).representedOrganization->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (addr->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6HCcAF9xEey5t-mahoHmrg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityId" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6HCcAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QOdY4X3sEeyivuDeOiJBMg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityId" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QOdY4n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6HCcAl9xEey5t-mahoHmrg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityAddr" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6HCcA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QOd_8H3sEeyivuDeOiJBMg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityAddr" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QOd_8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (addr->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6HCcBF9xEey5t-mahoHmrg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityTelecom" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6HCcBV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QOenAH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityTelecom" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QOenAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (telecom->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6HDDEF9xEey5t-mahoHmrg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityRepresentedOrganization" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6HDDEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QOfOEH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityRepresentedOrganization" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QOfOEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject(representedOrganization->one(representedOrganization : cda::Organization | not representedOrganization.oclIsUndefined() and representedOrganization.oclIsKindOf(cda::Organization)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6HDDEl9xEey5t-mahoHmrg" name="ProcedureActivityObservationProcedureObservationPerformerAssignedEntity" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6HDDE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QOfOEn3sEeyivuDeOiJBMg" name="ProcedureActivityObservationProcedureObservationPerformerAssignedEntity" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QOfOE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6IE90F9xEey5t-mahoHmrg" name="ProcedureActivityObservationEntryRelationshipProcedureObservationEncounterClassCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6IE90V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QP-b0H3sEeyivuDeOiJBMg" name="ProcedureActivityObservationEntryRelationshipProcedureObservationEncounterClassCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QP-b0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter)).encounter->excluding(null)->reject(classCode=vocab::ActClass::ENC)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6IE90l9xEey5t-mahoHmrg" name="ProcedureActivityObservationEntryRelationshipProcedureObservationEncounterMoodCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6IE9019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QP_C4H3sEeyivuDeOiJBMg" name="ProcedureActivityObservationEntryRelationshipProcedureObservationEncounterMoodCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QP_C4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter)).encounter->excluding(null)->reject(moodCode=vocab::x_DocumentEncounterMood::EVN)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6IFk4F9xEey5t-mahoHmrg" name="ProcedureActivityObservationEntryRelationshipProcedureObservationEncounterId" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6IFk4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QP_C4n3sEeyivuDeOiJBMg" name="ProcedureActivityObservationEntryRelationshipProcedureObservationEncounterId" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QP_C433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter)).encounter->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (id->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6IFk4l9xEey5t-mahoHmrg" name="ProcedureActivityObservationEntryRelationshipInversionInd" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6IFk419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QQARAH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationEntryRelationshipInversionInd" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QQARAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->reject(not inversionInd.oclIsUndefined() and inversionInd=true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6IFk5F9xEey5t-mahoHmrg" name="ProcedureActivityObservationEntryRelationshipTypeCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6IGL8F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QQA4EH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationEntryRelationshipTypeCode" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QQA4EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->reject(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6IGL8V9xEey5t-mahoHmrg" name="ProcedureActivityObservationEntryRelationshipProcedureObservationEncounter" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6IGL8l9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QQA4En3sEeyivuDeOiJBMg" name="ProcedureActivityObservationEntryRelationshipProcedureObservationEncounter" constrainedElement="_Aj7JkBg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QQA4E33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->reject(encounter->one(encounter : cda::Encounter | not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter)))</body>
         </specification>
@@ -10739,48 +10739,48 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
       <generalization xmi:id="_Aj7JkRg4EeGs5a462vYX5Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_rcWwQl9xEey5t-mahoHmrg" name="getServiceDeliveryLocations" bodyCondition="_rcWwRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rcWwRV9xEey5t-mahoHmrg" name="body" constrainedElement="_rcWwQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rcWwRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DiIQMH3sEeyivuDeOiJBMg" name="getServiceDeliveryLocations" bodyCondition="_DiIQM33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DiIQM33sEeyivuDeOiJBMg" name="body" constrainedElement="_DiIQMH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DiIQNH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getParticipantRoles()->select(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(consol::ServiceDeliveryLocation)).oclAsType(consol::ServiceDeliveryLocation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rcWwQ19xEey5t-mahoHmrg" type="_2LiHABSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rcWwRF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DiIQMX3sEeyivuDeOiJBMg" type="_2LiHABSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DiIQMn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rdIMUl9xEey5t-mahoHmrg" name="getInstructions" bodyCondition="_rdIMVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rdIMVV9xEey5t-mahoHmrg" name="body" constrainedElement="_rdIMUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rdIMVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DiljMH3sEeyivuDeOiJBMg" name="getInstructions" bodyCondition="_DiljM33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DiljM33sEeyivuDeOiJBMg" name="body" constrainedElement="_DiljMH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DiljNH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instructions))->asSequence()->any(true).oclAsType(consol::Instructions)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rdIMU19xEey5t-mahoHmrg" type="_2G8h9RSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rdIMVF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_DiljMX3sEeyivuDeOiJBMg" type="_2G8h9RSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DiljMn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rdvQUl9xEey5t-mahoHmrg" name="getIndications" bodyCondition="_rdvQVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rdvQVV9xEey5t-mahoHmrg" name="body" constrainedElement="_rdvQUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rdvQVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DjBBAH3sEeyivuDeOiJBMg" name="getIndications" bodyCondition="_DjBBA33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DjBBA33sEeyivuDeOiJBMg" name="body" constrainedElement="_DjBBAH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DjBBBH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication)).oclAsType(consol::Indication)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rdvQU19xEey5t-mahoHmrg" type="_sHrUoBUSEeG6PvUxSTZnaw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rdvQVF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DjBBAX3sEeyivuDeOiJBMg" type="_sHrUoBUSEeG6PvUxSTZnaw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DjBBAn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_reTRAl9xEey5t-mahoHmrg" name="getMedicationActivities" bodyCondition="_reTRBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_reTRBV9xEey5t-mahoHmrg" name="body" constrainedElement="_reTRAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_reTRBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DjeUAn3sEeyivuDeOiJBMg" name="getMedicationActivities" bodyCondition="_DjeUBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DjeUBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_DjeUAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DjeUBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity)).oclAsType(consol::MedicationActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_reTRA19xEey5t-mahoHmrg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_reTRBF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DjeUA33sEeyivuDeOiJBMg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DjeUBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -10837,188 +10837,188 @@ This clinical statement represents any procedure that cannot be classified as an
           <body>self.entryRelationship->select(er : cda::EntryRelationship | er.act.oclIsTypeOf(consol::Instructions))->forAll(ent : cda::EntryRelationship | ent.inversionInd=true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rOSfEF9xEey5t-mahoHmrg" name="ProcedureActivityActTemplateId" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rOTGIF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DVvaAH3sEeyivuDeOiJBMg" name="ProcedureActivityActTemplateId" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DVvaAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.12')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rOViYF9xEey5t-mahoHmrg" name="ProcedureActivityActClassCode" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rOViYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DVydUH3sEeyivuDeOiJBMg" name="ProcedureActivityActClassCode" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DVydUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rOWwgF9xEey5t-mahoHmrg" name="ProcedureActivityActMoodCode" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rOWwgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DVzEYH3sEeyivuDeOiJBMg" name="ProcedureActivityActMoodCode" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DVzEYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentActMood) and 
 let value : vocab::x_DocumentActMood = self.moodCode.oclAsType(vocab::x_DocumentActMood) in 
 value = vocab::x_DocumentActMood::EVN or value = vocab::x_DocumentActMood::INT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rO2fwF9xEey5t-mahoHmrg" name="ProcedureActivityActId" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rO2fwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DWNUEH3sEeyivuDeOiJBMg" name="ProcedureActivityActId" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DWN7IH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rO3t4F9xEey5t-mahoHmrg" name="ProcedureActivityActCode" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rO3t4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DWOiMH3sEeyivuDeOiJBMg" name="ProcedureActivityActCode" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DWOiMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rO48AF9xEey5t-mahoHmrg" name="ProcedureActivityActStatusCode" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rO48AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DWPwUH3sEeyivuDeOiJBMg" name="ProcedureActivityActStatusCode" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DWPwUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed' or value.code = 'active' or value.code = 'aborted' or value.code = 'cancelled')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rPZSUF9xEey5t-mahoHmrg" name="ProcedureActivityActEffectiveTime" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rPZ5YF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DWx70H3sEeyivuDeOiJBMg" name="ProcedureActivityActEffectiveTime" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DWx70X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rP6PsF9xEey5t-mahoHmrg" name="ProcedureActivityActPriorityCodeP" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rP6PsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DXZm4H3sEeyivuDeOiJBMg" name="ProcedureActivityActPriorityCodeP" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DXZm4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.priorityCode.oclIsUndefined() or self.priorityCode.isNullFlavorUndefined()) implies (not self.priorityCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rPagcF9xEey5t-mahoHmrg" name="ProcedureActivityActPriorityCode" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rPagcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DWyi4H3sEeyivuDeOiJBMg" name="ProcedureActivityActPriorityCode" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DWyi4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.priorityCode.oclIsUndefined() or self.priorityCode.isNullFlavorUndefined()) implies (not self.priorityCode.oclIsUndefined() and self.priorityCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.priorityCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.7' and (value.code = 'A' or value.code = 'CR' or value.code = 'CS' or value.code = 'CSP' or value.code = 'CSR' or value.code = 'EL' or value.code = 'EM' or value.code = 'P' or value.code = 'PRN' or value.code = 'R' or value.code = 'RR' or value.code = 'S' or value.code = 'T' or value.code = 'UD' or value.code = 'UR'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rY828F9xEey5t-mahoHmrg" name="ProcedureActivityActPerformer" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rY828V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_De6kIH3sEeyivuDeOiJBMg" name="ProcedureActivityActPerformer" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_De6kIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->exists(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rZd0UF9xEey5t-mahoHmrg" name="ProcedureActivityActServiceDeliveryLocation" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rZd0UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dfa6cH3sEeyivuDeOiJBMg" name="ProcedureActivityActServiceDeliveryLocation" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dfa6cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant2 | not participant.participantRole.oclIsUndefined() and participant.participantRole.oclIsKindOf(consol::ServiceDeliveryLocation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rZ_YwF9xEey5t-mahoHmrg" name="ProcedureActivityActInstructions" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rZ_YwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DgJ6QH3sEeyivuDeOiJBMg" name="ProcedureActivityActInstructions" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DgJ6QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instructions) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ragWIF9xEey5t-mahoHmrg" name="ProcedureActivityActIndication" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ragWIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DgresH3sEeyivuDeOiJBMg" name="ProcedureActivityActIndication" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DgresX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rbChoF9xEey5t-mahoHmrg" name="ProcedureActivityActMedicationActivity" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rbChoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DhL1AH3sEeyivuDeOiJBMg" name="ProcedureActivityActMedicationActivity" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DhL1AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::MedicationActivity) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uFShYF9xEey5t-mahoHmrg" name="ProcedureActivityActEntryRelationship" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uFShYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ftjl8H3sEeyivuDeOiJBMg" name="ProcedureActivityActEntryRelationship" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ftjl8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->select(entryRelationship : cda::EntryRelationship | not entryRelationship.oclIsUndefined() and entryRelationship.oclIsKindOf(cda::EntryRelationship))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Jmn0F9xEey5t-mahoHmrg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationId" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Jmn0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QSlD4H3sEeyivuDeOiJBMg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationId" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QSlD4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).representedOrganization->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Jmn0l9xEey5t-mahoHmrg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationName" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Jmn019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QSlq8H3sEeyivuDeOiJBMg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationName" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QSlq8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).representedOrganization->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (not name->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6JnO4F9xEey5t-mahoHmrg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationTelecom" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6JnO4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QSmSAH3sEeyivuDeOiJBMg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationTelecom" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QSmSAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).representedOrganization->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (telecom->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6JnO4l9xEey5t-mahoHmrg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationAddr" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6JnO419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QSm5EH3sEeyivuDeOiJBMg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationAddr" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QSm5EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).representedOrganization->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (addr->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6JnO5F9xEey5t-mahoHmrg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityId" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6JnO5V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QSngIH3sEeyivuDeOiJBMg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityId" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QSngIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Jn18F9xEey5t-mahoHmrg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityAddr" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Jn18V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QSngIn3sEeyivuDeOiJBMg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityAddr" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QSngI33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (addr->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Jn18l9xEey5t-mahoHmrg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityTelecom" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Jn1819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QSngJH3sEeyivuDeOiJBMg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityTelecom" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QSngJX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (telecom->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Jn19F9xEey5t-mahoHmrg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityRepresentedOrganization" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Jn19V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QSouQH3sEeyivuDeOiJBMg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityRepresentedOrganization" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QSouQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject(representedOrganization->one(representedOrganization : cda::Organization | not representedOrganization.oclIsUndefined() and representedOrganization.oclIsKindOf(cda::Organization)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6JodAF9xEey5t-mahoHmrg" name="ProcedureActivityActProcedureActPerformerAssignedEntity" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6JodAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QSpVUH3sEeyivuDeOiJBMg" name="ProcedureActivityActProcedureActPerformerAssignedEntity" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QSpVUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6K3MEF9xEey5t-mahoHmrg" name="ProcedureActivityActEntryRelationshipProcedureActEncounterClassCode" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6K3MEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QUGt4H3sEeyivuDeOiJBMg" name="ProcedureActivityActEntryRelationshipProcedureActEncounterClassCode" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QUGt4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter)).encounter->excluding(null)->reject(classCode=vocab::ActClass::ENC)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6K3zIF9xEey5t-mahoHmrg" name="ProcedureActivityActEntryRelationshipProcedureActEncounterMoodCode" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6K3zIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QUHU8H3sEeyivuDeOiJBMg" name="ProcedureActivityActEntryRelationshipProcedureActEncounterMoodCode" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QUHU8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter)).encounter->excluding(null)->reject(moodCode=vocab::x_DocumentEncounterMood::EVN)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6K3zIl9xEey5t-mahoHmrg" name="ProcedureActivityActEntryRelationshipProcedureActEncounterId" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6K3zI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QUHU8n3sEeyivuDeOiJBMg" name="ProcedureActivityActEntryRelationshipProcedureActEncounterId" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QUHU833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter)).encounter->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (id->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6K4aMF9xEey5t-mahoHmrg" name="ProcedureActivityActEntryRelationshipInversionInd" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6K4aMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QUH8AH3sEeyivuDeOiJBMg" name="ProcedureActivityActEntryRelationshipInversionInd" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QUH8AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->reject(not inversionInd.oclIsUndefined() and inversionInd=true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6K4aMl9xEey5t-mahoHmrg" name="ProcedureActivityActEntryRelationshipTypeCode" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6K4aM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QUH8An3sEeyivuDeOiJBMg" name="ProcedureActivityActEntryRelationshipTypeCode" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QUH8A33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->reject(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6K5BQF9xEey5t-mahoHmrg" name="ProcedureActivityActEntryRelationshipProcedureActEncounter" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6K5BQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QUIjEH3sEeyivuDeOiJBMg" name="ProcedureActivityActEntryRelationshipProcedureActEncounter" constrainedElement="_awdH4Bg4EeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QUIjEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter))->reject(encounter->one(encounter : cda::Encounter | not encounter.oclIsUndefined() and encounter.oclIsKindOf(cda::Encounter)))</body>
         </specification>
@@ -11026,48 +11026,48 @@ value.codeSystem = '2.16.840.1.113883.5.7' and (value.code = 'A' or value.code =
       <generalization xmi:id="_awdH4Rg4EeGs5a462vYX5Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_rZd0Ul9xEey5t-mahoHmrg" name="getServiceDeliveryLocations" bodyCondition="_rZd0VV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rZd0VV9xEey5t-mahoHmrg" name="body" constrainedElement="_rZd0Ul9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rZd0Vl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Dfa6cn3sEeyivuDeOiJBMg" name="getServiceDeliveryLocations" bodyCondition="_Dfbhgn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Dfbhgn3sEeyivuDeOiJBMg" name="body" constrainedElement="_Dfa6cn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dfbhg33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getParticipantRoles()->select(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(consol::ServiceDeliveryLocation)).oclAsType(consol::ServiceDeliveryLocation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rZd0U19xEey5t-mahoHmrg" type="_2LiHABSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rZd0VF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DfbhgH3sEeyivuDeOiJBMg" type="_2LiHABSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DfbhgX3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rZ_Ywl9xEey5t-mahoHmrg" name="getInstructions" bodyCondition="_rZ_YxV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rZ_YxV9xEey5t-mahoHmrg" name="body" constrainedElement="_rZ_Ywl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rZ_Yxl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DgJ6Qn3sEeyivuDeOiJBMg" name="getInstructions" bodyCondition="_DgJ6RX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DgJ6RX3sEeyivuDeOiJBMg" name="body" constrainedElement="_DgJ6Qn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DgJ6Rn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instructions))->asSequence()->any(true).oclAsType(consol::Instructions)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rZ_Yw19xEey5t-mahoHmrg" type="_2G8h9RSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rZ_YxF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_DgJ6Q33sEeyivuDeOiJBMg" type="_2G8h9RSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DgJ6RH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rag9MF9xEey5t-mahoHmrg" name="getIndications" bodyCondition="_rag9M19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rag9M19xEey5t-mahoHmrg" name="body" constrainedElement="_rag9MF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rag9NF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Dgresn3sEeyivuDeOiJBMg" name="getIndications" bodyCondition="_DgretX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DgretX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Dgresn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dgretn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication)).oclAsType(consol::Indication)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rag9MV9xEey5t-mahoHmrg" type="_sHrUoBUSEeG6PvUxSTZnaw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rag9Ml9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Dgres33sEeyivuDeOiJBMg" type="_sHrUoBUSEeG6PvUxSTZnaw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DgretH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_rbChol9xEey5t-mahoHmrg" name="getMedicationActivities" bodyCondition="_rbChpV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rbChpV9xEey5t-mahoHmrg" name="body" constrainedElement="_rbChol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rbChpl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DhL1An3sEeyivuDeOiJBMg" name="getMedicationActivities" bodyCondition="_DhL1BX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DhL1BX3sEeyivuDeOiJBMg" name="body" constrainedElement="_DhL1An3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DhL1Bn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity)).oclAsType(consol::MedicationActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rbCho19xEey5t-mahoHmrg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rbChpF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DhL1A33sEeyivuDeOiJBMg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DhL1BH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -11076,44 +11076,44 @@ value.codeSystem = '2.16.840.1.113883.5.7' and (value.code = 'A' or value.code =
         <body>An Authorization Activity represents authorizations or pre-authorizations currently active for the patient for the particular payer. &#xD;
 Authorizations are represented using an act subordinate to the policy or program that provided it.  The authorization refers to the policy or program. Authorized treatments can be grouped into an organizer class, where common properties, such as the reason for the authorization, can be expressed. Subordinate acts represent what was authorized.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rQuvEF9xEey5t-mahoHmrg" name="AuthorizationActivityTemplateId" constrainedElement="_XUoXwBnZEeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rQuvEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DYKb4H3sEeyivuDeOiJBMg" name="AuthorizationActivityTemplateId" constrainedElement="_XUoXwBnZEeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DYKb4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.1.19')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rQv9MF9xEey5t-mahoHmrg" name="AuthorizationActivityClassCode" constrainedElement="_XUoXwBnZEeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rQv9MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DYLqAH3sEeyivuDeOiJBMg" name="AuthorizationActivityClassCode" constrainedElement="_XUoXwBnZEeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DYLqAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rQxLUF9xEey5t-mahoHmrg" name="AuthorizationActivityId" constrainedElement="_XUoXwBnZEeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rQxLUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DYM4IH3sEeyivuDeOiJBMg" name="AuthorizationActivityId" constrainedElement="_XUoXwBnZEeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DYM4IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (self.id->size() =  1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rQyZcF9xEey5t-mahoHmrg" name="AuthorizationActivityMoodCode" constrainedElement="_XUoXwBnZEeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rQyZcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DYOGQH3sEeyivuDeOiJBMg" name="AuthorizationActivityMoodCode" constrainedElement="_XUoXwBnZEeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DYOGQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uBWckF9xEey5t-mahoHmrg" name="AuthorizationActivityEntryRelationship" constrainedElement="_XUoXwBnZEeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uBWckV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FqMI4H3sEeyivuDeOiJBMg" name="AuthorizationActivityEntryRelationship" constrainedElement="_XUoXwBnZEeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FqMI4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->select(entryRelationship : cda::EntryRelationship | not entryRelationship.oclIsUndefined() and entryRelationship.oclIsKindOf(cda::EntryRelationship))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6LalsF9xEey5t-mahoHmrg" name="AuthorizationActivityEntryRelationshipHasClinicalStatement" constrainedElement="_XUoXwBnZEeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6LalsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QU270H3sEeyivuDeOiJBMg" name="AuthorizationActivityEntryRelationshipHasClinicalStatement" constrainedElement="_XUoXwBnZEeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QU3i4H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->reject(act->exists(moodCode = vocab::x_DocumentActMood::PRMS) or  encounter->exists(moodCode = vocab::x_DocumentEncounterMood::PRMS) or observation->exists(moodCode = vocab::x_ActMoodDocumentObservation::PRMS) or  observationMedia->exists(moodCode = vocab::ActMood::PRMS) or organizer->exists(moodCode = vocab::ActMood::PRMS) or procedure->exists(moodCode = vocab::x_DocumentProcedureMood::PRMS) or  regionOfInterest->exists(moodCode = vocab::ActMood::PRMS) or substanceAdministration->exists(moodCode = vocab::x_DocumentSubstanceMood::PRMS) or  supply->exists(moodCode = vocab::x_DocumentSubstanceMood::PRMS))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6LbMwF9xEey5t-mahoHmrg" name="AuthorizationActivityEntryRelationshipHasAuthorizedPerformers" constrainedElement="_XUoXwBnZEeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6LbMwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QU3i4X3sEeyivuDeOiJBMg" name="AuthorizationActivityEntryRelationshipHasAuthorizedPerformers" constrainedElement="_XUoXwBnZEeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QU3i4n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->reject(act->forAll( (moodCode = vocab::x_DocumentActMood::PRMS and performer->size() > 0) or moodCode &lt;> vocab::x_DocumentActMood::PRMS ) and &#xD;
 encounter->forAll((moodCode = vocab::x_DocumentEncounterMood::PRMS and performer->size() > 0) or moodCode &lt;>  vocab::x_DocumentEncounterMood::PRMS) and &#xD;
@@ -11126,8 +11126,8 @@ substanceAdministration->forAll((moodCode = vocab::x_DocumentSubstanceMood::PRMS
 supply->forAll((moodCode = vocab::x_DocumentSubstanceMood::PRMS and performer->size() > 0) or moodCode &lt;>  vocab::x_DocumentSubstanceMood::PRMS))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6LbMwl9xEey5t-mahoHmrg" name="AuthorizationActivityEntryRelationshipTypeCode" constrainedElement="_XUoXwBnZEeGs5a462vYX5Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6LbMw19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QU3i433sEeyivuDeOiJBMg" name="AuthorizationActivityEntryRelationshipTypeCode" constrainedElement="_XUoXwBnZEeGs5a462vYX5Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QU3i5H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->reject(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
@@ -11155,62 +11155,62 @@ supply->forAll((moodCode = vocab::x_DocumentSubstanceMood::PRMS and performer->s
           <body>self.product.manufacturedProduct.oclIsTypeOf(consol::MedicationInformation) xor self.product.manufacturedProduct.oclIsTypeOf(consol::ImmunizationMedicationInformation)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rRx38F9xEey5t-mahoHmrg" name="MedicationSupplyOrderTemplateId" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rRx38V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DZG3EX3sEeyivuDeOiJBMg" name="MedicationSupplyOrderTemplateId" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DZG3En3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.17')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rRztIF9xEey5t-mahoHmrg" name="MedicationSupplyOrderClassCode" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rRztIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DZIsQH3sEeyivuDeOiJBMg" name="MedicationSupplyOrderClassCode" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DZIsQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassSupply::SPLY</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rR07QF9xEey5t-mahoHmrg" name="MedicationSupplyOrderMoodCode" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rR07QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DZJ6YH3sEeyivuDeOiJBMg" name="MedicationSupplyOrderMoodCode" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DZJ6YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentSubstanceMood::INT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rR2JYF9xEey5t-mahoHmrg" name="MedicationSupplyOrderId" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rR2JYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DZLIgH3sEeyivuDeOiJBMg" name="MedicationSupplyOrderId" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DZLIgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rR3XgF9xEey5t-mahoHmrg" name="MedicationSupplyOrderStatusCode" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rR3XgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DZMWoH3sEeyivuDeOiJBMg" name="MedicationSupplyOrderStatusCode" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DZMWoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rR5MsF9xEey5t-mahoHmrg" name="MedicationSupplyOrderEffectiveTime" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rR5MsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DZNkwH3sEeyivuDeOiJBMg" name="MedicationSupplyOrderEffectiveTime" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DZNkwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime->isEmpty() or self.effectiveTime->exists(element | element.isNullFlavorUndefined())) implies (( not self.effectiveTime->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rR7B4F9xEey5t-mahoHmrg" name="MedicationSupplyOrderRepeatNumber" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rR7B4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DZOy4H3sEeyivuDeOiJBMg" name="MedicationSupplyOrderRepeatNumber" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DZOy4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.repeatNumber.oclIsUndefined() or self.repeatNumber.isNullFlavorUndefined()) implies (not self.repeatNumber.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rR83EF9xEey5t-mahoHmrg" name="MedicationSupplyOrderQuantity" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rR83EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DZPZ8H3sEeyivuDeOiJBMg" name="MedicationSupplyOrderQuantity" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DZPZ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.quantity.oclIsUndefined() or self.quantity.isNullFlavorUndefined()) implies (not self.quantity.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rSxWcF9xEey5t-mahoHmrg" name="MedicationSupplyOrderAuthor" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rSxWcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DZqQsH3sEeyivuDeOiJBMg" name="MedicationSupplyOrderAuthor" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DZqQsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->one(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(rim::Participation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rTRswF9xEey5t-mahoHmrg" name="MedicationSupplyOrderInstructions" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rTRswV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DaFHcH3sEeyivuDeOiJBMg" name="MedicationSupplyOrderInstructions" constrainedElement="_j3aTQBrTEeGo461UQq-B1g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DaFugH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instructions) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
@@ -11218,15 +11218,15 @@ supply->forAll((moodCode = vocab::x_DocumentSubstanceMood::PRMS and performer->s
       <generalization xmi:id="_j3aTQRrTEeGo461UQq-B1g">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_3gL0sEbuEd6besF9iFIJkQ"/>
       </generalization>
-      <ownedOperation xmi:id="_rTRswl9xEey5t-mahoHmrg" name="getInstructions" bodyCondition="_rTRsxV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rTRsxV9xEey5t-mahoHmrg" name="body" constrainedElement="_rTRswl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rTRsxl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DaFugX3sEeyivuDeOiJBMg" name="getInstructions" bodyCondition="_DaFuhH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DaFuhH3sEeyivuDeOiJBMg" name="body" constrainedElement="_DaFugX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DaFuhX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instructions))->asSequence()->any(true).oclAsType(consol::Instructions)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rTRsw19xEey5t-mahoHmrg" type="_2G8h9RSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rTRsxF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_DaFugn3sEeyivuDeOiJBMg" type="_2G8h9RSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DaFug33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -11234,42 +11234,42 @@ supply->forAll((moodCode = vocab::x_DocumentSubstanceMood::PRMS and performer->s
       <ownedComment xmi:id="_rEXPUDyXEeGOm9opnDhYAQ">
         <body>This clinical statement represents the anticipated date when a woman will give birth.</body>
       </ownedComment>
-      <ownedRule xmi:id="_reT4EF9xEey5t-mahoHmrg" name="EstimatedDateOfDeliveryTemplateId" constrainedElement="_vBswQBtpEeGT89b80j3MTg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_reT4EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DjeUB33sEeyivuDeOiJBMg" name="EstimatedDateOfDeliveryTemplateId" constrainedElement="_vBswQBtpEeGT89b80j3MTg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dje7EH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.15.3.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_reVGMF9xEey5t-mahoHmrg" name="EstimatedDateOfDeliveryClassCode" constrainedElement="_vBswQBtpEeGT89b80j3MTg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_reVGMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DjgJMH3sEeyivuDeOiJBMg" name="EstimatedDateOfDeliveryClassCode" constrainedElement="_vBswQBtpEeGT89b80j3MTg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DjgJMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_reW7YF9xEey5t-mahoHmrg" name="EstimatedDateOfDeliveryCode" constrainedElement="_vBswQBtpEeGT89b80j3MTg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_reW7YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DjhXUH3sEeyivuDeOiJBMg" name="EstimatedDateOfDeliveryCode" constrainedElement="_vBswQBtpEeGT89b80j3MTg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DjhXUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '11778-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_reZXoF9xEey5t-mahoHmrg" name="EstimatedDateOfDeliveryMoodCode" constrainedElement="_vBswQBtpEeGT89b80j3MTg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_reZXoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DjilcH3sEeyivuDeOiJBMg" name="EstimatedDateOfDeliveryMoodCode" constrainedElement="_vBswQBtpEeGT89b80j3MTg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DjilcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rebM0F9xEey5t-mahoHmrg" name="EstimatedDateOfDeliveryStatusCode" constrainedElement="_vBswQBtpEeGT89b80j3MTg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rebz4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DjjzkH3sEeyivuDeOiJBMg" name="EstimatedDateOfDeliveryStatusCode" constrainedElement="_vBswQBtpEeGT89b80j3MTg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DjjzkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_redpEF9xEey5t-mahoHmrg" name="EstimatedDateOfDeliveryValue" constrainedElement="_vBswQBtpEeGT89b80j3MTg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_redpEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DjlBsH3sEeyivuDeOiJBMg" name="EstimatedDateOfDeliveryValue" constrainedElement="_vBswQBtpEeGT89b80j3MTg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DjlBsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::TS)))</body>
         </specification>
@@ -11282,40 +11282,40 @@ value.code = 'completed')</body>
       <ownedComment xmi:id="_2Poj4hSVEeGGzu7fmW9pXw" annotatedElement="_2PidURSVEeGGzu7fmW9pXw">
         <body>The Hospital Discharge Diagnosis section describes the relevant problems or diagnoses at the time of discharge that occurred during the hospitalization or that need to be followed after hospitalization. This section includes an optional entry to record patient conditions.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rkXcxV9xEey5t-mahoHmrg" name="HospitalDischargeDiagnosisSectionTemplateId" constrainedElement="_2PidURSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkYD0F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dn6IEH3sEeyivuDeOiJBMg" name="HospitalDischargeDiagnosisSectionTemplateId" constrainedElement="_2PidURSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dn6IEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.24')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rkZR8F9xEey5t-mahoHmrg" name="HospitalDischargeDiagnosisSectionCode" constrainedElement="_2PidURSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkZR8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dn6vIH3sEeyivuDeOiJBMg" name="HospitalDischargeDiagnosisSectionCode" constrainedElement="_2PidURSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dn6vIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '11535-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rkbHIF9xEey5t-mahoHmrg" name="HospitalDischargeDiagnosisSectionCodeP" constrainedElement="_2PidURSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkbHIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dn8kUH3sEeyivuDeOiJBMg" name="HospitalDischargeDiagnosisSectionCodeP" constrainedElement="_2PidURSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dn8kUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rkc8UF9xEey5t-mahoHmrg" name="HospitalDischargeDiagnosisSectionTitle" constrainedElement="_2PidURSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkc8UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dn9ycH3sEeyivuDeOiJBMg" name="HospitalDischargeDiagnosisSectionTitle" constrainedElement="_2PidURSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dn9ycX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rkexgF9xEey5t-mahoHmrg" name="HospitalDischargeDiagnosisSectionText" constrainedElement="_2PidURSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkexgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dn_AkH3sEeyivuDeOiJBMg" name="HospitalDischargeDiagnosisSectionText" constrainedElement="_2PidURSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dn_AkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rp4O4F9xEey5t-mahoHmrg" name="HospitalDischargeDiagnosisSectionHospitalDischargeDiagnosis" constrainedElement="_2PidURSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rp4O4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ds2ScH3sEeyivuDeOiJBMg" name="HospitalDischargeDiagnosisSectionHospitalDischargeDiagnosis" constrainedElement="_2PidURSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ds2ScX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->one(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::HospitalDischargeDiagnosis))</body>
         </specification>
@@ -11323,15 +11323,15 @@ value.code = '11535-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_2Poj4xSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_rp418F9xEey5t-mahoHmrg" name="getHospitalDischargeDiagnosis" bodyCondition="_rp41819xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rp41819xEey5t-mahoHmrg" name="body" constrainedElement="_rp418F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rp419F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ds2Scn3sEeyivuDeOiJBMg" name="getHospitalDischargeDiagnosis" bodyCondition="_Ds2SdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ds2SdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ds2Scn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ds2Sdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::HospitalDischargeDiagnosis))->asSequence()->any(true).oclAsType(consol::HospitalDischargeDiagnosis)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rp418V9xEey5t-mahoHmrg" type="_KtwVgCULEeGiOPpZVnfEJA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rp418l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Ds2Sc33sEeyivuDeOiJBMg" type="_KtwVgCULEeGiOPpZVnfEJA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ds2SdH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -11339,40 +11339,40 @@ value.code = '11535-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_2Poj-hSVEeGGzu7fmW9pXw" annotatedElement="_2Poj7RSVEeGGzu7fmW9pXw">
         <body>The Hospital Discharge Medications section defines the medications that the patient is intended to take (or stop) after discharge. The currently active medications must be listed. The section may also include a patient's prescription history and indicate the source of the medication list, for example, from a pharmacy system versus from the patient.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rkf_oF9xEey5t-mahoHmrg" name="HospitalDischargeMedicationsSectionEntriesOptionalTemplateId" constrainedElement="_2Poj7RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkf_oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dn_noH3sEeyivuDeOiJBMg" name="HospitalDischargeMedicationsSectionEntriesOptionalTemplateId" constrainedElement="_2Poj7RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoAOsH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.11')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rkhNwF9xEey5t-mahoHmrg" name="HospitalDischargeMedicationsSectionEntriesOptionalCode" constrainedElement="_2Poj7RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkhNwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoA1wH3sEeyivuDeOiJBMg" name="HospitalDischargeMedicationsSectionEntriesOptionalCode" constrainedElement="_2Poj7RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoA1wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10183-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rkjC8F9xEey5t-mahoHmrg" name="HospitalDischargeMedicationsSectionEntriesOptionalCodeP" constrainedElement="_2Poj7RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkjC8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoCD4H3sEeyivuDeOiJBMg" name="HospitalDischargeMedicationsSectionEntriesOptionalCodeP" constrainedElement="_2Poj7RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoCD4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rkk4IF9xEey5t-mahoHmrg" name="HospitalDischargeMedicationsSectionEntriesOptionalTitle" constrainedElement="_2Poj7RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkk4IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoDSAH3sEeyivuDeOiJBMg" name="HospitalDischargeMedicationsSectionEntriesOptionalTitle" constrainedElement="_2Poj7RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoDSAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rkmtUF9xEey5t-mahoHmrg" name="HospitalDischargeMedicationsSectionEntriesOptionalText" constrainedElement="_2Poj7RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkmtUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoFHMH3sEeyivuDeOiJBMg" name="HospitalDischargeMedicationsSectionEntriesOptionalText" constrainedElement="_2Poj7RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoFHMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rqVh4F9xEey5t-mahoHmrg" name="HospitalDischargeMedicationsSectionEntriesOptionalDischargeMedication" constrainedElement="_2Poj7RSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rqVh4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DtRwQH3sEeyivuDeOiJBMg" name="HospitalDischargeMedicationsSectionEntriesOptionalDischargeMedication" constrainedElement="_2Poj7RSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DtRwQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::DischargeMedication))</body>
         </specification>
@@ -11380,15 +11380,15 @@ value.code = '10183-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_2Poj-xSVEeGGzu7fmW9pXw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_rqWI8F9xEey5t-mahoHmrg" name="getDischargeMedications" bodyCondition="_rqWI819xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rqWI819xEey5t-mahoHmrg" name="body" constrainedElement="_rqWI8F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rqWI9F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DtRwQn3sEeyivuDeOiJBMg" name="getDischargeMedications" bodyCondition="_DtRwRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DtRwRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_DtRwQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DtRwRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::DischargeMedication)).oclAsType(consol::DischargeMedication)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rqWI8V9xEey5t-mahoHmrg" type="_hD-z0CUPEeGiOPpZVnfEJA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rqWI8l9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DtRwQ33sEeyivuDeOiJBMg" type="_hD-z0CUPEeGiOPpZVnfEJA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DtRwRH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -11396,34 +11396,34 @@ value.code = '10183-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_2RqkPBSVEeGGzu7fmW9pXw" annotatedElement="_2RqkOxSVEeGGzu7fmW9pXw">
         <body>The Hospital Course section describes the sequence of events from admission to discharge in a hospital facility.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rkoigF9xEey5t-mahoHmrg" name="HospitalCourseSectionTemplateId" constrainedElement="_2RqkOxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkoigV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoFuQH3sEeyivuDeOiJBMg" name="HospitalCourseSectionTemplateId" constrainedElement="_2RqkOxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoFuQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '1.3.6.1.4.1.19376.1.5.3.1.3.5')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rkpwoF9xEey5t-mahoHmrg" name="HospitalCourseSectionCode" constrainedElement="_2RqkOxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkpwoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoG8YH3sEeyivuDeOiJBMg" name="HospitalCourseSectionCode" constrainedElement="_2RqkOxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoG8YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '8648-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rkrl0F9xEey5t-mahoHmrg" name="HospitalCourseSectionCodeP" constrainedElement="_2RqkOxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkrl0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoIKgH3sEeyivuDeOiJBMg" name="HospitalCourseSectionCodeP" constrainedElement="_2RqkOxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoIKgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rksz8F9xEey5t-mahoHmrg" name="HospitalCourseSectionTitle" constrainedElement="_2RqkOxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rksz8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoJYoH3sEeyivuDeOiJBMg" name="HospitalCourseSectionTitle" constrainedElement="_2RqkOxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoJYoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rkupIF9xEey5t-mahoHmrg" name="HospitalCourseSectionText" constrainedElement="_2RqkOxSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkupIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoKmwH3sEeyivuDeOiJBMg" name="HospitalCourseSectionText" constrainedElement="_2RqkOxSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoLN0H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
@@ -11436,34 +11436,34 @@ value.code = '8648-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_2Uz-5BSVEeGGzu7fmW9pXw" annotatedElement="_2Uz-4xSVEeGGzu7fmW9pXw">
         <body>This section records a narrative description of the expectations for diet, including proposals, goals, and order requests for monitoring, tracking, or improving the dietary control of the patient, used in a discharge from a facility such as an emergency department, hospital, or nursing home.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rkv3QF9xEey5t-mahoHmrg" name="DischargeDietSectionTemplateId" constrainedElement="_2Uz-4xSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkv3QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoL04H3sEeyivuDeOiJBMg" name="DischargeDietSectionTemplateId" constrainedElement="_2Uz-4xSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoL04X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '1.3.6.1.4.1.19376.1.5.3.1.3.33')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rkweUF9xEey5t-mahoHmrg" name="DischargeDietSectionCode" constrainedElement="_2Uz-4xSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkweUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoMb8H3sEeyivuDeOiJBMg" name="DischargeDietSectionCode" constrainedElement="_2Uz-4xSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoNDAH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '42344-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rkyTgF9xEey5t-mahoHmrg" name="DischargeDietSectionCodeP" constrainedElement="_2Uz-4xSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkyTgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoORIH3sEeyivuDeOiJBMg" name="DischargeDietSectionCodeP" constrainedElement="_2Uz-4xSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoORIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rk0IsF9xEey5t-mahoHmrg" name="DischargeDietSectionTitle" constrainedElement="_2Uz-4xSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rk0IsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoPfQH3sEeyivuDeOiJBMg" name="DischargeDietSectionTitle" constrainedElement="_2Uz-4xSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoPfQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rk1W0F9xEey5t-mahoHmrg" name="DischargeDietSectionText" constrainedElement="_2Uz-4xSVEeGGzu7fmW9pXw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rk1W0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoQtYH3sEeyivuDeOiJBMg" name="DischargeDietSectionText" constrainedElement="_2Uz-4xSVEeGGzu7fmW9pXw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoQtYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
@@ -11480,34 +11480,34 @@ Imaging results are typically generated by a clinician reviewing the output of a
 Procedure results are typically generated by a clinician wanting to provide more granular information about component observations made during the performance of a procedure, such as when a gastroenterologist reports the size of a polyp observed during a colonoscopy.&#xD;
 Note that there are discrepancies between CCD and the lab domain model, such as the effectiveTime in specimen collection.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rk194F9xEey5t-mahoHmrg" name="HospitalDischargeStudiesSummarySectionTemplateId" constrainedElement="_38AXoCUTEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rk2k8F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoYpMH3sEeyivuDeOiJBMg" name="HospitalDischargeStudiesSummarySectionTemplateId" constrainedElement="_38AXoCUTEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoZQQH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.16')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rk3MAF9xEey5t-mahoHmrg" name="HospitalDischargeStudiesSummarySectionCode" constrainedElement="_38AXoCUTEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rk3MAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoZ3UH3sEeyivuDeOiJBMg" name="HospitalDischargeStudiesSummarySectionCode" constrainedElement="_38AXoCUTEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoZ3UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '11493-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rk5BMF9xEey5t-mahoHmrg" name="HospitalDischargeStudiesSummarySectionCodeP" constrainedElement="_38AXoCUTEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rk5BMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DobsgH3sEeyivuDeOiJBMg" name="HospitalDischargeStudiesSummarySectionCodeP" constrainedElement="_38AXoCUTEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DobsgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rk6PUF9xEey5t-mahoHmrg" name="HospitalDischargeStudiesSummarySectionTitle" constrainedElement="_38AXoCUTEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rk6PUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DodhsH3sEeyivuDeOiJBMg" name="HospitalDischargeStudiesSummarySectionTitle" constrainedElement="_38AXoCUTEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DodhsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rk8EgF9xEey5t-mahoHmrg" name="HospitalDischargeStudiesSummarySectionText" constrainedElement="_38AXoCUTEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rk8EgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Doev0H3sEeyivuDeOiJBMg" name="HospitalDischargeStudiesSummarySectionText" constrainedElement="_38AXoCUTEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Doev0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
@@ -11520,32 +11520,32 @@ value.code = '11493-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_j_-q4CUPEeGiOPpZVnfEJA">
         <body>The Discharge Medications entry codes medications that the patient is intended to take (or stop) after discharge.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rjc2wF9xEey5t-mahoHmrg" name="DischargeMedicationMedicationActivity" constrainedElement="_hD-z0CUPEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rjc2wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DnZKsH3sEeyivuDeOiJBMg" name="DischargeMedicationMedicationActivity" constrainedElement="_hD-z0CUPEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DnZKsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::MedicationActivity) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rk8rkF9xEey5t-mahoHmrg" name="DischargeMedicationTemplateId" constrainedElement="_hD-z0CUPEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rk8rkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dof98H3sEeyivuDeOiJBMg" name="DischargeMedicationTemplateId" constrainedElement="_hD-z0CUPEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dof98X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.35')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rk-gwF9xEey5t-mahoHmrg" name="DischargeMedicationClassCode" constrainedElement="_hD-z0CUPEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rk-gwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DohMEH3sEeyivuDeOiJBMg" name="DischargeMedicationClassCode" constrainedElement="_hD-z0CUPEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DohMEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rk_u4F9xEey5t-mahoHmrg" name="DischargeMedicationMoodCode" constrainedElement="_hD-z0CUPEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rk_u4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DojBQH3sEeyivuDeOiJBMg" name="DischargeMedicationMoodCode" constrainedElement="_hD-z0CUPEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DojBQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rlA9AF9xEey5t-mahoHmrg" name="DischargeMedicationCode" constrainedElement="_hD-z0CUPEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rlA9AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DokPYH3sEeyivuDeOiJBMg" name="DischargeMedicationCode" constrainedElement="_hD-z0CUPEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DokPYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
@@ -11555,15 +11555,15 @@ value.code = '10183-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_hD_a4CUPEeGiOPpZVnfEJA">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_rjdd0V9xEey5t-mahoHmrg" name="getMedicationActivities" bodyCondition="_rjdd1F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rjdd1F9xEey5t-mahoHmrg" name="body" constrainedElement="_rjdd0V9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rjdd1V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_DnZxwX3sEeyivuDeOiJBMg" name="getMedicationActivities" bodyCondition="_DnZxxH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_DnZxxH3sEeyivuDeOiJBMg" name="body" constrainedElement="_DnZxwX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_DnZxxX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity)).oclAsType(consol::MedicationActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rjdd0l9xEey5t-mahoHmrg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rjdd019xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_DnZxwn3sEeyivuDeOiJBMg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DnZxw33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -11571,32 +11571,32 @@ value.code = '10183-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_QGxBkCULEeGiOPpZVnfEJA">
         <body>The Hospital Discharge Diagnosis act wraps relevant problems or diagnoses at the time of discharge that occurred during the hospitalization or that need to be followed after hospitalization. This entry requires at least one Problem Observation entry.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rkW1sF9xEey5t-mahoHmrg" name="HospitalDischargeDiagnosisProblemObservation" constrainedElement="_KtwVgCULEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkW1sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dn5hAH3sEeyivuDeOiJBMg" name="HospitalDischargeDiagnosisProblemObservation" constrainedElement="_KtwVgCULEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dn5hAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rlCyMF9xEey5t-mahoHmrg" name="HospitalDischargeDiagnosisTemplateId" constrainedElement="_KtwVgCULEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rlCyMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DomEkH3sEeyivuDeOiJBMg" name="HospitalDischargeDiagnosisTemplateId" constrainedElement="_KtwVgCULEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DomEkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.33')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rlEAUF9xEey5t-mahoHmrg" name="HospitalDischargeDiagnosisClassCode" constrainedElement="_KtwVgCULEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rlEAUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DonSsH3sEeyivuDeOiJBMg" name="HospitalDischargeDiagnosisClassCode" constrainedElement="_KtwVgCULEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DonSsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rlF1gF9xEey5t-mahoHmrg" name="HospitalDischargeDiagnosisMoodCode" constrainedElement="_KtwVgCULEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rlF1gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DopH4H3sEeyivuDeOiJBMg" name="HospitalDischargeDiagnosisMoodCode" constrainedElement="_KtwVgCULEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DopH4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rlHDoF9xEey5t-mahoHmrg" name="HospitalDischargeDiagnosisCode" constrainedElement="_KtwVgCULEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rlHDoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoqWAH3sEeyivuDeOiJBMg" name="HospitalDischargeDiagnosisCode" constrainedElement="_KtwVgCULEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoqWAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
@@ -11606,15 +11606,15 @@ value.code = '11535-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_Ktw8kCULEeGiOPpZVnfEJA">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_rkXcwF9xEey5t-mahoHmrg" name="getProblemObservations" bodyCondition="_rkXcw19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rkXcw19xEey5t-mahoHmrg" name="body" constrainedElement="_rkXcwF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rkXcxF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Dn5hA33sEeyivuDeOiJBMg" name="getProblemObservations" bodyCondition="_Dn5hBn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Dn5hBn3sEeyivuDeOiJBMg" name="body" constrainedElement="_Dn5hA33sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dn5hB33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation)).oclAsType(consol::ProblemObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rkXcwV9xEey5t-mahoHmrg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rkXcwl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Dn5hBH3sEeyivuDeOiJBMg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Dn5hBX3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -11622,34 +11622,34 @@ value.code = '11535-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_YHIqECUOEeGiOPpZVnfEJA">
         <body>The Hospital Discharge Instructions section records instructions at discharge.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rlIRwF9xEey5t-mahoHmrg" name="HospitalDischargeInstructionsSectionTemplateId" constrainedElement="_lBergCUMEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rlI40F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DorkIH3sEeyivuDeOiJBMg" name="HospitalDischargeInstructionsSectionTemplateId" constrainedElement="_lBergCUMEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DosLMH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.41')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rlJf4F9xEey5t-mahoHmrg" name="HospitalDischargeInstructionsSectionCode" constrainedElement="_lBergCUMEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rlJf4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DosyQH3sEeyivuDeOiJBMg" name="HospitalDischargeInstructionsSectionCode" constrainedElement="_lBergCUMEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DosyQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '8653-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rlLVEF9xEey5t-mahoHmrg" name="HospitalDischargeInstructionsSectionCodeP" constrainedElement="_lBergCUMEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rlLVEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DouncH3sEeyivuDeOiJBMg" name="HospitalDischargeInstructionsSectionCodeP" constrainedElement="_lBergCUMEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DouncX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rlMjMF9xEey5t-mahoHmrg" name="HospitalDischargeInstructionsSectionTitle" constrainedElement="_lBergCUMEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rlMjMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dov1kH3sEeyivuDeOiJBMg" name="HospitalDischargeInstructionsSectionTitle" constrainedElement="_lBergCUMEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dov1kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rlOYYF9xEey5t-mahoHmrg" name="HospitalDischargeInstructionsSectionText" constrainedElement="_lBergCUMEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rlOYYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoxDsH3sEeyivuDeOiJBMg" name="HospitalDischargeInstructionsSectionText" constrainedElement="_lBergCUMEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoxDsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
@@ -11662,40 +11662,40 @@ value.code = '8653-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_jk0jcCUQEeGiOPpZVnfEJA">
         <body>The Hospital Discharge Medications section defines the medications that the patient is intended to take (or stop) after discharge. The currently active medications must be listed. The section may also include a patient's prescription history and indicate the source of the medication list, for example, from a pharmacy system versus from the patient.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rlPmgF9xEey5t-mahoHmrg" name="HospitalDischargeMedicationsSectionEntriesOptionalTemplateId" constrainedElement="_TytVkCUQEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rlPmgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DoxqwX3sEeyivuDeOiJBMg" name="HospitalDischargeMedicationsSectionEntriesOptionalTemplateId" constrainedElement="_TytVkCUQEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DoyR0H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.11.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rlSCwF9xEey5t-mahoHmrg" name="HospitalDischargeMedicationsSectionEntriesOptionalCodeP" constrainedElement="_TytVkCUQEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rlSCwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Do0HAH3sEeyivuDeOiJBMg" name="HospitalDischargeMedicationsSectionEntriesOptionalCodeP" constrainedElement="_TytVkCUQEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Do0uEH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rlQNkF9xEey5t-mahoHmrg" name="HospitalDischargeMedicationsSectionEntriesOptionalCode" constrainedElement="_TytVkCUQEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rlQ0oF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Doy44H3sEeyivuDeOiJBMg" name="HospitalDischargeMedicationsSectionEntriesOptionalCode" constrainedElement="_TytVkCUQEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Doy44X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10183-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rlT38F9xEey5t-mahoHmrg" name="HospitalDischargeMedicationsSectionEntriesOptionalText" constrainedElement="_TytVkCUQEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rlT38V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Do18MH3sEeyivuDeOiJBMg" name="HospitalDischargeMedicationsSectionEntriesOptionalText" constrainedElement="_TytVkCUQEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Do18MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rlVtIF9xEey5t-mahoHmrg" name="HospitalDischargeMedicationsSectionEntriesOptionalTitle" constrainedElement="_TytVkCUQEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rlVtIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Do3KUH3sEeyivuDeOiJBMg" name="HospitalDischargeMedicationsSectionEntriesOptionalTitle" constrainedElement="_TytVkCUQEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Do3KUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rq2fQF9xEey5t-mahoHmrg" name="HospitalDischargeMedicationsSectionEntriesOptionalDischargeMedication" constrainedElement="_TytVkCUQEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rq2fQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dtr_8H3sEeyivuDeOiJBMg" name="HospitalDischargeMedicationsSectionEntriesOptionalDischargeMedication" constrainedElement="_TytVkCUQEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dtr_8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::DischargeMedication))</body>
         </specification>
@@ -11705,15 +11705,15 @@ value.code = '10183-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>couple</body>
         </ownedComment>
       </generalization>
-      <ownedOperation xmi:id="_rq3GUF9xEey5t-mahoHmrg" name="getConsolDischargeMedications" bodyCondition="_rq3GU19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_rq3GU19xEey5t-mahoHmrg" name="body" constrainedElement="_rq3GUF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_rq3GVF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Dtr_8n3sEeyivuDeOiJBMg" name="getConsolDischargeMedications" bodyCondition="_Dtr_9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Dtr_9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_Dtr_8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dtr_9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::DischargeMedication)).oclAsType(consol::DischargeMedication)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_rq3GUV9xEey5t-mahoHmrg" type="_hD-z0CUPEeGiOPpZVnfEJA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rq3GUl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Dtr_833sEeyivuDeOiJBMg" type="_hD-z0CUPEeGiOPpZVnfEJA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Dtr_9H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -11721,34 +11721,34 @@ value.code = '10183-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_YsVPkCUTEeGiOPpZVnfEJA">
         <body>The Hospital Discharge Physical section records a narrative description of the patient's physical findings.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rpTAEl9xEey5t-mahoHmrg" name="HospitalDischargePhysicalSectionTemplateId" constrainedElement="_WikGsCUTEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rpTAE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DsXKQn3sEeyivuDeOiJBMg" name="HospitalDischargePhysicalSectionTemplateId" constrainedElement="_WikGsCUTEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DsXKQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '1.3.6.1.4.1.19376.1.5.3.1.3.26')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rpUOMF9xEey5t-mahoHmrg" name="HospitalDischargePhysicalSectionCode" constrainedElement="_WikGsCUTEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rpUOMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DsYYYH3sEeyivuDeOiJBMg" name="HospitalDischargePhysicalSectionCode" constrainedElement="_WikGsCUTEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DsYYYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10184-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rpVcUF9xEey5t-mahoHmrg" name="HospitalDischargePhysicalSectionCodeP" constrainedElement="_WikGsCUTEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rpVcUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DsZmgH3sEeyivuDeOiJBMg" name="HospitalDischargePhysicalSectionCodeP" constrainedElement="_WikGsCUTEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DsZmgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rpWqcF9xEey5t-mahoHmrg" name="HospitalDischargePhysicalSectionTitle" constrainedElement="_WikGsCUTEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rpWqcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dsa0oH3sEeyivuDeOiJBMg" name="HospitalDischargePhysicalSectionTitle" constrainedElement="_WikGsCUTEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dsa0oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rpX4kF9xEey5t-mahoHmrg" name="HospitalDischargePhysicalSectionText" constrainedElement="_WikGsCUTEeGiOPpZVnfEJA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rpX4kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DsbbsH3sEeyivuDeOiJBMg" name="HospitalDischargePhysicalSectionText" constrainedElement="_WikGsCUTEeGiOPpZVnfEJA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DsbbsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
@@ -11761,34 +11761,34 @@ value.code = '10184-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_sNrJwCsdEeGHF88-qhhUMA">
         <body>This section records the patient's chief complaint (the patient's own description) and/or the reason for the patient's visit (the provider's description of the reason for visit).  Local policy determines whether the information is divided into two sections or recorded in one section serving both purposes.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rq3GVV9xEey5t-mahoHmrg" name="ChiefComplaintAndReasonForVisitSectionTemplateId" constrainedElement="_oI7CQCsaEeGHF88-qhhUMA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rq3GVl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DtsnAH3sEeyivuDeOiJBMg" name="ChiefComplaintAndReasonForVisitSectionTemplateId" constrainedElement="_oI7CQCsaEeGHF88-qhhUMA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DtsnAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.13')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rq3tYF9xEey5t-mahoHmrg" name="ChiefComplaintAndReasonForVisitSectionCode" constrainedElement="_oI7CQCsaEeGHF88-qhhUMA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rq3tYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DttOEH3sEeyivuDeOiJBMg" name="ChiefComplaintAndReasonForVisitSectionCode" constrainedElement="_oI7CQCsaEeGHF88-qhhUMA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DttOEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '46239-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rq5ikF9xEey5t-mahoHmrg" name="ChiefComplaintAndReasonForVisitSectionCodeP" constrainedElement="_oI7CQCsaEeGHF88-qhhUMA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rq5ikV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DtucMH3sEeyivuDeOiJBMg" name="ChiefComplaintAndReasonForVisitSectionCodeP" constrainedElement="_oI7CQCsaEeGHF88-qhhUMA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DtucMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rq6wsF9xEey5t-mahoHmrg" name="ChiefComplaintAndReasonForVisitSectionText" constrainedElement="_oI7CQCsaEeGHF88-qhhUMA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rq6wsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DtvqUH3sEeyivuDeOiJBMg" name="ChiefComplaintAndReasonForVisitSectionText" constrainedElement="_oI7CQCsaEeGHF88-qhhUMA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DtvqUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rq8l4F9xEey5t-mahoHmrg" name="ChiefComplaintAndReasonForVisitSectionTitle" constrainedElement="_oI7CQCsaEeGHF88-qhhUMA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rq8l4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dtw4cH3sEeyivuDeOiJBMg" name="ChiefComplaintAndReasonForVisitSectionTitle" constrainedElement="_oI7CQCsaEeGHF88-qhhUMA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dtw4cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
@@ -11801,34 +11801,34 @@ value.code = '46239-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_OPllYCsdEeGHF88-qhhUMA">
         <body>This section records the patient's reason for the patient's visit (as documented by the provider).  Local policy determines whether Reason for Visit and Chief Complaint are in separate or combined sections.</body>
       </ownedComment>
-      <ownedRule xmi:id="_rq9M8F9xEey5t-mahoHmrg" name="ReasonForVisitSectionTemplateId" constrainedElement="_Nm64UCscEeGHF88-qhhUMA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rq9M8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DtxfgH3sEeyivuDeOiJBMg" name="ReasonForVisitSectionTemplateId" constrainedElement="_Nm64UCscEeGHF88-qhhUMA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DtxfgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.12')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rq-bEF9xEey5t-mahoHmrg" name="ReasonForVisitSectionCode" constrainedElement="_Nm64UCscEeGHF88-qhhUMA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rq-bEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_DtytoH3sEeyivuDeOiJBMg" name="ReasonForVisitSectionCode" constrainedElement="_Nm64UCscEeGHF88-qhhUMA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_DtytoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '29299-5' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rq_pMF9xEey5t-mahoHmrg" name="ReasonForVisitSectionCodeP" constrainedElement="_Nm64UCscEeGHF88-qhhUMA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rq_pMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dtz7wH3sEeyivuDeOiJBMg" name="ReasonForVisitSectionCodeP" constrainedElement="_Nm64UCscEeGHF88-qhhUMA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dtz7wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rrA3UF9xEey5t-mahoHmrg" name="ReasonForVisitSectionText" constrainedElement="_Nm64UCscEeGHF88-qhhUMA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rrA3UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dt1J4H3sEeyivuDeOiJBMg" name="ReasonForVisitSectionText" constrainedElement="_Nm64UCscEeGHF88-qhhUMA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dt1J4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_rrCFcF9xEey5t-mahoHmrg" name="ReasonForVisitSectionTitle" constrainedElement="_Nm64UCscEeGHF88-qhhUMA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_rrCFcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Dt2YAH3sEeyivuDeOiJBMg" name="ReasonForVisitSectionTitle" constrainedElement="_Nm64UCscEeGHF88-qhhUMA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Dt2YAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
@@ -11841,46 +11841,46 @@ value.code = '29299-5' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_dpvJsDWmEeG32vxjh5_fjg">
         <body>The Anesthesia section briefly records the type of anesthesia (e.g., general or local) and may state the actual agent used. This may or may not be a subsection of the Procedure Description section. The full details of anesthesia are usually found in a separate Anesthesia Note.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r50IUl9xEey5t-mahoHmrg" name="AnesthesiaSectionTemplateId" constrainedElement="_OA_Q0DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r50IU19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D63gUn3sEeyivuDeOiJBMg" name="AnesthesiaSectionTemplateId" constrainedElement="_OA_Q0DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D63gU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.25')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r51WcF9xEey5t-mahoHmrg" name="AnesthesiaSectionCode" constrainedElement="_OA_Q0DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r51WcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D64HYH3sEeyivuDeOiJBMg" name="AnesthesiaSectionCode" constrainedElement="_OA_Q0DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D64HYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '59774-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r52kkF9xEey5t-mahoHmrg" name="AnesthesiaSectionCodeP" constrainedElement="_OA_Q0DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r52kkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D65VgH3sEeyivuDeOiJBMg" name="AnesthesiaSectionCodeP" constrainedElement="_OA_Q0DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D65VgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r53ysF9xEey5t-mahoHmrg" name="AnesthesiaSectionTitle" constrainedElement="_OA_Q0DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r53ysV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D66joH3sEeyivuDeOiJBMg" name="AnesthesiaSectionTitle" constrainedElement="_OA_Q0DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D66joX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r54ZwF9xEey5t-mahoHmrg" name="AnesthesiaSectionText" constrainedElement="_OA_Q0DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r54ZwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D67xwH3sEeyivuDeOiJBMg" name="AnesthesiaSectionText" constrainedElement="_OA_Q0DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D67xwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r8DkAF9xEey5t-mahoHmrg" name="AnesthesiaSectionProcedureActivityProcedure" constrainedElement="_OA_Q0DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r8DkAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D86HsH3sEeyivuDeOiJBMg" name="AnesthesiaSectionProcedureActivityProcedure" constrainedElement="_OA_Q0DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D86HsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.procedure.oclIsUndefined() and entry.procedure.oclIsKindOf(consol::ProcedureActivityProcedure))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r8j6UF9xEey5t-mahoHmrg" name="AnesthesiaSectionMedicationActivity" constrainedElement="_OA_Q0DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r8khYF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D9TwUH3sEeyivuDeOiJBMg" name="AnesthesiaSectionMedicationActivity" constrainedElement="_OA_Q0DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D9TwUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.substanceAdministration.oclIsUndefined() and entry.substanceAdministration.oclIsKindOf(consol::MedicationActivity))</body>
         </specification>
@@ -11888,26 +11888,26 @@ value.code = '59774-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_OA_Q0TVyEeGaW4kr-GbV8Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_r8DkAl9xEey5t-mahoHmrg" name="getProcedureActivityProcedures" bodyCondition="_r8DkBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_r8DkBV9xEey5t-mahoHmrg" name="body" constrainedElement="_r8DkAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_r8DkBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_D86uwH3sEeyivuDeOiJBMg" name="getProcedureActivityProcedures" bodyCondition="_D86uw33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_D86uw33sEeyivuDeOiJBMg" name="body" constrainedElement="_D86uwH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_D86uxH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getProcedures()->select(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::ProcedureActivityProcedure)).oclAsType(consol::ProcedureActivityProcedure)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_r8DkA19xEey5t-mahoHmrg" type="_2OG58RSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r8DkBF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_D86uwX3sEeyivuDeOiJBMg" type="_2OG58RSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_D86uwn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_r8khYV9xEey5t-mahoHmrg" name="getMedicationActivities" bodyCondition="_r8khZF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_r8khZF9xEey5t-mahoHmrg" name="body" constrainedElement="_r8khYV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_r8khZV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_D9UXYH3sEeyivuDeOiJBMg" name="getMedicationActivities" bodyCondition="_D9UXY33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_D9UXY33sEeyivuDeOiJBMg" name="body" constrainedElement="_D9UXYH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_D9UXZH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity)).oclAsType(consol::MedicationActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_r8khYl9xEey5t-mahoHmrg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r8khY19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_D9UXYX3sEeyivuDeOiJBMg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_D9UXYn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -11915,40 +11915,40 @@ value.code = '59774-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_zxyf4FjaEeGRqYkwoeymcA">
         <body>The Complications section records problems that occurred during the procedure or other activity. The complications may have been known risks or unanticipated problems.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r55n4F9xEey5t-mahoHmrg" name="ComplicationsSectionTemplateId" constrainedElement="_R1OXcDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r55n4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D68Y0H3sEeyivuDeOiJBMg" name="ComplicationsSectionTemplateId" constrainedElement="_R1OXcDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D68_4H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.37')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r56O8F9xEey5t-mahoHmrg" name="ComplicationsSectionCode" constrainedElement="_R1OXcDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r56O8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D69m8H3sEeyivuDeOiJBMg" name="ComplicationsSectionCode" constrainedElement="_R1OXcDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D69m8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '55109-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r57dEF9xEey5t-mahoHmrg" name="ComplicationsSectionCodeP" constrainedElement="_R1OXcDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r57dEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D6-1EH3sEeyivuDeOiJBMg" name="ComplicationsSectionCodeP" constrainedElement="_R1OXcDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D6-1EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r58rMF9xEey5t-mahoHmrg" name="ComplicationsSectionTitle" constrainedElement="_R1OXcDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r58rMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D6_cIH3sEeyivuDeOiJBMg" name="ComplicationsSectionTitle" constrainedElement="_R1OXcDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D6_cIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r595UF9xEey5t-mahoHmrg" name="ComplicationsSectionText" constrainedElement="_R1OXcDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r595UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7AqQH3sEeyivuDeOiJBMg" name="ComplicationsSectionText" constrainedElement="_R1OXcDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7AqQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_t6Q9IF9xEey5t-mahoHmrg" name="ComplicationsSectionProblemObservation" constrainedElement="_R1OXcDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_t6Q9IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fkr90H3sEeyivuDeOiJBMg" name="ComplicationsSectionProblemObservation" constrainedElement="_R1OXcDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fkr90X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::ProblemObservation))</body>
         </specification>
@@ -11956,15 +11956,15 @@ value.code = '55109-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_R1OXcTVyEeGaW4kr-GbV8Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_t6Q9Il9xEey5t-mahoHmrg" name="getProblemObservations" bodyCondition="_t6Q9JV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_t6Q9JV9xEey5t-mahoHmrg" name="body" constrainedElement="_t6Q9Il9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_t6Q9Jl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Fksk4H3sEeyivuDeOiJBMg" name="getProblemObservations" bodyCondition="_Fksk433sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Fksk433sEeyivuDeOiJBMg" name="body" constrainedElement="_Fksk4H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fksk5H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation)).oclAsType(consol::ProblemObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_t6Q9I19xEey5t-mahoHmrg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t6Q9JF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Fksk4X3sEeyivuDeOiJBMg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Fksk4n3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -11973,28 +11973,28 @@ value.code = '55109-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         <body>DICOM Object Catalog lists all referenced objects and their parent Series and Studies, plus other DICOM attributes required for retrieving the objects.&#xD;
 DICOM Object Catalog sections are not intended for viewing and contain empty section text.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r5-gYF9xEey5t-mahoHmrg" name="DICOMObjectCatalogSectionTemplateId" constrainedElement="_WPTWEDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r5_HcF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7BRUH3sEeyivuDeOiJBMg" name="DICOMObjectCatalogSectionTemplateId" constrainedElement="_WPTWEDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7B4YH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.6.1.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r5_ugF9xEey5t-mahoHmrg" name="DICOMObjectCatalogSectionCode" constrainedElement="_WPTWEDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r5_ugV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7CfcH3sEeyivuDeOiJBMg" name="DICOMObjectCatalogSectionCode" constrainedElement="_WPTWEDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7CfcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '121181' and value.codeSystem = '1.2.840.10008.2.16.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6A8oF9xEey5t-mahoHmrg" name="DICOMObjectCatalogSectionCodeP" constrainedElement="_WPTWEDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6A8oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7DtkH3sEeyivuDeOiJBMg" name="DICOMObjectCatalogSectionCodeP" constrainedElement="_WPTWEDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7DtkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tz52cF9xEey5t-mahoHmrg" name="DICOMObjectCatalogSectionStudyAct" constrainedElement="_WPTWEDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tz52cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fft-QH3sEeyivuDeOiJBMg" name="DICOMObjectCatalogSectionStudyAct" constrainedElement="_WPTWEDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fft-QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::StudyAct))</body>
         </specification>
@@ -12002,21 +12002,21 @@ value.code = '121181' and value.codeSystem = '1.2.840.10008.2.16.4')</body>
       <generalization xmi:id="_WPTWETVyEeGaW4kr-GbV8Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_tz52cl9xEey5t-mahoHmrg" name="getStudyActs" bodyCondition="_tz52dV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tz52dV9xEey5t-mahoHmrg" name="body" constrainedElement="_tz52cl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tz52dl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Fft-Qn3sEeyivuDeOiJBMg" name="getStudyActs" bodyCondition="_Fft-RX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Fft-RX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Fft-Qn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fft-Rn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::StudyAct)).oclAsType(consol::StudyAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tz52c19xEey5t-mahoHmrg" type="_vjf-wEb4EeGp67IkyTw1fg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tz52dF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Fft-Q33sEeyivuDeOiJBMg" type="_vjf-wEb4EeGp67IkyTw1fg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Fft-RH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_ZcC-4DVyEeGaW4kr-GbV8Q" name="FindingsSection">
-      <ownedRule xmi:id="_r6BjsF9xEey5t-mahoHmrg" name="FindingsSectionTemplateId" constrainedElement="_ZcC-4DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6BjsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7EUoH3sEeyivuDeOiJBMg" name="FindingsSectionTemplateId" constrainedElement="_ZcC-4DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7E7sH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.6.1.2')</body>
         </specification>
@@ -12029,34 +12029,34 @@ value.code = '121181' and value.codeSystem = '1.2.840.10008.2.16.4')</body>
       <ownedComment xmi:id="_dFR2MEE1EeGdmoWy_aLP0Q">
         <body>The Hospital Consultations section records consultations that occurred during the admission.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r6CKwV9xEey5t-mahoHmrg" name="HospitalConsultationsSectionTemplateId" constrainedElement="_eKFbUDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6CKwl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7FiwH3sEeyivuDeOiJBMg" name="HospitalConsultationsSectionTemplateId" constrainedElement="_eKFbUDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7FiwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.42')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6DY4F9xEey5t-mahoHmrg" name="HospitalConsultationsSectionCode" constrainedElement="_eKFbUDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6DY4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7GJ0H3sEeyivuDeOiJBMg" name="HospitalConsultationsSectionCode" constrainedElement="_eKFbUDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7GJ0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '18841-7' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6EnAF9xEey5t-mahoHmrg" name="HospitalConsultationsSectionCodeP" constrainedElement="_eKFbUDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6EnAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7HX8H3sEeyivuDeOiJBMg" name="HospitalConsultationsSectionCodeP" constrainedElement="_eKFbUDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7HX8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6FOEF9xEey5t-mahoHmrg" name="HospitalConsultationsSectionText" constrainedElement="_eKFbUDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6FOEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7ImEH3sEeyivuDeOiJBMg" name="HospitalConsultationsSectionText" constrainedElement="_eKFbUDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7ImEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6GcMF9xEey5t-mahoHmrg" name="HospitalConsultationsSectionTitle" constrainedElement="_eKFbUDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6GcMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7J0MH3sEeyivuDeOiJBMg" name="HospitalConsultationsSectionTitle" constrainedElement="_eKFbUDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7J0MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
@@ -12072,34 +12072,34 @@ Interventions include actions that may be ongoing (e.g., maintenance medications
 Instructions are nested within interventions and may include self-care instructions. Instructions are information or directions to the patient and other providers including how to care for the individual's condition, what to do at home, when to call for help, any additional appointments, testing, and changes to the medication list or medication instructions, clinical guidelines and a summary of best practice.&#xD;
 Instructions are information or directions to the patient. Use the Instructions Section when instructions are included as part of a document that is not a Care Plan. Use the Interventions Section, containing the Intervention Act containing the Instruction entry, when instructions are part of a structured care plan.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r6HDQF9xEey5t-mahoHmrg" name="InterventionsSectionTemplateId" constrainedElement="_hqzJADVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6HqUF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7LCUH3sEeyivuDeOiJBMg" name="InterventionsSectionTemplateId" constrainedElement="_hqzJADVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7LCUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.21.2.3')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6IRYF9xEey5t-mahoHmrg" name="InterventionsSectionCode" constrainedElement="_hqzJADVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6IRYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7LpYH3sEeyivuDeOiJBMg" name="InterventionsSectionCode" constrainedElement="_hqzJADVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7LpYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '62387-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6JfgF9xEey5t-mahoHmrg" name="InterventionsSectionCodeP" constrainedElement="_hqzJADVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6JfgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7NekH3sEeyivuDeOiJBMg" name="InterventionsSectionCodeP" constrainedElement="_hqzJADVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7NekX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6KtoF9xEey5t-mahoHmrg" name="InterventionsSectionTitle" constrainedElement="_hqzJADVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6KtoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7OssH3sEeyivuDeOiJBMg" name="InterventionsSectionTitle" constrainedElement="_hqzJADVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7OssX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6L7wF9xEey5t-mahoHmrg" name="InterventionsSectionText" constrainedElement="_hqzJADVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6L7wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7P60H3sEeyivuDeOiJBMg" name="InterventionsSectionText" constrainedElement="_hqzJADVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7P60X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
@@ -12112,34 +12112,34 @@ value.code = '62387-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_eDJXMEE2EeGdmoWy_aLP0Q">
         <body>The Medical History section describes all aspects of the medical history of the patient even if not pertinent to the current procedure, and may include chief complaint, past medical history, social history, family history, surgical or procedure history, medication history, and other history information. The history may be limited to information pertinent to the current procedure or may be more comprehensive. The history may be reported as a collection of random clinical statements or it may be reported categorically. Categorical report formats may be divided into multiple subsections including Past Medical History, Social History.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r6Mi0F9xEey5t-mahoHmrg" name="MedicalHistorySectionTemplateId" constrainedElement="_mEIgwDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6Mi0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7Qh4H3sEeyivuDeOiJBMg" name="MedicalHistorySectionTemplateId" constrainedElement="_mEIgwDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7Qh4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.39')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6Nw8F9xEey5t-mahoHmrg" name="MedicalHistorySectionCode" constrainedElement="_mEIgwDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6Nw8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7RI8H3sEeyivuDeOiJBMg" name="MedicalHistorySectionCode" constrainedElement="_mEIgwDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7RI8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '11329-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6O_EF9xEey5t-mahoHmrg" name="MedicalHistorySectionCodeP" constrainedElement="_mEIgwDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6O_EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7SXEH3sEeyivuDeOiJBMg" name="MedicalHistorySectionCodeP" constrainedElement="_mEIgwDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7SXEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6QNMF9xEey5t-mahoHmrg" name="MedicalHistorySectionText" constrainedElement="_mEIgwDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6QNMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7TlMH3sEeyivuDeOiJBMg" name="MedicalHistorySectionText" constrainedElement="_mEIgwDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7TlMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6RbUF9xEey5t-mahoHmrg" name="MedicalHistorySectionTitle" constrainedElement="_mEIgwDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6RbUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7UzUH3sEeyivuDeOiJBMg" name="MedicalHistorySectionTitle" constrainedElement="_mEIgwDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7UzUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
@@ -12152,34 +12152,34 @@ value.code = '11329-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_mHeaAEE2EeGdmoWy_aLP0Q">
         <body>The Objective section contains data about the patient gathered through tests, measures, or observations that produce a quantified or categorized result. It includes important and relevant positive and negative test results, physical findings, review of systems, and other measurements and observations.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r6SpcF9xEey5t-mahoHmrg" name="ObjectiveSectionTemplateId" constrainedElement="_rNJpADVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6SpcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7WBcH3sEeyivuDeOiJBMg" name="ObjectiveSectionTemplateId" constrainedElement="_rNJpADVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7WBcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.21.2.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6TQgF9xEey5t-mahoHmrg" name="ObjectiveSectionCode" constrainedElement="_rNJpADVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6TQgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7WogH3sEeyivuDeOiJBMg" name="ObjectiveSectionCode" constrainedElement="_rNJpADVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7WogX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '61149-1' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6VFsF9xEey5t-mahoHmrg" name="ObjectiveSectionCodeP" constrainedElement="_rNJpADVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6VFsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7X2oH3sEeyivuDeOiJBMg" name="ObjectiveSectionCodeP" constrainedElement="_rNJpADVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7X2oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6W64F9xEey5t-mahoHmrg" name="ObjectiveSectionText" constrainedElement="_rNJpADVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6W64V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7ZEwH3sEeyivuDeOiJBMg" name="ObjectiveSectionText" constrainedElement="_rNJpADVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7Zr0H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6YwEF9xEey5t-mahoHmrg" name="ObjectiveSectionTitle" constrainedElement="_rNJpADVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6YwEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7a58H3sEeyivuDeOiJBMg" name="ObjectiveSectionTitle" constrainedElement="_rNJpADVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7a58X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
@@ -12192,34 +12192,34 @@ value.code = '61149-1' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_UgHj8FmvEeGRqYkwoeymcA">
         <body>The Operative Note Fluids section may be used to record fluids administered during the surgical procedure.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r6ZXIF9xEey5t-mahoHmrg" name="OperativeNoteFluidSectionTemplateId" constrainedElement="_vHfXoDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6Z-MF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7bhAH3sEeyivuDeOiJBMg" name="OperativeNoteFluidSectionTemplateId" constrainedElement="_vHfXoDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7cIEH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.7.12')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6alQF9xEey5t-mahoHmrg" name="OperativeNoteFluidSectionCode" constrainedElement="_vHfXoDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6alQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7cvIH3sEeyivuDeOiJBMg" name="OperativeNoteFluidSectionCode" constrainedElement="_vHfXoDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7cvIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10216-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6bzYF9xEey5t-mahoHmrg" name="OperativeNoteFluidSectionCodeP" constrainedElement="_vHfXoDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6bzYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7d9QH3sEeyivuDeOiJBMg" name="OperativeNoteFluidSectionCodeP" constrainedElement="_vHfXoDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7d9QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6dBgF9xEey5t-mahoHmrg" name="OperativeNoteFluidSectionText" constrainedElement="_vHfXoDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6dBgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7fLYH3sEeyivuDeOiJBMg" name="OperativeNoteFluidSectionText" constrainedElement="_vHfXoDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7fLYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6ePoF9xEey5t-mahoHmrg" name="OperativeNoteFluidSectionTitle" constrainedElement="_vHfXoDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6ePoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7gZgH3sEeyivuDeOiJBMg" name="OperativeNoteFluidSectionTitle" constrainedElement="_vHfXoDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7gZgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
@@ -12232,34 +12232,34 @@ value.code = '10216-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_rxk2EEE2EeGdmoWy_aLP0Q">
         <body>The Operative Note Surgical Procedure section can be used to restate the procedures performed if appropriate for an enterprise workflow.  The procedure(s) performed associated with the Operative Note are formally modeled in the header using serviceEvent.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r6e2sF9xEey5t-mahoHmrg" name="OperativeNoteSurgicalProcedureSectionTemplateId" constrainedElement="_zel6wDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6fdwF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7hnoH3sEeyivuDeOiJBMg" name="OperativeNoteSurgicalProcedureSectionTemplateId" constrainedElement="_zel6wDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7hnoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.7.14')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6gE0F9xEey5t-mahoHmrg" name="OperativeNoteSurgicalProcedureSectionCode" constrainedElement="_zel6wDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6gE0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7iOsH3sEeyivuDeOiJBMg" name="OperativeNoteSurgicalProcedureSectionCode" constrainedElement="_zel6wDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7iOsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10223-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6hS8F9xEey5t-mahoHmrg" name="OperativeNoteSurgicalProcedureSectionCodeP" constrainedElement="_zel6wDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6hS8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7jc0H3sEeyivuDeOiJBMg" name="OperativeNoteSurgicalProcedureSectionCodeP" constrainedElement="_zel6wDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7jc0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6ihEF9xEey5t-mahoHmrg" name="OperativeNoteSurgicalProcedureSectionText" constrainedElement="_zel6wDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6ihEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7kq8H3sEeyivuDeOiJBMg" name="OperativeNoteSurgicalProcedureSectionText" constrainedElement="_zel6wDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7kq8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6jvMF9xEey5t-mahoHmrg" name="OperativeNoteSurgicalProcedureSectionTitle" constrainedElement="_zel6wDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6jvMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7lSAH3sEeyivuDeOiJBMg" name="OperativeNoteSurgicalProcedureSectionTitle" constrainedElement="_zel6wDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7lSAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
@@ -12272,40 +12272,40 @@ value.code = '10223-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_vw-q4EE2EeGdmoWy_aLP0Q">
         <body>The Planned Procedure section records the procedure(s) that a clinician thought would need to be done based on the preoperative assessment. It may be important to record the procedure(s) that were originally planned for, consented to, and perhaps pre-approved by the payor, particularly if different from the actual procedure(s) and procedure details, to provide evidence to various stakeholders that the providers are aware of the discrepancy and the justification can be found in the procedure details.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r6kWQF9xEey5t-mahoHmrg" name="PlannedProcedureSectionTemplateId" constrainedElement="_3b6E4DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6kWQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7mgIH3sEeyivuDeOiJBMg" name="PlannedProcedureSectionTemplateId" constrainedElement="_3b6E4DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7mgIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.30')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6k9UV9xEey5t-mahoHmrg" name="PlannedProcedureSectionCode" constrainedElement="_3b6E4DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6k9Ul9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7nHMH3sEeyivuDeOiJBMg" name="PlannedProcedureSectionCode" constrainedElement="_3b6E4DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7nHMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '59772-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6mygF9xEey5t-mahoHmrg" name="PlannedProcedureSectionCodeP" constrainedElement="_3b6E4DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6mygV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7oVUH3sEeyivuDeOiJBMg" name="PlannedProcedureSectionCodeP" constrainedElement="_3b6E4DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7oVUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6oAoF9xEey5t-mahoHmrg" name="PlannedProcedureSectionTitle" constrainedElement="_3b6E4DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6oAoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7pjcH3sEeyivuDeOiJBMg" name="PlannedProcedureSectionTitle" constrainedElement="_3b6E4DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7pjcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6pOwF9xEey5t-mahoHmrg" name="PlannedProcedureSectionText" constrainedElement="_3b6E4DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6pOwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7qKgH3sEeyivuDeOiJBMg" name="PlannedProcedureSectionText" constrainedElement="_3b6E4DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7qKgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tVBiEF9xEey5t-mahoHmrg" name="PlannedProcedureSectionPlanOfCareActivityProcedure" constrainedElement="_3b6E4DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tVBiEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FGOgMH3sEeyivuDeOiJBMg" name="PlannedProcedureSectionPlanOfCareActivityProcedure" constrainedElement="_3b6E4DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FGOgMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.procedure.oclIsUndefined() and entry.procedure.oclIsKindOf(consol::PlanOfCareActivityProcedure))</body>
         </specification>
@@ -12313,15 +12313,15 @@ value.code = '59772-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_3b6E4TVyEeGaW4kr-GbV8Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_tVCJIF9xEey5t-mahoHmrg" name="getPlanOfCareActivityProcedures" bodyCondition="_tVCJI19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tVCJI19xEey5t-mahoHmrg" name="body" constrainedElement="_tVCJIF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tVCJJF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FGPHQH3sEeyivuDeOiJBMg" name="getPlanOfCareActivityProcedures" bodyCondition="_FGPHQ33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FGPHQ33sEeyivuDeOiJBMg" name="body" constrainedElement="_FGPHQH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FGPHRH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getProcedures()->select(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::PlanOfCareActivityProcedure)).oclAsType(consol::PlanOfCareActivityProcedure)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tVCJIV9xEey5t-mahoHmrg" type="_2NiSKhSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tVCJIl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_FGPHQX3sEeyivuDeOiJBMg" type="_2NiSKhSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FGPHQn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -12329,34 +12329,34 @@ value.code = '59772-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_0An7IEE2EeGdmoWy_aLP0Q">
         <body>The Postoperative Diagnosis section records the diagnosis or diagnoses discovered or confirmed during the surgery. Often it is the same as the preoperative diagnosis.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r6p10F9xEey5t-mahoHmrg" name="PostoperativeDiagnosisSectionTemplateId" constrainedElement="_7UA-4DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6p10V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7rYoH3sEeyivuDeOiJBMg" name="PostoperativeDiagnosisSectionTemplateId" constrainedElement="_7UA-4DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7rYoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.35')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6rD8F9xEey5t-mahoHmrg" name="PostoperativeDiagnosisSectionCode" constrainedElement="_7UA-4DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6rD8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7r_sH3sEeyivuDeOiJBMg" name="PostoperativeDiagnosisSectionCode" constrainedElement="_7UA-4DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7r_sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10218-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6sSEF9xEey5t-mahoHmrg" name="PostoperativeDiagnosisSectionCodeP" constrainedElement="_7UA-4DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6sSEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7tN0H3sEeyivuDeOiJBMg" name="PostoperativeDiagnosisSectionCodeP" constrainedElement="_7UA-4DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7tN0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6tgMF9xEey5t-mahoHmrg" name="PostoperativeDiagnosisSectionText" constrainedElement="_7UA-4DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6tgMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7ub8H3sEeyivuDeOiJBMg" name="PostoperativeDiagnosisSectionText" constrainedElement="_7UA-4DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7ub8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6uHQF9xEey5t-mahoHmrg" name="PostoperativeDiagnosisSectionTitle" constrainedElement="_7UA-4DVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6uHQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7vDAH3sEeyivuDeOiJBMg" name="PostoperativeDiagnosisSectionTitle" constrainedElement="_7UA-4DVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7vDAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
@@ -12369,40 +12369,40 @@ value.code = '10218-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_2BrM4EE2EeGdmoWy_aLP0Q">
         <body>The Postprocedure Diagnosis section records the diagnosis or diagnoses discovered or confirmed during the procedure. Often it is the same as the pre-procedure diagnosis or indication.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r6uuUF9xEey5t-mahoHmrg" name="PostprocedureDiagnosisSectionTemplateId" constrainedElement="_-jlSMDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6vVYF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7vqEH3sEeyivuDeOiJBMg" name="PostprocedureDiagnosisSectionTemplateId" constrainedElement="_-jlSMDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7wRIH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.36')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6v8cF9xEey5t-mahoHmrg" name="PostprocedureDiagnosisSectionCode" constrainedElement="_-jlSMDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6v8cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7w4MH3sEeyivuDeOiJBMg" name="PostprocedureDiagnosisSectionCode" constrainedElement="_-jlSMDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7w4MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '59769-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6xKkF9xEey5t-mahoHmrg" name="PostprocedureDiagnosisSectionCodeP" constrainedElement="_-jlSMDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6xKkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7yGUH3sEeyivuDeOiJBMg" name="PostprocedureDiagnosisSectionCodeP" constrainedElement="_-jlSMDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7yGUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6yYsF9xEey5t-mahoHmrg" name="PostprocedureDiagnosisSectionTitle" constrainedElement="_-jlSMDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6yYsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7ytYH3sEeyivuDeOiJBMg" name="PostprocedureDiagnosisSectionTitle" constrainedElement="_-jlSMDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7ytYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6zm0F9xEey5t-mahoHmrg" name="PostprocedureDiagnosisSectionText" constrainedElement="_-jlSMDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6zm0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7z7gH3sEeyivuDeOiJBMg" name="PostprocedureDiagnosisSectionText" constrainedElement="_-jlSMDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7z7gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tWHHMF9xEey5t-mahoHmrg" name="PostprocedureDiagnosisSectionPostprocedureDiagnosis" constrainedElement="_-jlSMDVyEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tWHHMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FHLicH3sEeyivuDeOiJBMg" name="PostprocedureDiagnosisSectionPostprocedureDiagnosis" constrainedElement="_-jlSMDVyEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FHLicX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->one(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::PostprocedureDiagnosis))</body>
         </specification>
@@ -12410,15 +12410,15 @@ value.code = '59769-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_-jlSMTVyEeGaW4kr-GbV8Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_tWHHMl9xEey5t-mahoHmrg" name="getPostprocedureDiagnosis" bodyCondition="_tWHHNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tWHHNV9xEey5t-mahoHmrg" name="body" constrainedElement="_tWHHMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tWHHNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FHLicn3sEeyivuDeOiJBMg" name="getPostprocedureDiagnosis" bodyCondition="_FHLidX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FHLidX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FHLicn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FHLidn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PostprocedureDiagnosis))->asSequence()->any(true).oclAsType(consol::PostprocedureDiagnosis)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tWHHM19xEey5t-mahoHmrg" type="_0fjXAEEvEeGdmoWy_aLP0Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tWHHNF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FHLic33sEeyivuDeOiJBMg" type="_0fjXAEEvEeGdmoWy_aLP0Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FHLidH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -12426,40 +12426,40 @@ value.code = '59769-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_4B0fsEE2EeGdmoWy_aLP0Q">
         <body>The Preoperative Diagnosis section records the surgical diagnosis or diagnoses assigned to the patient before the surgical procedure and is the reason for the surgery. The preoperative diagnosis is, in the opinion of the surgeon, the diagnosis that will be confirmed during surgery.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r60N4F9xEey5t-mahoHmrg" name="PreoperativeDiagnosisSectionTemplateId" constrainedElement="_Cu6qMDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r60N4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D70ikH3sEeyivuDeOiJBMg" name="PreoperativeDiagnosisSectionTemplateId" constrainedElement="_Cu6qMDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D71JoH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.34')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6008F9xEey5t-mahoHmrg" name="PreoperativeDiagnosisSectionCode" constrainedElement="_Cu6qMDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6008V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D71wsH3sEeyivuDeOiJBMg" name="PreoperativeDiagnosisSectionCode" constrainedElement="_Cu6qMDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D71wsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10219-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r62DEF9xEey5t-mahoHmrg" name="PreoperativeDiagnosisSectionCodeP" constrainedElement="_Cu6qMDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r62DEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D72XwH3sEeyivuDeOiJBMg" name="PreoperativeDiagnosisSectionCodeP" constrainedElement="_Cu6qMDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D72XwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r63RMF9xEey5t-mahoHmrg" name="PreoperativeDiagnosisSectionTitle" constrainedElement="_Cu6qMDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r63RMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D73l4H3sEeyivuDeOiJBMg" name="PreoperativeDiagnosisSectionTitle" constrainedElement="_Cu6qMDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D73l4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r64fUF9xEey5t-mahoHmrg" name="PreoperativeDiagnosisSectionText" constrainedElement="_Cu6qMDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r64fUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D740AH3sEeyivuDeOiJBMg" name="PreoperativeDiagnosisSectionText" constrainedElement="_Cu6qMDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D740AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_t8WAwF9xEey5t-mahoHmrg" name="PreoperativeDiagnosisSectionPreoperativeDiagnosis" constrainedElement="_Cu6qMDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_t8WAwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fl-XQH3sEeyivuDeOiJBMg" name="PreoperativeDiagnosisSectionPreoperativeDiagnosis" constrainedElement="_Cu6qMDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fl-XQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->one(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::PreoperativeDiagnosis))</body>
         </specification>
@@ -12467,15 +12467,15 @@ value.code = '10219-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_Cu6qMTVzEeGaW4kr-GbV8Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_t8Wn0F9xEey5t-mahoHmrg" name="getPreoperativeDiagnosis" bodyCondition="_t8Wn019xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_t8Wn019xEey5t-mahoHmrg" name="body" constrainedElement="_t8Wn0F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_t8Wn1F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Fl-XQn3sEeyivuDeOiJBMg" name="getPreoperativeDiagnosis" bodyCondition="_Fl-XRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Fl-XRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Fl-XQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fl-XRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PreoperativeDiagnosis))->asSequence()->any(true).oclAsType(consol::PreoperativeDiagnosis)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_t8Wn0V9xEey5t-mahoHmrg" type="_0baBYEEwEeGdmoWy_aLP0Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t8Wn0l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Fl-XQ33sEeyivuDeOiJBMg" type="_0baBYEEwEeGdmoWy_aLP0Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Fl-XRH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -12483,34 +12483,34 @@ value.code = '10219-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_Fyfh4ECVEeGELr7uj3LK_Q">
         <body>The Procedure Description section records the particulars of the procedure and may include procedure site preparation, surgical site preparation, pertinent details related to sedation/anesthesia, pertinent details related to measurements and markings, procedure times, medications administered, estimated blood loss, specimens removed, implants, instrumentation, sponge counts, tissue manipulation, wound closure, sutures used, vital signs and other monitoring data. Local practice often identifies the level and type of detail required based on the procedure or specialty.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r65GYF9xEey5t-mahoHmrg" name="ProcedureDescriptionSectionTemplateId" constrainedElement="_HNUIIDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r65GYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D75bEH3sEeyivuDeOiJBMg" name="ProcedureDescriptionSectionTemplateId" constrainedElement="_HNUIIDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D75bEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.27')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r65tcV9xEey5t-mahoHmrg" name="ProcedureDescriptionSectionCode" constrainedElement="_HNUIIDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r65tcl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D76pMH3sEeyivuDeOiJBMg" name="ProcedureDescriptionSectionCode" constrainedElement="_HNUIIDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D76pMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '29554-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r667kF9xEey5t-mahoHmrg" name="ProcedureDescriptionSectionCodeP" constrainedElement="_HNUIIDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r667kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D773UH3sEeyivuDeOiJBMg" name="ProcedureDescriptionSectionCodeP" constrainedElement="_HNUIIDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D773UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r68JsF9xEey5t-mahoHmrg" name="ProcedureDescriptionSectionText" constrainedElement="_HNUIIDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r68JsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D79FcH3sEeyivuDeOiJBMg" name="ProcedureDescriptionSectionText" constrainedElement="_HNUIIDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D79FcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r69X0F9xEey5t-mahoHmrg" name="ProcedureDescriptionSectionTitle" constrainedElement="_HNUIIDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r69X0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D79sgH3sEeyivuDeOiJBMg" name="ProcedureDescriptionSectionTitle" constrainedElement="_HNUIIDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7-TkH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
@@ -12523,34 +12523,34 @@ value.code = '29554-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_ZwQ34ECVEeGELr7uj3LK_Q">
         <body>The Procedure Disposition section records the status and condition of the patient at the completion of the procedure or surgery.  It often also states where the patent was transferred to for the next level of care.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r69-4F9xEey5t-mahoHmrg" name="ProcedureDispositionSectionTemplateId" constrainedElement="_QhXGYDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r69-4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7-6oH3sEeyivuDeOiJBMg" name="ProcedureDispositionSectionTemplateId" constrainedElement="_QhXGYDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7-6oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.18.2.12')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r6_NAF9xEey5t-mahoHmrg" name="ProcedureDispositionSectionCode" constrainedElement="_QhXGYDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r6_NAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D7_hsH3sEeyivuDeOiJBMg" name="ProcedureDispositionSectionCode" constrainedElement="_QhXGYDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D7_hsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '59775-7' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7AbIF9xEey5t-mahoHmrg" name="ProcedureDispositionSectionCodeP" constrainedElement="_QhXGYDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7AbIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8Av0H3sEeyivuDeOiJBMg" name="ProcedureDispositionSectionCodeP" constrainedElement="_QhXGYDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8Av0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7BCMF9xEey5t-mahoHmrg" name="ProcedureDispositionSectionText" constrainedElement="_QhXGYDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7BCMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8B98H3sEeyivuDeOiJBMg" name="ProcedureDispositionSectionText" constrainedElement="_QhXGYDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8B98X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7CQUF9xEey5t-mahoHmrg" name="ProcedureDispositionSectionTitle" constrainedElement="_QhXGYDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7CQUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8DMEH3sEeyivuDeOiJBMg" name="ProcedureDispositionSectionTitle" constrainedElement="_QhXGYDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8DMEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
@@ -12563,34 +12563,34 @@ value.code = '59775-7' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_BuKCIEE3EeGdmoWy_aLP0Q">
         <body>The Estimated Blood Loss section may be a subsection of another section such as the Procedure Description section. The Estimated Blood Loss section records the approximate amount of blood that the patient lost during the procedure or surgery. It may be an accurate quantitative amount, e.g., 250 milliliters, or it may be descriptive, e.g., &quot;minimal&quot; or &quot;none&quot;.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r7DecF9xEey5t-mahoHmrg" name="ProcedureEstimatedBloodLossSectionTemplateId" constrainedElement="_TvcL8DVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7DecV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8DzIH3sEeyivuDeOiJBMg" name="ProcedureEstimatedBloodLossSectionTemplateId" constrainedElement="_TvcL8DVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8DzIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.18.2.9')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7EFgF9xEey5t-mahoHmrg" name="ProcedureEstimatedBloodLossSectionCode" constrainedElement="_TvcL8DVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7EFgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8FBQH3sEeyivuDeOiJBMg" name="ProcedureEstimatedBloodLossSectionCode" constrainedElement="_TvcL8DVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8FBQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '59770-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7FToF9xEey5t-mahoHmrg" name="ProcedureEstimatedBloodLossSectionCodeP" constrainedElement="_TvcL8DVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7FToV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8GPYH3sEeyivuDeOiJBMg" name="ProcedureEstimatedBloodLossSectionCodeP" constrainedElement="_TvcL8DVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8GPYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7GhwF9xEey5t-mahoHmrg" name="ProcedureEstimatedBloodLossSectionText" constrainedElement="_TvcL8DVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7GhwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8G2cH3sEeyivuDeOiJBMg" name="ProcedureEstimatedBloodLossSectionText" constrainedElement="_TvcL8DVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8G2cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7Hv4F9xEey5t-mahoHmrg" name="ProcedureEstimatedBloodLossSectionTitle" constrainedElement="_TvcL8DVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7Hv4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8IEkH3sEeyivuDeOiJBMg" name="ProcedureEstimatedBloodLossSectionTitle" constrainedElement="_TvcL8DVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8IEkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
@@ -12603,40 +12603,40 @@ value.code = '59770-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_EXSAgEE3EeGdmoWy_aLP0Q">
         <body>The Procedure Findings section records clinically significant observations confirmed or discovered during the procedure or surgery.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r7IW8F9xEey5t-mahoHmrg" name="ProcedureFindingsSectionTemplateId" constrainedElement="_W4UBYDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7IW8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8IroH3sEeyivuDeOiJBMg" name="ProcedureFindingsSectionTemplateId" constrainedElement="_W4UBYDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8IroX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.28')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7JlEF9xEey5t-mahoHmrg" name="ProcedureFindingsSectionCode" constrainedElement="_W4UBYDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7JlEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8JSsX3sEeyivuDeOiJBMg" name="ProcedureFindingsSectionCode" constrainedElement="_W4UBYDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8JSsn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '59776-5' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7KzMF9xEey5t-mahoHmrg" name="ProcedureFindingsSectionCodeP" constrainedElement="_W4UBYDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7KzMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8Kg0H3sEeyivuDeOiJBMg" name="ProcedureFindingsSectionCodeP" constrainedElement="_W4UBYDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8Kg0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7LaQF9xEey5t-mahoHmrg" name="ProcedureFindingsSectionTitle" constrainedElement="_W4UBYDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7LaQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8Lu8H3sEeyivuDeOiJBMg" name="ProcedureFindingsSectionTitle" constrainedElement="_W4UBYDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8Lu8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7NPcF9xEey5t-mahoHmrg" name="ProcedureFindingsSectionText" constrainedElement="_W4UBYDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7NPcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8M9EH3sEeyivuDeOiJBMg" name="ProcedureFindingsSectionText" constrainedElement="_W4UBYDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8M9EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tXLeMF9xEey5t-mahoHmrg" name="ProcedureFindingsSectionProblemObservation" constrainedElement="_W4UBYDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tXMFQF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FIGIcH3sEeyivuDeOiJBMg" name="ProcedureFindingsSectionProblemObservation" constrainedElement="_W4UBYDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FIGIcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::ProblemObservation))</body>
         </specification>
@@ -12644,15 +12644,15 @@ value.code = '59776-5' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_W4UBYTVzEeGaW4kr-GbV8Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_tXMFQV9xEey5t-mahoHmrg" name="getProblemObservations" bodyCondition="_tXMFRF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tXMFRF9xEey5t-mahoHmrg" name="body" constrainedElement="_tXMFQV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tXMFRV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FIGIcn3sEeyivuDeOiJBMg" name="getProblemObservations" bodyCondition="_FIGvgX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FIGvgX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FIGIcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FIGvgn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation)).oclAsType(consol::ProblemObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tXMFQl9xEey5t-mahoHmrg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tXMFQ19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_FIGIc33sEeyivuDeOiJBMg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FIGvgH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -12660,34 +12660,34 @@ value.code = '59776-5' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_F3ZIYEE3EeGdmoWy_aLP0Q">
         <body>The Procedure Implants section records any materials placed during the procedure including stents, tubes, and drains.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r7N2gF9xEey5t-mahoHmrg" name="ProcedureImplantsSectionTemplateId" constrainedElement="_Z662wDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7N2gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8NkIH3sEeyivuDeOiJBMg" name="ProcedureImplantsSectionTemplateId" constrainedElement="_Z662wDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8NkIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.40')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7PEoF9xEey5t-mahoHmrg" name="ProcedureImplantsSectionCode" constrainedElement="_Z662wDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7PEoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8OLMH3sEeyivuDeOiJBMg" name="ProcedureImplantsSectionCode" constrainedElement="_Z662wDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8OLMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '59771-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7QSwF9xEey5t-mahoHmrg" name="ProcedureImplantsSectionCodeP" constrainedElement="_Z662wDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7QSwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8PZUH3sEeyivuDeOiJBMg" name="ProcedureImplantsSectionCodeP" constrainedElement="_Z662wDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8PZUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7Rg4F9xEey5t-mahoHmrg" name="ProcedureImplantsSectionText" constrainedElement="_Z662wDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7Rg4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8QncH3sEeyivuDeOiJBMg" name="ProcedureImplantsSectionText" constrainedElement="_Z662wDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8QncX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7TWEF9xEey5t-mahoHmrg" name="ProcedureImplantsSectionTitle" constrainedElement="_Z662wDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7TWEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8R1kH3sEeyivuDeOiJBMg" name="ProcedureImplantsSectionTitle" constrainedElement="_Z662wDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8R1kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
@@ -12700,40 +12700,40 @@ value.code = '59771-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_ukS8sEEzEeGdmoWy_aLP0Q">
         <body>The Procedure Indications section records details about the reason for the procedure or surgery. This section may include the pre-procedure diagnosis or diagnoses as well as one or more symptoms that contribute to the reason the procedure is being performed.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r7UkMF9xEey5t-mahoHmrg" name="ProcedureIndicationsSectionTemplateId" constrainedElement="_cjmJMDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7UkMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8ScoH3sEeyivuDeOiJBMg" name="ProcedureIndicationsSectionTemplateId" constrainedElement="_cjmJMDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8ScoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.29')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7VyUF9xEey5t-mahoHmrg" name="ProcedureIndicationsSectionCode" constrainedElement="_cjmJMDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7VyUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8TDsH3sEeyivuDeOiJBMg" name="ProcedureIndicationsSectionCode" constrainedElement="_cjmJMDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8TDsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '59768-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7XAcF9xEey5t-mahoHmrg" name="ProcedureIndicationsSectionCodeP" constrainedElement="_cjmJMDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7XAcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8UR0H3sEeyivuDeOiJBMg" name="ProcedureIndicationsSectionCodeP" constrainedElement="_cjmJMDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8UR0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7YOkF9xEey5t-mahoHmrg" name="ProcedureIndicationsSectionTitle" constrainedElement="_cjmJMDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7YOkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8Vf8H3sEeyivuDeOiJBMg" name="ProcedureIndicationsSectionTitle" constrainedElement="_cjmJMDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8Vf8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7ZcsF9xEey5t-mahoHmrg" name="ProcedureIndicationsSectionText" constrainedElement="_cjmJMDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7ZcsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8WHAH3sEeyivuDeOiJBMg" name="ProcedureIndicationsSectionText" constrainedElement="_cjmJMDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8WHAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tXpYQF9xEey5t-mahoHmrg" name="ProcedureIndicationsSectionIndication" constrainedElement="_cjmJMDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tXpYQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FIg_MH3sEeyivuDeOiJBMg" name="ProcedureIndicationsSectionIndication" constrainedElement="_cjmJMDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FIg_MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::Indication))</body>
         </specification>
@@ -12741,15 +12741,15 @@ value.code = '59768-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_cjv6MDVzEeGaW4kr-GbV8Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_tXpYQl9xEey5t-mahoHmrg" name="getIndications" bodyCondition="_tXpYRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tXpYRV9xEey5t-mahoHmrg" name="body" constrainedElement="_tXpYQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tXpYRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FIg_Mn3sEeyivuDeOiJBMg" name="getIndications" bodyCondition="_FIg_NX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FIg_NX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FIg_Mn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FIg_Nn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication)).oclAsType(consol::Indication)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tXpYQ19xEey5t-mahoHmrg" type="_sHrUoBUSEeG6PvUxSTZnaw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tXpYRF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_FIg_M33sEeyivuDeOiJBMg" type="_sHrUoBUSEeG6PvUxSTZnaw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FIg_NH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -12757,34 +12757,34 @@ value.code = '59768-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_2NpTsEEzEeGdmoWy_aLP0Q">
         <body>The Procedure Specimens Taken section records the tissues, objects, or samples taken from the patient during the procedure including biopsies, aspiration fluid, or other samples sent for pathological analysis. The narrative may include a description of the specimens.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r7aq0F9xEey5t-mahoHmrg" name="ProcedureSpecimensTakenSectionTemplateId" constrainedElement="_gSUdsDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7aq0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8XVIH3sEeyivuDeOiJBMg" name="ProcedureSpecimensTakenSectionTemplateId" constrainedElement="_gSUdsDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8XVIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.31')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7bR4F9xEey5t-mahoHmrg" name="ProcedureSpecimensTakenSectionCode" constrainedElement="_gSUdsDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7bR4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8X8MH3sEeyivuDeOiJBMg" name="ProcedureSpecimensTakenSectionCode" constrainedElement="_gSUdsDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8X8MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '59773-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7cgAF9xEey5t-mahoHmrg" name="ProcedureSpecimensTakenSectionCodeP" constrainedElement="_gSUdsDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7cgAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8ZKUH3sEeyivuDeOiJBMg" name="ProcedureSpecimensTakenSectionCodeP" constrainedElement="_gSUdsDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8ZKUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7duIF9xEey5t-mahoHmrg" name="ProcedureSpecimensTakenSectionText" constrainedElement="_gSUdsDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7duIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8aYcH3sEeyivuDeOiJBMg" name="ProcedureSpecimensTakenSectionText" constrainedElement="_gSUdsDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8aYcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7e8QF9xEey5t-mahoHmrg" name="ProcedureSpecimensTakenSectionTitle" constrainedElement="_gSUdsDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7e8QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8bmkH3sEeyivuDeOiJBMg" name="ProcedureSpecimensTakenSectionTitle" constrainedElement="_gSUdsDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8bmkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
@@ -12797,34 +12797,34 @@ value.code = '59773-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_P7H3IEE3EeGdmoWy_aLP0Q">
         <body>The Subjective section describes in a narrative format the patient's current condition and/or interval changes as reported by the patient or by the patient's guardian or another informant.</body>
       </ownedComment>
-      <ownedRule xmi:id="_r7fjUF9xEey5t-mahoHmrg" name="SubjectiveSectionTemplateId" constrainedElement="_iy8nYDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7fjUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8cNoH3sEeyivuDeOiJBMg" name="SubjectiveSectionTemplateId" constrainedElement="_iy8nYDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8cNoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.21.2.2')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7gxcF9xEey5t-mahoHmrg" name="SubjectiveSectionCode" constrainedElement="_iy8nYDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7gxcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8dbwH3sEeyivuDeOiJBMg" name="SubjectiveSectionCode" constrainedElement="_iy8nYDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8dbwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '61150-9' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7h_kF9xEey5t-mahoHmrg" name="SubjectiveSectionCodeP" constrainedElement="_iy8nYDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7h_kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8eC0H3sEeyivuDeOiJBMg" name="SubjectiveSectionCodeP" constrainedElement="_iy8nYDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8eC0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7jNsF9xEey5t-mahoHmrg" name="SubjectiveSectionText" constrainedElement="_iy8nYDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7jNsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8fQ8H3sEeyivuDeOiJBMg" name="SubjectiveSectionText" constrainedElement="_iy8nYDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8fQ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r7j0wF9xEey5t-mahoHmrg" name="SubjectiveSectionTitle" constrainedElement="_iy8nYDVzEeGaW4kr-GbV8Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r7j0wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D8gfEH3sEeyivuDeOiJBMg" name="SubjectiveSectionTitle" constrainedElement="_iy8nYDVzEeGaW4kr-GbV8Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D8gfEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
@@ -12864,484 +12864,484 @@ Reports on visits requested by a patient, family member, or other third party ar
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForReferralSection)) xor self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r8khZl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r8khZ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D9UXZX3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D9UXZn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r9H7AF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCodeP" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r9H7AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D9zfkH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCodeP" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D9zfkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r8m9oF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCode" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r8m9oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D9WMkH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCode" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D9WMkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '11488-4' or value.code = '34100-8' or value.code = '34104-0' or value.code = '51845-6' or value.code = '51853-0' or value.code = '51846-4' or value.code = '34101-6' or value.code = '34749-2' or value.code = '34102-4' or value.code = '34099-2' or value.code = '34756-7' or value.code = '34758-3' or value.code = '34760-9' or value.code = '34879-7' or value.code = '34761-7' or value.code = '34764-1' or value.code = '34771-6' or value.code = '34776-5' or value.code = '34777-3' or value.code = '34779-9' or value.code = '34781-5' or value.code = '34783-1' or value.code = '34785-6' or value.code = '34795-5' or value.code = '34797-1' or value.code = '34798-9' or value.code = '34800-3' or value.code = '34803-7' or value.code = '34855-7' or value.code = '34805-2' or value.code = '34807-8' or value.code = '34810-2' or value.code = '34812-8' or value.code = '34814-4' or value.code = '34816-9' or value.code = '34820-1' or value.code = '34822-7' or value.code = '34824-3' or value.code = '34826-8' or value.code = '34828-4' or value.code = '34788-0' or value.code = '34791-4' or value.code = '34103-2' or value.code = '34831-8' or value.code = '34833-4' or value.code = '34835-9' or value.code = '34837-5' or value.code = '34839-1' or value.code = '34841-7' or value.code = '34845-8' or value.code = '34847-4' or value.code = '34849-0' or value.code = '34851-6' or value.code = '34853-2'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_r-WqEF9xEey5t-mahoHmrg" name="ConsultationNoteComponentOf" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_r-WqEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_D-uFkH3sEeyivuDeOiJBMg" name="ConsultationNoteComponentOf" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_D-uFkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->one(componentOf : cda::Component1 | not componentOf.oclIsUndefined() and componentOf.oclIsKindOf(cda::Component1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sA9SIF9xEey5t-mahoHmrg" name="ConsultationNoteAssessmentSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sA9SIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EAuQsH3sEeyivuDeOiJBMg" name="ConsultationNoteAssessmentSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EAuQsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sBdBYF9xEey5t-mahoHmrg" name="ConsultationNoteAssessmentAndPlanSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sBdBYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EBIgYH3sEeyivuDeOiJBMg" name="ConsultationNoteAssessmentAndPlanSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EBIgYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sCC3QF9xEey5t-mahoHmrg" name="ConsultationNotePlanOfCareSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sCC3QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EBqE0H3sEeyivuDeOiJBMg" name="ConsultationNotePlanOfCareSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EBqE0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfCareSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sCjNkF9xEey5t-mahoHmrg" name="ConsultationNoteHistoryOfPresentIllness" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sCjNkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ECJ0EH3sEeyivuDeOiJBMg" name="ConsultationNoteHistoryOfPresentIllness" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ECJ0EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sDBusF9xEey5t-mahoHmrg" name="ConsultationNotePhysicalExamSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sDBusV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ECxfIH3sEeyivuDeOiJBMg" name="ConsultationNotePhysicalExamSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ECxfIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sDhd8F9xEey5t-mahoHmrg" name="ConsultationNoteReasonForReferralSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sDhd8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EDROYH3sEeyivuDeOiJBMg" name="ConsultationNoteReasonForReferralSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EDROYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForReferralSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sEBNMF9xEey5t-mahoHmrg" name="ConsultationNoteReasonForVisitSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sEBNMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EDt6UH3sEeyivuDeOiJBMg" name="ConsultationNoteReasonForVisitSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EDt6UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sElN4F9xEey5t-mahoHmrg" name="ConsultationNoteAllergiesSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sElN4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EEJYIH3sEeyivuDeOiJBMg" name="ConsultationNoteAllergiesSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EEJYIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sFDH8F9xEey5t-mahoHmrg" name="ConsultationNoteChiefComplaintSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sFDH8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EEjn0H3sEeyivuDeOiJBMg" name="ConsultationNoteChiefComplaintSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EEjn0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sFiQIF9xEey5t-mahoHmrg" name="ConsultationNoteChiefComplaintAndReasonForVisitSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sFiQIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EE93gH3sEeyivuDeOiJBMg" name="ConsultationNoteChiefComplaintAndReasonForVisitSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EE-ekH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sF_jIF9xEey5t-mahoHmrg" name="ConsultationNoteFamilyHistorySection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sF_jIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EFYuQH3sEeyivuDeOiJBMg" name="ConsultationNoteFamilyHistorySection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EFYuQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sGeEQF9xEey5t-mahoHmrg" name="ConsultationNoteGeneralStatusSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sGeEQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EF2oUH3sEeyivuDeOiJBMg" name="ConsultationNoteGeneralStatusSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EF2oUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::GeneralStatusSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sHPgUF9xEey5t-mahoHmrg" name="ConsultationNoteHistoryOfPastIllnessSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sHPgUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EGVwgH3sEeyivuDeOiJBMg" name="ConsultationNoteHistoryOfPastIllnessSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EGVwgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sHv2oF9xEey5t-mahoHmrg" name="ConsultationNoteImmunizationsSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sHv2oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EGwnQH3sEeyivuDeOiJBMg" name="ConsultationNoteImmunizationsSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EGwnQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sIQM8F9xEey5t-mahoHmrg" name="ConsultationNoteMedicationsSectionEntriesOptional" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sIQM8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EHKP4H3sEeyivuDeOiJBMg" name="ConsultationNoteMedicationsSectionEntriesOptional" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EHKP4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sIuHAF9xEey5t-mahoHmrg" name="ConsultationNoteProblemSectionEntriesOptional" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sIuHAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EHlGoH3sEeyivuDeOiJBMg" name="ConsultationNoteProblemSectionEntriesOptional" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EHlGoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sJPEYF9xEey5t-mahoHmrg" name="ConsultationNoteProceduresSectionEntriesOptional" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sJPEYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EH_WUH3sEeyivuDeOiJBMg" name="ConsultationNoteProceduresSectionEntriesOptional" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EH_WUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sJsXYF9xEey5t-mahoHmrg" name="ConsultationNoteResultsSectionEntriesOptional" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sJsXYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EIXw0H3sEeyivuDeOiJBMg" name="ConsultationNoteResultsSectionEntriesOptional" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EIYX4H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sKMtsF9xEey5t-mahoHmrg" name="ConsultationNoteReviewOfSystemsSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sKMtsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EIyAgH3sEeyivuDeOiJBMg" name="ConsultationNoteReviewOfSystemsSection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EIyAgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sKr14F9xEey5t-mahoHmrg" name="ConsultationNoteSocialHistorySection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sKr14V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EJLpIH3sEeyivuDeOiJBMg" name="ConsultationNoteSocialHistorySection" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EJLpIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sLK-EF9xEey5t-mahoHmrg" name="ConsultationNoteVitalSignsSectionEntriesOptional" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sLK-EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EJlRwH3sEeyivuDeOiJBMg" name="ConsultationNoteVitalSignsSectionEntriesOptional" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EJlRwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_u-30wF9xEey5t-mahoHmrg" name="ConsultationNoteInFulfillmentOf" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_u-30wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GdcKwH3sEeyivuDeOiJBMg" name="ConsultationNoteInFulfillmentOf" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GdcKwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->exists(inFulfillmentOf : cda::InFulfillmentOf | not inFulfillmentOf.oclIsUndefined() and inFulfillmentOf.oclIsKindOf(cda::InFulfillmentOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6M-E4F9xEey5t-mahoHmrg" name="ConsultationNoteComponentOfEncompassingEncounter2ResponsiblePartyAssignedEntityHasPersonOrganizationOrBoth" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6M-E4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QXGXgH3sEeyivuDeOiJBMg" name="ConsultationNoteComponentOfEncompassingEncounter2ResponsiblePartyAssignedEntityHasPersonOrganizationOrBoth" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QXGXgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).responsibleParty->excluding(null)->reject(not assignedEntity.assignedPerson.oclIsUndefined() or not assignedEntity.representedOrganization->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6M-r8F9xEey5t-mahoHmrg" name="ConsultationNoteComponentOfEncompassingEncounter2ResponsiblePartyAssignedEntity" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6M-r8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QXGXgn3sEeyivuDeOiJBMg" name="ConsultationNoteComponentOfEncompassingEncounter2ResponsiblePartyAssignedEntity" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QXGXg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).responsibleParty->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(rim::Role)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6NgQYF9xEey5t-mahoHmrg" name="ConsultationNoteComponentOfEncompassingEncounter2EncounterParticipantAssignedEntityHasPersonOrganizationOrBoth" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6NgQYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QX5owH3sEeyivuDeOiJBMg" name="ConsultationNoteComponentOfEncompassingEncounter2EncounterParticipantAssignedEntityHasPersonOrganizationOrBoth" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QX5owX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).encounterParticipant->excluding(null)->reject(not assignedEntity.assignedPerson.oclIsUndefined() or not assignedEntity.representedOrganization->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6NgQYl9xEey5t-mahoHmrg" name="ConsultationNoteComponentOfEncompassingEncounter2EncounterParticipantAssignedEntity" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6NgQY19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QX6P0H3sEeyivuDeOiJBMg" name="ConsultationNoteComponentOfEncompassingEncounter2EncounterParticipantAssignedEntity" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QX6P0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).encounterParticipant->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(rim::Role)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Ng3cF9xEey5t-mahoHmrg" name="ConsultationNoteComponentOfEncompassingEncounter2PreciseToTheDay" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Ng3cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QX6P0n3sEeyivuDeOiJBMg" name="ConsultationNoteComponentOfEncompassingEncounter2PreciseToTheDay" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QX6P033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(not effectiveTime.value.oclIsUndefined() implies effectiveTime.value.size() >= 8)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Ng3cl9xEey5t-mahoHmrg" name="ConsultationNoteComponentOfEncompassingEncounter2PreciseToTheMinute" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Ng3c19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QX624H3sEeyivuDeOiJBMg" name="ConsultationNoteComponentOfEncompassingEncounter2PreciseToTheMinute" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QX624X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(not effectiveTime.value.oclIsUndefined() implies effectiveTime.value.size() >= 12)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Ng3dF9xEey5t-mahoHmrg" name="ConsultationNoteComponentOfEncompassingEncounter2PreciseToTheSecond" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Ng3dV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QX624n3sEeyivuDeOiJBMg" name="ConsultationNoteComponentOfEncompassingEncounter2PreciseToTheSecond" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QX62433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(not effectiveTime.value.oclIsUndefined() implies effectiveTime.value.size() >= 14)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6NhegF9xEey5t-mahoHmrg" name="ConsultationNoteComponentOfEncompassingEncounter2IfMorePreciseThanDayIncludeTimeZoneOffset" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6NhegV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QX7d8H3sEeyivuDeOiJBMg" name="ConsultationNoteComponentOfEncompassingEncounter2IfMorePreciseThanDayIncludeTimeZoneOffset" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QX7d8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(not effectiveTime.value.oclIsUndefined() and effectiveTime.value.size() > 8 implies effectiveTime.value.size() >= 15)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Nhegl9xEey5t-mahoHmrg" name="ConsultationNoteComponentOfEncompassingEncounter2EffectiveTime" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Nheg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QX7d8n3sEeyivuDeOiJBMg" name="ConsultationNoteComponentOfEncompassingEncounter2EffectiveTime" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QX7d833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6NiFkF9xEey5t-mahoHmrg" name="ConsultationNoteComponentOfEncompassingEncounter2Id" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6NiFkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QX8FAH3sEeyivuDeOiJBMg" name="ConsultationNoteComponentOfEncompassingEncounter2Id" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QX8FAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (id->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6NiFkl9xEey5t-mahoHmrg" name="ConsultationNoteComponentOfEncompassingEncounter2ResponsibleParty" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6NiFk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QX8sEH3sEeyivuDeOiJBMg" name="ConsultationNoteComponentOfEncompassingEncounter2ResponsibleParty" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QX8sEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(responsibleParty->one(responsibleParty : cda::ResponsibleParty | not responsibleParty.oclIsUndefined() and responsibleParty.oclIsKindOf(cda::ResponsibleParty)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6NisoF9xEey5t-mahoHmrg" name="ConsultationNoteComponentOfEncompassingEncounter2EncounterParticipant" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6NisoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QX8sEn3sEeyivuDeOiJBMg" name="ConsultationNoteComponentOfEncompassingEncounter2EncounterParticipant" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QX8sE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(encounterParticipant->exists(encounterParticipant : cda::EncounterParticipant | not encounterParticipant.oclIsUndefined() and encounterParticipant.oclIsKindOf(cda::EncounterParticipant)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Nisol9xEey5t-mahoHmrg" name="ConsultationNoteComponentOfEncompassingEncounter" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Niso19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QX9TIH3sEeyivuDeOiJBMg" name="ConsultationNoteComponentOfEncompassingEncounter" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QX9TIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null)->reject(encompassingEncounter->one(encompassingEncounter : cda::EncompassingEncounter | not encompassingEncounter.oclIsUndefined() and encompassingEncounter.oclIsKindOf(cda::EncompassingEncounter)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6OknYF9xEey5t-mahoHmrg" name="ConsultationNoteInFulfillmentOfOrderId" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6OknYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QZSI0H3sEeyivuDeOiJBMg" name="ConsultationNoteInFulfillmentOfOrderId" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QZSI0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->excluding(null).order->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6OknYl9xEey5t-mahoHmrg" name="ConsultationNoteInFulfillmentOfOrder" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6OknY19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QZSI0n3sEeyivuDeOiJBMg" name="ConsultationNoteInFulfillmentOfOrder" constrainedElement="_R-vIoDssEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QZSI033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->excluding(null)->reject(order->one(order : cda::Order | not order.oclIsUndefined() and order.oclIsKindOf(cda::Order)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_R_oggDssEeGvzMYhXuqAEA" general="_2DNRcBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_sA9SIl9xEey5t-mahoHmrg" name="getAssessmentSection" bodyCondition="_sA9SJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sA9SJV9xEey5t-mahoHmrg" name="body" constrainedElement="_sA9SIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sA9SJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EAu3wH3sEeyivuDeOiJBMg" name="getAssessmentSection" bodyCondition="_EAu3w33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EAu3w33sEeyivuDeOiJBMg" name="body" constrainedElement="_EAu3wH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EAu3xH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))->asSequence()->any(true).oclAsType(consol::AssessmentSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sA9SI19xEey5t-mahoHmrg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sA9SJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EAu3wX3sEeyivuDeOiJBMg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EAu3wn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sBdocF9xEey5t-mahoHmrg" name="getAssessmentAndPlanSection" bodyCondition="_sBdoc19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sBdoc19xEey5t-mahoHmrg" name="body" constrainedElement="_sBdocF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sBdodF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EBIgYn3sEeyivuDeOiJBMg" name="getAssessmentAndPlanSection" bodyCondition="_EBIgZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EBIgZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EBIgYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EBIgZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection))->asSequence()->any(true).oclAsType(consol::AssessmentAndPlanSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sBdocV9xEey5t-mahoHmrg" type="_2Rwq0BSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sBdocl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EBIgY33sEeyivuDeOiJBMg" type="_2Rwq0BSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EBIgZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sCDeUF9xEey5t-mahoHmrg" name="getPlanOfCareSection" bodyCondition="_sCDeU19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sCDeU19xEey5t-mahoHmrg" name="body" constrainedElement="_sCDeUF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sCDeVF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EBqr4H3sEeyivuDeOiJBMg" name="getPlanOfCareSection" bodyCondition="_EBqr433sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EBqr433sEeyivuDeOiJBMg" name="body" constrainedElement="_EBqr4H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EBqr5H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfCareSection))->asSequence()->any(true).oclAsType(consol::PlanOfCareSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sCDeUV9xEey5t-mahoHmrg" type="_2NP-QxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sCDeUl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EBqr4X3sEeyivuDeOiJBMg" type="_2NP-QxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EBqr4n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sCj0oF9xEey5t-mahoHmrg" name="getHistoryOfPresentIllness" bodyCondition="_sCj0o19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sCj0o19xEey5t-mahoHmrg" name="body" constrainedElement="_sCj0oF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sCj0pF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_ECJ0En3sEeyivuDeOiJBMg" name="getHistoryOfPresentIllness" bodyCondition="_ECKbIX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ECKbIX3sEeyivuDeOiJBMg" name="body" constrainedElement="_ECJ0En3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ECKbIn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))->asSequence()->any(true).oclAsType(consol::HistoryOfPresentIllnessSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sCj0oV9xEey5t-mahoHmrg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sCj0ol9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_ECJ0E33sEeyivuDeOiJBMg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ECKbIH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sDBusl9xEey5t-mahoHmrg" name="getPhysicalExamSection" bodyCondition="_sDButV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sDButV9xEey5t-mahoHmrg" name="body" constrainedElement="_sDBusl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sDButl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_ECxfIn3sEeyivuDeOiJBMg" name="getPhysicalExamSection" bodyCondition="_ECyGMn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ECyGMn3sEeyivuDeOiJBMg" name="body" constrainedElement="_ECxfIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ECyGM33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection))->asSequence()->any(true).oclAsType(consol::PhysicalExamSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sDBus19xEey5t-mahoHmrg" type="_2Pxt0hSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sDButF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_ECyGMH3sEeyivuDeOiJBMg" type="_2Pxt0hSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ECyGMX3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sDhd8l9xEey5t-mahoHmrg" name="getReasonForReferralSection" bodyCondition="_sDhd9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sDhd9V9xEey5t-mahoHmrg" name="body" constrainedElement="_sDhd8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sDhd9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EDROYn3sEeyivuDeOiJBMg" name="getReasonForReferralSection" bodyCondition="_EDROZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EDROZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EDROYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EDROZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForReferralSection))->asSequence()->any(true).oclAsType(consol::ReasonForReferralSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sDhd819xEey5t-mahoHmrg" type="_2PWQFxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sDhd9F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EDROY33sEeyivuDeOiJBMg" type="_2PWQFxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EDROZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sEB0QF9xEey5t-mahoHmrg" name="getReasonForVisitSection" bodyCondition="_sEB0Q19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sEB0Q19xEey5t-mahoHmrg" name="body" constrainedElement="_sEB0QF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sEB0RF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EDt6Un3sEeyivuDeOiJBMg" name="getReasonForVisitSection" bodyCondition="_EDuhYn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EDuhYn3sEeyivuDeOiJBMg" name="body" constrainedElement="_EDt6Un3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EDuhY33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))->asSequence()->any(true).oclAsType(consol::ReasonForVisitSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sEB0QV9xEey5t-mahoHmrg" type="_Nm64UCscEeGHF88-qhhUMA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sEB0Ql9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EDuhYH3sEeyivuDeOiJBMg" type="_Nm64UCscEeGHF88-qhhUMA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EDuhYX3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sEl08F9xEey5t-mahoHmrg" name="getAllergiesSection" bodyCondition="_sEl0819xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sEl0819xEey5t-mahoHmrg" name="body" constrainedElement="_sEl08F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sEl09F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EEJYIn3sEeyivuDeOiJBMg" name="getAllergiesSection" bodyCondition="_EEJYJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EEJYJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EEJYIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EEJYJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::AllergiesSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sEl08V9xEey5t-mahoHmrg" type="_bGzYgBVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sEl08l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EEJYI33sEeyivuDeOiJBMg" type="_bGzYgBVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EEJYJH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sFDH8l9xEey5t-mahoHmrg" name="getChiefComplaintSection" bodyCondition="_sFDH9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sFDH9V9xEey5t-mahoHmrg" name="body" constrainedElement="_sFDH8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sFDH9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EEjn0n3sEeyivuDeOiJBMg" name="getChiefComplaintSection" bodyCondition="_EEjn1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EEjn1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_EEjn0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EEjn1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))->asSequence()->any(true).oclAsType(consol::ChiefComplaintSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sFDH819xEey5t-mahoHmrg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sFDH9F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EEjn033sEeyivuDeOiJBMg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EEjn1H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sFiQIl9xEey5t-mahoHmrg" name="getChiefComplaintAndReasonForVisitSection" bodyCondition="_sFiQJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sFiQJV9xEey5t-mahoHmrg" name="body" constrainedElement="_sFiQIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sFiQJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EE-ekX3sEeyivuDeOiJBMg" name="getChiefComplaintAndReasonForVisitSection" bodyCondition="_EE-elH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EE-elH3sEeyivuDeOiJBMg" name="body" constrainedElement="_EE-ekX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EE-elX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))->asSequence()->any(true).oclAsType(consol::ChiefComplaintAndReasonForVisitSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sFiQI19xEey5t-mahoHmrg" type="_oI7CQCsaEeGHF88-qhhUMA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sFiQJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EE-ekn3sEeyivuDeOiJBMg" type="_oI7CQCsaEeGHF88-qhhUMA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EE-ek33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sF_jIl9xEey5t-mahoHmrg" name="getFamilyHistorySection" bodyCondition="_sF_jJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sF_jJV9xEey5t-mahoHmrg" name="body" constrainedElement="_sF_jIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sF_jJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EFYuQn3sEeyivuDeOiJBMg" name="getFamilyHistorySection" bodyCondition="_EFYuRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EFYuRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EFYuQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EFYuRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection))->asSequence()->any(true).oclAsType(consol::FamilyHistorySection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sF_jI19xEey5t-mahoHmrg" type="_2IWQIxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sF_jJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EFYuQ33sEeyivuDeOiJBMg" type="_2IWQIxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EFYuRH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sGeEQl9xEey5t-mahoHmrg" name="getGeneralStatusSection" bodyCondition="_sGeERV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sGeERV9xEey5t-mahoHmrg" name="body" constrainedElement="_sGeEQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sGeERl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EF3PYH3sEeyivuDeOiJBMg" name="getGeneralStatusSection" bodyCondition="_EF3PY33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EF3PY33sEeyivuDeOiJBMg" name="body" constrainedElement="_EF3PYH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EF3PZH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::GeneralStatusSection))->asSequence()->any(true).oclAsType(consol::GeneralStatusSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sGeEQ19xEey5t-mahoHmrg" type="_2Pxt6xSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sGeERF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EF3PYX3sEeyivuDeOiJBMg" type="_2Pxt6xSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EF3PYn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sHQHYF9xEey5t-mahoHmrg" name="getHistoryOfPastIllnessSection" bodyCondition="_sHQHY19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sHQHY19xEey5t-mahoHmrg" name="body" constrainedElement="_sHQHYF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sHQHZF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EGVwgn3sEeyivuDeOiJBMg" name="getHistoryOfPastIllnessSection" bodyCondition="_EGVwhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EGVwhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EGVwgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EGVwhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection))->asSequence()->any(true).oclAsType(consol::HistoryOfPastIllnessSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sHQHYV9xEey5t-mahoHmrg" type="_2PQJcxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sHQHYl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EGVwg33sEeyivuDeOiJBMg" type="_2PQJcxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EGVwhH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sHv2ol9xEey5t-mahoHmrg" name="getImmunizationsSection" bodyCondition="_sHv2pV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sHv2pV9xEey5t-mahoHmrg" name="body" constrainedElement="_sHv2ol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sHv2pl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EGwnQn3sEeyivuDeOiJBMg" name="getImmunizationsSection" bodyCondition="_EGwnRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EGwnRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EGwnQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EGwnRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSection))->asSequence()->any(true).oclAsType(consol::ImmunizationsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sHv2o19xEey5t-mahoHmrg" type="_2L7voBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sHv2pF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EGwnQ33sEeyivuDeOiJBMg" type="_2L7voBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EGwnRH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sIQM8l9xEey5t-mahoHmrg" name="getMedicationsSectionEntriesOptional" bodyCondition="_sIQM9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sIQM9V9xEey5t-mahoHmrg" name="body" constrainedElement="_sIQM8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sIQM9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EHK28H3sEeyivuDeOiJBMg" name="getMedicationsSectionEntriesOptional" bodyCondition="_EHK2833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EHK2833sEeyivuDeOiJBMg" name="body" constrainedElement="_EHK28H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EHK29H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::MedicationsSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sIQM819xEey5t-mahoHmrg" type="_iAoXEBVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sIQM9F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EHK28X3sEeyivuDeOiJBMg" type="_iAoXEBVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EHK28n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sIuuEF9xEey5t-mahoHmrg" name="getProblemSectionEntriesOptional" bodyCondition="_sIuuE19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sIuuE19xEey5t-mahoHmrg" name="body" constrainedElement="_sIuuEF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sIuuFF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EHlGon3sEeyivuDeOiJBMg" name="getProblemSectionEntriesOptional" bodyCondition="_EHlGpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EHlGpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EHlGon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EHlGpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::ProblemSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sIuuEV9xEey5t-mahoHmrg" type="_naxrkBVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sIuuEl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EHlGo33sEeyivuDeOiJBMg" type="_naxrkBVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EHlGpH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sJPrcF9xEey5t-mahoHmrg" name="getProceduresSectionEntriesOptional" bodyCondition="_sJPrc19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sJPrc19xEey5t-mahoHmrg" name="body" constrainedElement="_sJPrcF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sJPrdF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EH_WUn3sEeyivuDeOiJBMg" name="getProceduresSectionEntriesOptional" bodyCondition="_EH_WVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EH_WVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EH_WUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EH_WVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::ProceduresSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sJPrcV9xEey5t-mahoHmrg" type="_s9Ig4BVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sJPrcl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EH_WU33sEeyivuDeOiJBMg" type="_s9Ig4BVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EH_WVH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sJs-cF9xEey5t-mahoHmrg" name="getResultsSectionEntriesOptional" bodyCondition="_sJs-c19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sJs-c19xEey5t-mahoHmrg" name="body" constrainedElement="_sJs-cF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sJs-dF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EIYX4X3sEeyivuDeOiJBMg" name="getResultsSectionEntriesOptional" bodyCondition="_EIYX5H3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EIYX5H3sEeyivuDeOiJBMg" name="body" constrainedElement="_EIYX4X3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EIYX5X3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::ResultsSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sJs-cV9xEey5t-mahoHmrg" type="_xGqiEBVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sJs-cl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EIYX4n3sEeyivuDeOiJBMg" type="_xGqiEBVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EIYX433sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sKNUwF9xEey5t-mahoHmrg" name="getReviewOfSystemsSection" bodyCondition="_sKNUw19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sKNUw19xEey5t-mahoHmrg" name="body" constrainedElement="_sKNUwF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sKNUxF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EIyAgn3sEeyivuDeOiJBMg" name="getReviewOfSystemsSection" bodyCondition="_EIyAhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EIyAhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EIyAgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EIyAhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))->asSequence()->any(true).oclAsType(consol::ReviewOfSystemsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sKNUwV9xEey5t-mahoHmrg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sKNUwl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EIyAg33sEeyivuDeOiJBMg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EIyAhH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sKr14l9xEey5t-mahoHmrg" name="getSocialHistorySection" bodyCondition="_sKr15V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sKr15V9xEey5t-mahoHmrg" name="body" constrainedElement="_sKr14l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sKr15l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EJLpIn3sEeyivuDeOiJBMg" name="getSocialHistorySection" bodyCondition="_EJLpJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EJLpJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EJLpIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EJLpJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection))->asSequence()->any(true).oclAsType(consol::SocialHistorySection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sKr1419xEey5t-mahoHmrg" type="_2JKvgBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sKr15F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EJLpI33sEeyivuDeOiJBMg" type="_2JKvgBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EJLpJH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sLLlIF9xEey5t-mahoHmrg" name="getVitalSignsSectionEntriesOptional" bodyCondition="_sLLlI19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sLLlI19xEey5t-mahoHmrg" name="body" constrainedElement="_sLLlIF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sLLlJF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EJlRwn3sEeyivuDeOiJBMg" name="getVitalSignsSectionEntriesOptional" bodyCondition="_EJlRxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EJlRxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EJlRwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EJlRxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::VitalSignsSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sLLlIV9xEey5t-mahoHmrg" type="_bRH8sBVeEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sLLlIl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EJlRw33sEeyivuDeOiJBMg" type="_bRH8sBVeEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EJlRxH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -13349,34 +13349,34 @@ value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '11488-4' or value.
       <ownedComment xmi:id="_SHlZkEE1EeGdmoWy_aLP0Q">
         <body>The Assessment section (also referred to as impression or diagnoses outside of the context of CDA) represents the clinician's conclusions and working assumptions that will guide treatment of the patient. The assessment may be a list of specific disease entities or a narrative block.</body>
       </ownedComment>
-      <ownedRule xmi:id="_sBdodV9xEey5t-mahoHmrg" name="AssessmentSectionTemplateId" constrainedElement="_W8pI4DszEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sBdodl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EBIgZ33sEeyivuDeOiJBMg" name="AssessmentSectionTemplateId" constrainedElement="_W8pI4DszEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EBIgaH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.8')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sBe2kF9xEey5t-mahoHmrg" name="AssessmentSectionCode" constrainedElement="_W8pI4DszEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sBe2kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EBJugH3sEeyivuDeOiJBMg" name="AssessmentSectionCode" constrainedElement="_W8pI4DszEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EBJugX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '51848-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sBgEsF9xEey5t-mahoHmrg" name="AssessmentSectionCodeP" constrainedElement="_W8pI4DszEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sBgEsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EBK8oH3sEeyivuDeOiJBMg" name="AssessmentSectionCodeP" constrainedElement="_W8pI4DszEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EBK8oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sBh54F9xEey5t-mahoHmrg" name="AssessmentSectionText" constrainedElement="_W8pI4DszEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sBh54V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EBLjsH3sEeyivuDeOiJBMg" name="AssessmentSectionText" constrainedElement="_W8pI4DszEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EBLjsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sBjIAF9xEey5t-mahoHmrg" name="AssessmentSectionTitle" constrainedElement="_W8pI4DszEeGvzMYhXuqAEA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sBjIAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EBMx0H3sEeyivuDeOiJBMg" name="AssessmentSectionTitle" constrainedElement="_W8pI4DszEeGvzMYhXuqAEA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EBMx0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
@@ -13417,478 +13417,478 @@ A History and Physical Examination is required upon hospital admission as well a
           <body>(self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection)) or  self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))) xor self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sU9zQF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sU9zQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ESG7on3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ESG7o33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.3')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sVhM4F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCodeP" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sVhM4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ESyREH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCodeP" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ESyREX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sVAPgF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCode" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sVAPgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ESJX4H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCode" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ESJX4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '34117-2' or value.code = '11492-6' or value.code = '28626-0' or value.code = '34774-0' or value.code = '34115-6' or value.code = '34116-4' or value.code = '34095-0' or value.code = '34096-8' or value.code = '51849-8' or value.code = '47039-3' or value.code = '34763-3' or value.code = '34094-3' or value.code = '34138-8'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sW8wQF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteInFulfillmentOf" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sW8wQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ETxvkH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteInFulfillmentOf" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ETxvkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->exists(inFulfillmentOf : cda::InFulfillmentOf | not inFulfillmentOf.oclIsUndefined() and inFulfillmentOf.oclIsKindOf(rim::ActRelationship))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sarZsF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteComponentOf" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sarZsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EWz1cH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteComponentOf" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EWz1cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->one(componentOf : cda::Component1 | not componentOf.oclIsUndefined() and componentOf.oclIsKindOf(cda::Component1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sbLI8F9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteAllergiesSectionEntriesOptional" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sbLI8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EXM3AH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteAllergiesSectionEntriesOptional" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EXM3AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sbstYF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteAssessmentSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sbstYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EXmfoH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteAssessmentSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EXmfoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_scOR0F9xEey5t-mahoHmrg" name="HistoryAndPhysicalNotePlanOfCareSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_scOR0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EYAvUH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNotePlanOfCareSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EYAvUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfCareSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_scv2QF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteAssessmentAndPlanSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_scv2QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EYbmEH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteAssessmentAndPlanSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EYbmEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sdQMkF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteChiefComplaintSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sdQMkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EY1OsH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteChiefComplaintSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EY1OsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sdxJ8F9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteChiefComplaintAndReasonForVisitSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sdxJ8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EZO3UH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteChiefComplaintAndReasonForVisitSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EZO3UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sePrEF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteFamilyHistorySection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sePrEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EZsxYH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteFamilyHistorySection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EZsxYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ses-EF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteGeneralStatusSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ses-EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EaHoIH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteGeneralStatusSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EaHoIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::GeneralStatusSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sfNUYF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteHistoryOfPastIllnessSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sfN7cF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Eaie4H3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteHistoryOfPastIllnessSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Eaie4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sfqnYF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteMedicationsSectionEntriesOptional" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sfqnYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ea98sH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteMedicationsSectionEntriesOptional" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ea98sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sgLkwF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNotePhysicalExamSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sgLkwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EbW-QH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNotePhysicalExamSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EbW-QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sgrUAF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteReasonForVisitSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sgrUAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ebwm4H3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteReasonForVisitSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ebwm4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_shLqUF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteResultsSectionEntriesOptional" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_shLqUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EcKPgH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteResultsSectionEntriesOptional" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EcKPgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_shsAoF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteReviewOfSystemsSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_shsnsF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ecj4IH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteReviewOfSystemsSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ecj4IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_siMW8F9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteSocialHistorySection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_siMW8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ec-u4H3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteSocialHistorySection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ec-u4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_siqRAF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteHistoryOfPresentIllnessSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_siqRAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EdcB4H3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteHistoryOfPresentIllnessSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EdcB4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sjMcgF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteImmunizationsSectionEntriesOptional" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sjMcgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ed2RkH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteImmunizationsSectionEntriesOptional" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ed2RkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sjsy0F9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteProblemSectionEntriesOptional" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sjtZ4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EeP6MH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteProblemSectionEntriesOptional" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EeP6MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_skNJIF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteProceduresSectionEntriesOptional" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_skNJIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Eepi0H3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteProceduresSectionEntriesOptional" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Eepi0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sk0NIF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteVitalSignsSectionEntriesOptional" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sk0NIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EfDLcH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteVitalSignsSectionEntriesOptional" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EfDLcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_u8TB4F9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteInstructionsSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_u8TB4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GbZjYH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteInstructionsSection" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GbZjYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::InstructionsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6QFqUF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4ResponsiblePartyAssignedEntityHasPersonOrOrganization" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6QGRYF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qa_ZAH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4ResponsiblePartyAssignedEntityHasPersonOrOrganization" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qa_ZAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).responsibleParty->excluding(null)->reject(not assignedEntity.assignedPerson.oclIsUndefined() or not assignedEntity.representedOrganization->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6QGRYV9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4ResponsiblePartyAssignedEntity" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6QGRYl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qa_ZAn3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4ResponsiblePartyAssignedEntity" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qa_ZA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).responsibleParty->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(rim::Role)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6QnOwF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EncounterParticipantAssignedEntityHasPersonOrOrganization" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6QnOwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QbiyoH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EncounterParticipantAssignedEntityHasPersonOrOrganization" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QbiyoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).encounterParticipant->excluding(null)->reject(not assignedEntity.assignedPerson.oclIsUndefined() or not assignedEntity.representedOrganization->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6QnOwl9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EncounterParticipantAssignedEntity" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6QnOw19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qbiyon3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EncounterParticipantAssignedEntity" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qbiyo33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).encounterParticipant->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(rim::Role)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6QnOxF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4PreciseToTheDay" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6QnOxV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QbjZsH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4PreciseToTheDay" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QbjZsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(not effectiveTime.value.oclIsUndefined() implies effectiveTime.value.size() >= 8)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Qn10F9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4PreciseToTheMinute" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Qn10V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QbkAwH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4PreciseToTheMinute" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QbkAwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(not effectiveTime.value.oclIsUndefined() implies effectiveTime.value.size() >= 12)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Qn10l9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4PreciseToTheSecond" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Qn1019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QbkAwn3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4PreciseToTheSecond" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QbkAw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(not effectiveTime.value.oclIsUndefined() implies effectiveTime.value.size() >= 14)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Qoc4F9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4IfMorePreciseThanDayIncludeTimeZoneOffset" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Qoc4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qbkn0H3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4IfMorePreciseThanDayIncludeTimeZoneOffset" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qbkn0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(not effectiveTime.value.oclIsUndefined() and effectiveTime.value.size() > 8 implies effectiveTime.value.size() >= 15)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Qoc4l9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EffectiveTime" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Qoc419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qbkn0n3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EffectiveTime" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qbkn033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Qoc5F9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4Id" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Qoc5V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qbkn1H3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4Id" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qbkn1X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (id->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6QpD8F9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4Location" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6QpD8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QblO4H3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4Location" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QblO4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(location->one(location : cda::Location | not location.oclIsUndefined() and location.oclIsKindOf(rim::Participation)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6QpD8l9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4ResponsibleParty" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6QpD819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QblO4n3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4ResponsibleParty" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QblO433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(responsibleParty->one(responsibleParty : cda::ResponsibleParty | not responsibleParty.oclIsUndefined() and responsibleParty.oclIsKindOf(cda::ResponsibleParty)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6QprAF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EncounterParticipant" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6QprAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qbl18H3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EncounterParticipant" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qbl18X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(encounterParticipant->one(encounterParticipant : cda::EncounterParticipant | not encounterParticipant.oclIsUndefined() and encounterParticipant.oclIsKindOf(cda::EncounterParticipant)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6QprAl9xEey5t-mahoHmrg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6QprA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qbl18n3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNoteComponentOfEncompassingEncounter" constrainedElement="_-Qa60D1jEeG3tde5scYNWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qbl1833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null)->reject(encompassingEncounter->one(encompassingEncounter : cda::EncompassingEncounter | not encompassingEncounter.oclIsUndefined() and encompassingEncounter.oclIsKindOf(cda::EncompassingEncounter)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_-QelMD1jEeG3tde5scYNWA" general="_2DNRcBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_sbLwAF9xEey5t-mahoHmrg" name="getAllergiesSectionEntriesOptional" bodyCondition="_sbLwA19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sbLwA19xEey5t-mahoHmrg" name="body" constrainedElement="_sbLwAF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sbLwBF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EXM3An3sEeyivuDeOiJBMg" name="getAllergiesSectionEntriesOptional" bodyCondition="_EXM3BX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EXM3BX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EXM3An3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EXM3Bn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::AllergiesSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sbLwAV9xEey5t-mahoHmrg" type="_bGzYgBVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sbLwAl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EXM3A33sEeyivuDeOiJBMg" type="_bGzYgBVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EXM3BH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sbstYl9xEey5t-mahoHmrg" name="getAssessmentSection" bodyCondition="_sbstZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sbstZV9xEey5t-mahoHmrg" name="body" constrainedElement="_sbstYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sbstZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EXnGsH3sEeyivuDeOiJBMg" name="getAssessmentSection" bodyCondition="_EXnGs33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EXnGs33sEeyivuDeOiJBMg" name="body" constrainedElement="_EXnGsH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EXnGtH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))->asSequence()->any(true).oclAsType(consol::AssessmentSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sbstY19xEey5t-mahoHmrg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sbstZF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EXnGsX3sEeyivuDeOiJBMg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EXnGsn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_scOR0l9xEey5t-mahoHmrg" name="getPlanOfCareSection" bodyCondition="_scO44V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_scO44V9xEey5t-mahoHmrg" name="body" constrainedElement="_scOR0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_scO44l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EYBWYH3sEeyivuDeOiJBMg" name="getPlanOfCareSection" bodyCondition="_EYBWY33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EYBWY33sEeyivuDeOiJBMg" name="body" constrainedElement="_EYBWYH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EYBWZH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfCareSection))->asSequence()->any(true).oclAsType(consol::PlanOfCareSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_scOR019xEey5t-mahoHmrg" type="_2NP-QxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_scO44F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EYBWYX3sEeyivuDeOiJBMg" type="_2NP-QxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EYBWYn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_scv2Ql9xEey5t-mahoHmrg" name="getAssessmentAndPlanSection" bodyCondition="_scv2RV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_scv2RV9xEey5t-mahoHmrg" name="body" constrainedElement="_scv2Ql9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_scv2Rl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EYbmEn3sEeyivuDeOiJBMg" name="getAssessmentAndPlanSection" bodyCondition="_EYbmFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EYbmFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EYbmEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EYbmFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection))->asSequence()->any(true).oclAsType(consol::AssessmentAndPlanSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_scv2Q19xEey5t-mahoHmrg" type="_2Rwq0BSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_scv2RF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EYbmE33sEeyivuDeOiJBMg" type="_2Rwq0BSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EYbmFH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sdQMkl9xEey5t-mahoHmrg" name="getChiefComplaintSection" bodyCondition="_sdQzol9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sdQzol9xEey5t-mahoHmrg" name="body" constrainedElement="_sdQMkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sdQzo19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EY11wH3sEeyivuDeOiJBMg" name="getChiefComplaintSection" bodyCondition="_EY11w33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EY11w33sEeyivuDeOiJBMg" name="body" constrainedElement="_EY11wH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EY11xH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))->asSequence()->any(true).oclAsType(consol::ChiefComplaintSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sdQzoF9xEey5t-mahoHmrg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sdQzoV9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EY11wX3sEeyivuDeOiJBMg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EY11wn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sdxJ8l9xEey5t-mahoHmrg" name="getChiefComplaintAndReasonForVisitSection" bodyCondition="_sdxxAV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sdxxAV9xEey5t-mahoHmrg" name="body" constrainedElement="_sdxJ8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sdxxAl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EZPeYH3sEeyivuDeOiJBMg" name="getChiefComplaintAndReasonForVisitSection" bodyCondition="_EZPeY33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EZPeY33sEeyivuDeOiJBMg" name="body" constrainedElement="_EZPeYH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EZPeZH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))->asSequence()->any(true).oclAsType(consol::ChiefComplaintAndReasonForVisitSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sdxJ819xEey5t-mahoHmrg" type="_oI7CQCsaEeGHF88-qhhUMA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sdxxAF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EZPeYX3sEeyivuDeOiJBMg" type="_oI7CQCsaEeGHF88-qhhUMA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EZPeYn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_seQSIF9xEey5t-mahoHmrg" name="getFamilyHistorySection" bodyCondition="_seQSI19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_seQSI19xEey5t-mahoHmrg" name="body" constrainedElement="_seQSIF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_seQSJF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EZsxYn3sEeyivuDeOiJBMg" name="getFamilyHistorySection" bodyCondition="_EZsxZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EZsxZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EZsxYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EZtYcH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection))->asSequence()->any(true).oclAsType(consol::FamilyHistorySection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_seQSIV9xEey5t-mahoHmrg" type="_2IWQIxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_seQSIl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EZsxY33sEeyivuDeOiJBMg" type="_2IWQIxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EZsxZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_setlIF9xEey5t-mahoHmrg" name="getGeneralStatusSection" bodyCondition="_setlI19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_setlI19xEey5t-mahoHmrg" name="body" constrainedElement="_setlIF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_setlJF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EaHoIn3sEeyivuDeOiJBMg" name="getGeneralStatusSection" bodyCondition="_EaHoJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EaHoJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EaHoIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EaHoJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::GeneralStatusSection))->asSequence()->any(true).oclAsType(consol::GeneralStatusSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_setlIV9xEey5t-mahoHmrg" type="_2Pxt6xSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_setlIl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EaHoI33sEeyivuDeOiJBMg" type="_2Pxt6xSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EaHoJH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sfN7cV9xEey5t-mahoHmrg" name="getHistoryOfPastIllnessSection" bodyCondition="_sfN7dF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sfN7dF9xEey5t-mahoHmrg" name="body" constrainedElement="_sfN7cV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sfN7dV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Eaie4n3sEeyivuDeOiJBMg" name="getHistoryOfPastIllnessSection" bodyCondition="_Eaie5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Eaie5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_Eaie4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Eaie5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection))->asSequence()->any(true).oclAsType(consol::HistoryOfPastIllnessSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sfN7cl9xEey5t-mahoHmrg" type="_2PQJcxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sfN7c19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Eaie433sEeyivuDeOiJBMg" type="_2PQJcxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Eaie5H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sfqnYl9xEey5t-mahoHmrg" name="getMedicationsSectionEntriesOptional" bodyCondition="_sfqnZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sfqnZV9xEey5t-mahoHmrg" name="body" constrainedElement="_sfqnYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sfqnZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ea98sn3sEeyivuDeOiJBMg" name="getMedicationsSectionEntriesOptional" bodyCondition="_Ea98tX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ea98tX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ea98sn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ea98tn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::MedicationsSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sfqnY19xEey5t-mahoHmrg" type="_iAoXEBVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sfqnZF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Ea98s33sEeyivuDeOiJBMg" type="_iAoXEBVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ea98tH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sgML0F9xEey5t-mahoHmrg" name="getPhysicalExamSection" bodyCondition="_sgML019xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sgML019xEey5t-mahoHmrg" name="body" constrainedElement="_sgML0F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sgML1F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EbW-Qn3sEeyivuDeOiJBMg" name="getPhysicalExamSection" bodyCondition="_EbW-RX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EbW-RX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EbW-Qn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EbW-Rn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection))->asSequence()->any(true).oclAsType(consol::PhysicalExamSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sgML0V9xEey5t-mahoHmrg" type="_2Pxt0hSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sgML0l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EbW-Q33sEeyivuDeOiJBMg" type="_2Pxt0hSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EbW-RH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sgrUAl9xEey5t-mahoHmrg" name="getReasonForVisitSection" bodyCondition="_sgrUBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sgrUBV9xEey5t-mahoHmrg" name="body" constrainedElement="_sgrUAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sgrUBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ebwm4n3sEeyivuDeOiJBMg" name="getReasonForVisitSection" bodyCondition="_Ebwm5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ebwm5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ebwm4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ebwm5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))->asSequence()->any(true).oclAsType(consol::ReasonForVisitSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sgrUA19xEey5t-mahoHmrg" type="_Nm64UCscEeGHF88-qhhUMA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sgrUBF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Ebwm433sEeyivuDeOiJBMg" type="_Nm64UCscEeGHF88-qhhUMA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ebwm5H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_shMRYF9xEey5t-mahoHmrg" name="getResultsSectionEntriesOptional" bodyCondition="_shMRY19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_shMRY19xEey5t-mahoHmrg" name="body" constrainedElement="_shMRYF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_shMRZF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EcKPgn3sEeyivuDeOiJBMg" name="getResultsSectionEntriesOptional" bodyCondition="_EcK2kn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EcK2kn3sEeyivuDeOiJBMg" name="body" constrainedElement="_EcKPgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EcK2k33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::ResultsSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_shMRYV9xEey5t-mahoHmrg" type="_xGqiEBVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_shMRYl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EcK2kH3sEeyivuDeOiJBMg" type="_xGqiEBVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EcK2kX3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_shsnsV9xEey5t-mahoHmrg" name="getReviewOfSystemsSection" bodyCondition="_shsntF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_shsntF9xEey5t-mahoHmrg" name="body" constrainedElement="_shsnsV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_shsntV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EckfMH3sEeyivuDeOiJBMg" name="getReviewOfSystemsSection" bodyCondition="_EckfM33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EckfM33sEeyivuDeOiJBMg" name="body" constrainedElement="_EckfMH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EckfNH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))->asSequence()->any(true).oclAsType(consol::ReviewOfSystemsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_shsnsl9xEey5t-mahoHmrg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_shsns19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EckfMX3sEeyivuDeOiJBMg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EckfMn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_siMW8l9xEey5t-mahoHmrg" name="getSocialHistorySection" bodyCondition="_siMW9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_siMW9V9xEey5t-mahoHmrg" name="body" constrainedElement="_siMW8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_siM-AF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ec-u4n3sEeyivuDeOiJBMg" name="getSocialHistorySection" bodyCondition="_Ec-u5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ec-u5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ec-u4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ec-u5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection))->asSequence()->any(true).oclAsType(consol::SocialHistorySection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_siMW819xEey5t-mahoHmrg" type="_2JKvgBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_siMW9F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Ec-u433sEeyivuDeOiJBMg" type="_2JKvgBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ec-u5H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_siq4EF9xEey5t-mahoHmrg" name="getHistoryOfPresentIllnessSection" bodyCondition="_siq4E19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_siq4E19xEey5t-mahoHmrg" name="body" constrainedElement="_siq4EF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_siq4FF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EdcB4n3sEeyivuDeOiJBMg" name="getHistoryOfPresentIllnessSection" bodyCondition="_EdcB5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EdcB5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_EdcB4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EdcB5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))->asSequence()->any(true).oclAsType(consol::HistoryOfPresentIllnessSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_siq4EV9xEey5t-mahoHmrg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_siq4El9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EdcB433sEeyivuDeOiJBMg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EdcB5H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sjMcgl9xEey5t-mahoHmrg" name="getImmunizationsSectionEntriesOptional" bodyCondition="_sjMchV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sjMchV9xEey5t-mahoHmrg" name="body" constrainedElement="_sjMcgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sjMchl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ed2Rkn3sEeyivuDeOiJBMg" name="getImmunizationsSectionEntriesOptional" bodyCondition="_Ed24oH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ed24oH3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ed2Rkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ed24oX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::ImmunizationsSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sjMcg19xEey5t-mahoHmrg" type="_EuPloBVeEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sjMchF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Ed2Rk33sEeyivuDeOiJBMg" type="_EuPloBVeEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ed2RlH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sjtZ4V9xEey5t-mahoHmrg" name="getProblemSectionEntriesOptional" bodyCondition="_sjuA8V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sjuA8V9xEey5t-mahoHmrg" name="body" constrainedElement="_sjtZ4V9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sjuA8l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EeP6Mn3sEeyivuDeOiJBMg" name="getProblemSectionEntriesOptional" bodyCondition="_EeP6NX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EeP6NX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EeP6Mn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EeP6Nn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::ProblemSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sjtZ4l9xEey5t-mahoHmrg" type="_naxrkBVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sjuA8F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EeP6M33sEeyivuDeOiJBMg" type="_naxrkBVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EeP6NH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_skNwMF9xEey5t-mahoHmrg" name="getProceduresSectionEntriesOptional" bodyCondition="_skNwM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_skNwM19xEey5t-mahoHmrg" name="body" constrainedElement="_skNwMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_skNwNF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EeqJ4H3sEeyivuDeOiJBMg" name="getProceduresSectionEntriesOptional" bodyCondition="_EeqJ433sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EeqJ433sEeyivuDeOiJBMg" name="body" constrainedElement="_EeqJ4H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EeqJ5H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::ProceduresSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_skNwMV9xEey5t-mahoHmrg" type="_s9Ig4BVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_skNwMl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EeqJ4X3sEeyivuDeOiJBMg" type="_s9Ig4BVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EeqJ4n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sk0NIl9xEey5t-mahoHmrg" name="getVitalSignsSectionEntriesOptional" bodyCondition="_sk0NJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sk0NJV9xEey5t-mahoHmrg" name="body" constrainedElement="_sk0NIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sk0NJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EfDLcn3sEeyivuDeOiJBMg" name="getVitalSignsSectionEntriesOptional" bodyCondition="_EfDygn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EfDygn3sEeyivuDeOiJBMg" name="body" constrainedElement="_EfDLcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EfDyg33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::VitalSignsSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sk0NI19xEey5t-mahoHmrg" type="_bRH8sBVeEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sk0NJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EfDygH3sEeyivuDeOiJBMg" type="_bRH8sBVeEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EfDygX3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_u8TB4l9xEey5t-mahoHmrg" name="getInstructionsSection" bodyCondition="_u8TB5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_u8TB5V9xEey5t-mahoHmrg" name="body" constrainedElement="_u8TB4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_u8TB5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GbZjYn3sEeyivuDeOiJBMg" name="getInstructionsSection" bodyCondition="_GbZjZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GbZjZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GbZjYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GbZjZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::InstructionsSection))->asSequence()->any(true).oclAsType(consol::InstructionsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_u8TB419xEey5t-mahoHmrg" type="_4qKukEE1EeGdmoWy_aLP0Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_u8TB5F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_GbZjY33sEeyivuDeOiJBMg" type="_4qKukEE1EeGdmoWy_aLP0Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GbZjZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -13896,401 +13896,401 @@ value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '34117-2' or value.
       <ownedComment xmi:id="_n7Z1wEE2EeGdmoWy_aLP0Q">
         <body>The Operative Note Fluids section may be used to record fluids administered during the surgical procedure.</body>
       </ownedComment>
-      <ownedRule xmi:id="_sl39EF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sl39EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ef5gAn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ef5gA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.7')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_smb9wF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCodeP" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_smb9wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EgVk4H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCodeP" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EgVk4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sl5LMF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCode" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sl5LMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ef6uIH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCode" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ef6uIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '11504-8' or value.code = '34137-0' or value.code = '28583-3' or value.code = '28624-5' or value.code = '28573-4' or value.code = '34877-1' or value.code = '34874-8' or value.code = '34870-6' or value.code = '34868-0' or value.code = '34818-5'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sqCrYF9xEey5t-mahoHmrg" name="OperativeNoteDocumentationOf" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sqCrYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ei_QQH3sEeyivuDeOiJBMg" name="OperativeNoteDocumentationOf" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ei_QQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->exists(documentationOf : cda::DocumentationOf | not documentationOf.oclIsUndefined() and documentationOf.oclIsKindOf(cda::DocumentationOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sqhzkF9xEey5t-mahoHmrg" name="OperativeNoteAnesthesiaSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sqhzkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EjZf8H3sEeyivuDeOiJBMg" name="OperativeNoteAnesthesiaSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EjZf8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AnesthesiaSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_srDYAF9xEey5t-mahoHmrg" name="OperativeNoteComplicationsSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_srDYAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EjzIkH3sEeyivuDeOiJBMg" name="OperativeNoteComplicationsSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EjzIkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ComplicationsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_srjuUF9xEey5t-mahoHmrg" name="OperativeNotePostoperativeDiagnosisSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_srkVYF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EkN_UH3sEeyivuDeOiJBMg" name="OperativeNotePostoperativeDiagnosisSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EkOmYH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PostoperativeDiagnosisSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ssIWEF9xEey5t-mahoHmrg" name="OperativeNotePreoperativeDiagnosisSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ssIWEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EkqEMH3sEeyivuDeOiJBMg" name="OperativeNotePreoperativeDiagnosisSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EkqEMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PreoperativeDiagnosisSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ssqhkF9xEey5t-mahoHmrg" name="OperativeNoteProcedureEstimatedBloodLossSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ssqhkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ElGwIH3sEeyivuDeOiJBMg" name="OperativeNoteProcedureEstimatedBloodLossSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ElGwIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureEstimatedBloodLossSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_stKQ0F9xEey5t-mahoHmrg" name="OperativeNoteProcedureFindingsSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_stKQ0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ElgYwH3sEeyivuDeOiJBMg" name="OperativeNoteProcedureFindingsSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ElgYwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureFindingsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_stqnIF9xEey5t-mahoHmrg" name="OperativeNoteProcedureSpecimensTakenSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_stqnIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_El6BYH3sEeyivuDeOiJBMg" name="OperativeNoteProcedureSpecimensTakenSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_El6BYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureSpecimensTakenSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_suLkgF9xEey5t-mahoHmrg" name="OperativeNoteProcedureDescriptionSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_suLkgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EmTqAH3sEeyivuDeOiJBMg" name="OperativeNoteProcedureDescriptionSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EmTqAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureDescriptionSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sutI8F9xEey5t-mahoHmrg" name="OperativeNoteProcedureImplantsSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sutI8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EmsrkH3sEeyivuDeOiJBMg" name="OperativeNoteProcedureImplantsSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EmsrkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureImplantsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_svOtYF9xEey5t-mahoHmrg" name="OperativeNoteOperativeNoteFluidSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_svOtYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EnGUMH3sEeyivuDeOiJBMg" name="OperativeNoteOperativeNoteFluidSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EnGUMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::OperativeNoteFluidSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_svwR0F9xEey5t-mahoHmrg" name="OperativeNoteOperativeNoteSurgicalProcedureSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_svwR0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Engj4H3sEeyivuDeOiJBMg" name="OperativeNoteOperativeNoteSurgicalProcedureSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Engj4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::OperativeNoteSurgicalProcedureSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_swQBEF9xEey5t-mahoHmrg" name="OperativeNotePlanOfCareSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_swQBEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_En6MgH3sEeyivuDeOiJBMg" name="OperativeNotePlanOfCareSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_En6MgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfCareSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_swwXYF9xEey5t-mahoHmrg" name="OperativeNotePlannedProcedureSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_swwXYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EoTOEH3sEeyivuDeOiJBMg" name="OperativeNotePlannedProcedureSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EoTOEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlannedProcedureSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sxRUwF9xEey5t-mahoHmrg" name="OperativeNoteProcedureDispositionSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sxRUwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EowhEH3sEeyivuDeOiJBMg" name="OperativeNoteProcedureDispositionSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EowhEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureDispositionSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sxySIF9xEey5t-mahoHmrg" name="OperativeNoteProcedureIndicationsSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sxySIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EpL-4H3sEeyivuDeOiJBMg" name="OperativeNoteProcedureIndicationsSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EpL-4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureIndicationsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sySBYF9xEey5t-mahoHmrg" name="OperativeNoteSurgicalDrainsSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sySBYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EpmOkH3sEeyivuDeOiJBMg" name="OperativeNoteSurgicalDrainsSection" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EpmOkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SurgicalDrainsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6SsSYF9xEey5t-mahoHmrg" name="OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntityCode" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6SsSYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QegnEH3sEeyivuDeOiJBMg" name="OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntityCode" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QegnEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Ss5cF9xEey5t-mahoHmrg" name="OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntityCodeP" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Ss5cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qeh1MH3sEeyivuDeOiJBMg" name="OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntityCodeP" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qeh1MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Ss5cl9xEey5t-mahoHmrg" name="OperativeNoteDocumentationOfServiceEventPrimaryPerformerTypeCode" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Ss5c19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QeicQH3sEeyivuDeOiJBMg" name="OperativeNoteDocumentationOfServiceEventPrimaryPerformerTypeCode" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QeicQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->reject(typeCode=vocab::x_ServiceEventPerformer::PPRF)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6StggF9xEey5t-mahoHmrg" name="OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntity" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6StggV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QejqYH3sEeyivuDeOiJBMg" name="OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntity" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QejqYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Stggl9xEey5t-mahoHmrg" name="OperativeNoteDocumentationOfServiceEventProcedureCodes" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Stgg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QemtsH3sEeyivuDeOiJBMg" name="OperativeNoteDocumentationOfServiceEventProcedureCodes" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QemtsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(code.codeSystem = '2.16.840.1.113883.6.104' or code.codeSystem = '2.16.840.1.113883.6.12' or code.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6SuHkF9xEey5t-mahoHmrg" name="OperativeNoteDocumentationOfServiceEventEffectiveTimeHasLow" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6SuHkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QepJ8H3sEeyivuDeOiJBMg" name="OperativeNoteDocumentationOfServiceEventEffectiveTimeHasLow" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QepJ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(not effectiveTime.low.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6SuHkl9xEey5t-mahoHmrg" name="OperativeNoteDocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6SuHk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qeq_IH3sEeyivuDeOiJBMg" name="OperativeNoteDocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QermMH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(not effectiveTime.width.oclIsUndefined() xor not effectiveTime.high.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6SuHlF9xEey5t-mahoHmrg" name="OperativeNoteDocumentationOfServiceEventEffectiveTimeNoHighIfWidth" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6SuHlV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QermMX3sEeyivuDeOiJBMg" name="OperativeNoteDocumentationOfServiceEventEffectiveTimeNoHighIfWidth" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QermMn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(not effectiveTime.width.oclIsUndefined() xor not effectiveTime.high.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6SuuoF9xEey5t-mahoHmrg" name="OperativeNoteDocumentationOfServiceEventPreciseToTheDay" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6SuuoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qes0UH3sEeyivuDeOiJBMg" name="OperativeNoteDocumentationOfServiceEventPreciseToTheDay" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qes0UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((not effectiveTime.low.value.oclIsUndefined() implies effectiveTime.low.value.size() >= 8) and (not effectiveTime.high.value.oclIsUndefined() implies effectiveTime.high.value.size() >= 8))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Suuol9xEey5t-mahoHmrg" name="OperativeNoteDocumentationOfServiceEventPreciseToTheMinute" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Suuo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QevQkH3sEeyivuDeOiJBMg" name="OperativeNoteDocumentationOfServiceEventPreciseToTheMinute" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QevQkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((not effectiveTime.low.value.oclIsUndefined() implies effectiveTime.low.value.size() >= 12) and (not effectiveTime.high.value.oclIsUndefined() implies effectiveTime.high.value.size() >= 12))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6SuupF9xEey5t-mahoHmrg" name="OperativeNoteDocumentationOfServiceEventPreciseToTheSecond" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6SuupV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QexFwH3sEeyivuDeOiJBMg" name="OperativeNoteDocumentationOfServiceEventPreciseToTheSecond" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QexFwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((not effectiveTime.low.value.oclIsUndefined() implies effectiveTime.low.value.size() >= 14) and (not effectiveTime.high.value.oclIsUndefined() implies effectiveTime.high.value.size() >= 14))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6SvVsF9xEey5t-mahoHmrg" name="OperativeNoteDocumentationOfServiceEventIfMorePreciseThanDayIncludeTimeZoneOffset" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6SvVsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qexs0H3sEeyivuDeOiJBMg" name="OperativeNoteDocumentationOfServiceEventIfMorePreciseThanDayIncludeTimeZoneOffset" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qexs0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((not effectiveTime.low.value.oclIsUndefined() and effectiveTime.low.value.size() > 8 implies effectiveTime.low.value.size() >= 15) and (not effectiveTime.high.value.oclIsUndefined() and effectiveTime.high.value.size() > 8 implies effectiveTime.high.value.size() >= 15))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6SvVsl9xEey5t-mahoHmrg" name="OperativeNoteDocumentationOfServiceEventCode" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6SvVs19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QeyT4H3sEeyivuDeOiJBMg" name="OperativeNoteDocumentationOfServiceEventCode" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QeyT4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Sv8wF9xEey5t-mahoHmrg" name="OperativeNoteDocumentationOfServiceEventEffectiveTime" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Sv8wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qey68H3sEeyivuDeOiJBMg" name="OperativeNoteDocumentationOfServiceEventEffectiveTime" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qey68X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Sv8wl9xEey5t-mahoHmrg" name="OperativeNoteDocumentationOfServiceEventPrimaryPerformer" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Sv8w19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QeziAH3sEeyivuDeOiJBMg" name="OperativeNoteDocumentationOfServiceEventPrimaryPerformer" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QeziAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(performer->select(performer : cda::Performer1 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer1))->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->size() = 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Sv8xF9xEey5t-mahoHmrg" name="OperativeNoteDocumentationOfServiceEvent" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Sv8xV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qe0JEH3sEeyivuDeOiJBMg" name="OperativeNoteDocumentationOfServiceEvent" constrainedElement="_xe9MsD4iEeGhnL_c4sBHGg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qe0JEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null)->reject(serviceEvent->one(serviceEvent : cda::ServiceEvent | not serviceEvent.oclIsUndefined() and serviceEvent.oclIsKindOf(cda::ServiceEvent)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_xfHkwD4iEeGhnL_c4sBHGg" general="_2DNRcBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_sqiaoF9xEey5t-mahoHmrg" name="getAnesthesiaSection" bodyCondition="_sqiao19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sqiao19xEey5t-mahoHmrg" name="body" constrainedElement="_sqiaoF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sqiapF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EjZf8n3sEeyivuDeOiJBMg" name="getAnesthesiaSection" bodyCondition="_EjZf9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EjZf9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_EjZf8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EjZf9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AnesthesiaSection))->asSequence()->any(true).oclAsType(consol::AnesthesiaSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sqiaoV9xEey5t-mahoHmrg" type="_OA_Q0DVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sqiaol9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EjZf833sEeyivuDeOiJBMg" type="_OA_Q0DVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EjZf9H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_srDYAl9xEey5t-mahoHmrg" name="getComplicationsSection" bodyCondition="_srDYBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_srDYBV9xEey5t-mahoHmrg" name="body" constrainedElement="_srDYAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_srDYBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EjzIkn3sEeyivuDeOiJBMg" name="getComplicationsSection" bodyCondition="_EjzvoH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EjzvoH3sEeyivuDeOiJBMg" name="body" constrainedElement="_EjzIkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EjzvoX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ComplicationsSection))->asSequence()->any(true).oclAsType(consol::ComplicationsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_srDYA19xEey5t-mahoHmrg" type="_R1OXcDVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_srDYBF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EjzIk33sEeyivuDeOiJBMg" type="_R1OXcDVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EjzIlH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_srkVYV9xEey5t-mahoHmrg" name="getPostoperativeDiagnosisSection" bodyCondition="_srkVZF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_srkVZF9xEey5t-mahoHmrg" name="body" constrainedElement="_srkVYV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_srkVZV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EkOmYX3sEeyivuDeOiJBMg" name="getPostoperativeDiagnosisSection" bodyCondition="_EkOmZH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EkOmZH3sEeyivuDeOiJBMg" name="body" constrainedElement="_EkOmYX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EkOmZX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PostoperativeDiagnosisSection))->asSequence()->any(true).oclAsType(consol::PostoperativeDiagnosisSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_srkVYl9xEey5t-mahoHmrg" type="_7UA-4DVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_srkVY19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EkOmYn3sEeyivuDeOiJBMg" type="_7UA-4DVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EkOmY33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_ssIWEl9xEey5t-mahoHmrg" name="getPreoperativeDiagnosisSection" bodyCondition="_ssIWFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ssIWFV9xEey5t-mahoHmrg" name="body" constrainedElement="_ssIWEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ssIWFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EkqEMn3sEeyivuDeOiJBMg" name="getPreoperativeDiagnosisSection" bodyCondition="_EkqENX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EkqENX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EkqEMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EkqENn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PreoperativeDiagnosisSection))->asSequence()->any(true).oclAsType(consol::PreoperativeDiagnosisSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ssIWE19xEey5t-mahoHmrg" type="_Cu6qMDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ssIWFF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EkqEM33sEeyivuDeOiJBMg" type="_Cu6qMDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EkqENH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_ssqhkl9xEey5t-mahoHmrg" name="getProcedureEstimatedBloodLossSection" bodyCondition="_ssqhlV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ssqhlV9xEey5t-mahoHmrg" name="body" constrainedElement="_ssqhkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ssqhll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_ElGwIn3sEeyivuDeOiJBMg" name="getProcedureEstimatedBloodLossSection" bodyCondition="_ElGwJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ElGwJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_ElGwIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ElGwJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureEstimatedBloodLossSection))->asSequence()->any(true).oclAsType(consol::ProcedureEstimatedBloodLossSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ssqhk19xEey5t-mahoHmrg" type="_TvcL8DVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ssqhlF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_ElGwI33sEeyivuDeOiJBMg" type="_TvcL8DVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ElGwJH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_stK34F9xEey5t-mahoHmrg" name="getProcedureFindingsSection" bodyCondition="_stK3419xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_stK3419xEey5t-mahoHmrg" name="body" constrainedElement="_stK34F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_stK35F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_ElgYwn3sEeyivuDeOiJBMg" name="getProcedureFindingsSection" bodyCondition="_ElgYxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ElgYxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_ElgYwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ElgYxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureFindingsSection))->asSequence()->any(true).oclAsType(consol::ProcedureFindingsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_stK34V9xEey5t-mahoHmrg" type="_W4UBYDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_stK34l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_ElgYw33sEeyivuDeOiJBMg" type="_W4UBYDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ElgYxH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_stqnIl9xEey5t-mahoHmrg" name="getProcedureSpecimensTakenSection" bodyCondition="_strOMF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_strOMF9xEey5t-mahoHmrg" name="body" constrainedElement="_stqnIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_strOMV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_El6BYn3sEeyivuDeOiJBMg" name="getProcedureSpecimensTakenSection" bodyCondition="_El6BZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_El6BZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_El6BYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_El6BZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureSpecimensTakenSection))->asSequence()->any(true).oclAsType(consol::ProcedureSpecimensTakenSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_stqnI19xEey5t-mahoHmrg" type="_gSUdsDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_stqnJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_El6BY33sEeyivuDeOiJBMg" type="_gSUdsDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_El6BZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_suLkgl9xEey5t-mahoHmrg" name="getProcedureDescriptionSection" bodyCondition="_suLkhV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_suLkhV9xEey5t-mahoHmrg" name="body" constrainedElement="_suLkgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_suLkhl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EmTqAn3sEeyivuDeOiJBMg" name="getProcedureDescriptionSection" bodyCondition="_EmTqBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EmTqBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EmTqAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EmTqBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureDescriptionSection))->asSequence()->any(true).oclAsType(consol::ProcedureDescriptionSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_suLkg19xEey5t-mahoHmrg" type="_HNUIIDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_suLkhF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EmTqA33sEeyivuDeOiJBMg" type="_HNUIIDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EmTqBH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sutwAF9xEey5t-mahoHmrg" name="getProcedureImplantsSection" bodyCondition="_sutwA19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sutwA19xEey5t-mahoHmrg" name="body" constrainedElement="_sutwAF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sutwBF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EmtSoH3sEeyivuDeOiJBMg" name="getProcedureImplantsSection" bodyCondition="_EmtSo33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EmtSo33sEeyivuDeOiJBMg" name="body" constrainedElement="_EmtSoH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EmtSpH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureImplantsSection))->asSequence()->any(true).oclAsType(consol::ProcedureImplantsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sutwAV9xEey5t-mahoHmrg" type="_Z662wDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sutwAl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EmtSoX3sEeyivuDeOiJBMg" type="_Z662wDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EmtSon3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_svOtYl9xEey5t-mahoHmrg" name="getOperativeNoteFluidSection" bodyCondition="_svPUcl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_svPUcl9xEey5t-mahoHmrg" name="body" constrainedElement="_svOtYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_svPUc19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EnGUMn3sEeyivuDeOiJBMg" name="getOperativeNoteFluidSection" bodyCondition="_EnGUNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EnGUNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EnGUMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EnGUNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::OperativeNoteFluidSection))->asSequence()->any(true).oclAsType(consol::OperativeNoteFluidSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_svPUcF9xEey5t-mahoHmrg" type="_vHfXoDVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_svPUcV9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EnGUM33sEeyivuDeOiJBMg" type="_vHfXoDVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EnGUNH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_svwR0l9xEey5t-mahoHmrg" name="getOperativeNoteSurgicalProcedureSection" bodyCondition="_svwR1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_svwR1V9xEey5t-mahoHmrg" name="body" constrainedElement="_svwR0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_svwR1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EnhK8H3sEeyivuDeOiJBMg" name="getOperativeNoteSurgicalProcedureSection" bodyCondition="_EnhK833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EnhK833sEeyivuDeOiJBMg" name="body" constrainedElement="_EnhK8H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EnhK9H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::OperativeNoteSurgicalProcedureSection))->asSequence()->any(true).oclAsType(consol::OperativeNoteSurgicalProcedureSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_svwR019xEey5t-mahoHmrg" type="_zel6wDVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_svwR1F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EnhK8X3sEeyivuDeOiJBMg" type="_zel6wDVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EnhK8n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_swQBEl9xEey5t-mahoHmrg" name="getPlanOfCareSection" bodyCondition="_swQBFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_swQBFV9xEey5t-mahoHmrg" name="body" constrainedElement="_swQBEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_swQoIF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_En6Mgn3sEeyivuDeOiJBMg" name="getPlanOfCareSection" bodyCondition="_En6MhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_En6MhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_En6Mgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_En6Mhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfCareSection))->asSequence()->any(true).oclAsType(consol::PlanOfCareSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_swQBE19xEey5t-mahoHmrg" type="_2NP-QxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_swQBFF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_En6Mg33sEeyivuDeOiJBMg" type="_2NP-QxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_En6MhH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sww-cF9xEey5t-mahoHmrg" name="getPlannedProcedureSection" bodyCondition="_sww-c19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sww-c19xEey5t-mahoHmrg" name="body" constrainedElement="_sww-cF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sww-dF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EoT1IH3sEeyivuDeOiJBMg" name="getPlannedProcedureSection" bodyCondition="_EoT1I33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EoT1I33sEeyivuDeOiJBMg" name="body" constrainedElement="_EoT1IH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EoT1JH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlannedProcedureSection))->asSequence()->any(true).oclAsType(consol::PlannedProcedureSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sww-cV9xEey5t-mahoHmrg" type="_3b6E4DVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sww-cl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EoT1IX3sEeyivuDeOiJBMg" type="_3b6E4DVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EoT1In3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sxRUwl9xEey5t-mahoHmrg" name="getProcedureDispositionSection" bodyCondition="_sxRUxV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sxRUxV9xEey5t-mahoHmrg" name="body" constrainedElement="_sxRUwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sxRUxl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EowhEn3sEeyivuDeOiJBMg" name="getProcedureDispositionSection" bodyCondition="_EowhFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EowhFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EowhEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EowhFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureDispositionSection))->asSequence()->any(true).oclAsType(consol::ProcedureDispositionSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sxRUw19xEey5t-mahoHmrg" type="_QhXGYDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sxRUxF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EowhE33sEeyivuDeOiJBMg" type="_QhXGYDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EowhFH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sxySIl9xEey5t-mahoHmrg" name="getProcedureIndicationsSection" bodyCondition="_sxySJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sxySJV9xEey5t-mahoHmrg" name="body" constrainedElement="_sxySIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sxySJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EpL-4n3sEeyivuDeOiJBMg" name="getProcedureIndicationsSection" bodyCondition="_EpL-5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EpL-5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_EpL-4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EpL-5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureIndicationsSection))->asSequence()->any(true).oclAsType(consol::ProcedureIndicationsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sxySI19xEey5t-mahoHmrg" type="_cjmJMDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sxySJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EpL-433sEeyivuDeOiJBMg" type="_cjmJMDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EpL-5H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_sySBYl9xEey5t-mahoHmrg" name="getSurgicalDrainsSection" bodyCondition="_sySBZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_sySBZV9xEey5t-mahoHmrg" name="body" constrainedElement="_sySBYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_sySBZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Epm1oH3sEeyivuDeOiJBMg" name="getSurgicalDrainsSection" bodyCondition="_Epm1o33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Epm1o33sEeyivuDeOiJBMg" name="body" constrainedElement="_Epm1oH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Epm1pH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SurgicalDrainsSection))->asSequence()->any(true).oclAsType(consol::SurgicalDrainsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_sySBY19xEey5t-mahoHmrg" type="_luQh8DVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sySBZF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Epm1oX3sEeyivuDeOiJBMg" type="_luQh8DVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Epm1on3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -14319,659 +14319,659 @@ value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()
           <body>self.getAllSections()->forAll(section : cda::Section | not section.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sySocF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sySocV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Epm1pX3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Epm1pn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.6')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_sy0z8F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCodeP" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_sy0z8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EqDhkH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCodeP" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EqDhkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_syUdoF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCode" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_syUdoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Epoq0H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCode" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Epoq0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '28570-0' or value.code = '11505-5' or value.code = '18744-3' or value.code = '18745-0' or value.code = '18746-8' or value.code = '18751-8' or value.code = '18753-4' or value.code = '18836-7' or value.code = '28577-5' or value.code = '28625-2' or value.code = '29757-2' or value.code = '33721-2' or value.code = '34121-4' or value.code = '34896-1' or value.code = '34899-5' or value.code = '47048-4' or value.code = '48807-2'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_s1DokF9xEey5t-mahoHmrg" name="ProcedureNoteComponentOf" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_s1DokV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Er0cIH3sEeyivuDeOiJBMg" name="ProcedureNoteComponentOf" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Er0cIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->one(componentOf : cda::Component1 | not componentOf.oclIsUndefined() and componentOf.oclIsKindOf(cda::Component1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_s3t7AF9xEey5t-mahoHmrg" name="ProcedureNoteAssessmentSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_s3t7AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Et-YQH3sEeyivuDeOiJBMg" name="ProcedureNoteAssessmentSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Et-YQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_s4ldsF9xEey5t-mahoHmrg" name="ProcedureNotePlanOfCareSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_s4ldsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EuZPAH3sEeyivuDeOiJBMg" name="ProcedureNotePlanOfCareSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EuZPAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfCareSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_s5LTkF9xEey5t-mahoHmrg" name="ProcedureNoteAssessmentAndPlanSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_s5LTkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EuyQkH3sEeyivuDeOiJBMg" name="ProcedureNoteAssessmentAndPlanSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Euy3oH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_s5rp4F9xEey5t-mahoHmrg" name="ProcedureNoteComplicationsSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_s5rp4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EvL5MH3sEeyivuDeOiJBMg" name="ProcedureNoteComplicationsSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EvL5MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ComplicationsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_s6KLAF9xEey5t-mahoHmrg" name="ProcedureNotePostprocedureDiagnosisSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_s6KLAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EvmI4H3sEeyivuDeOiJBMg" name="ProcedureNotePostprocedureDiagnosisSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EvmI4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PostprocedureDiagnosisSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_s6p6QF9xEey5t-mahoHmrg" name="ProcedureNoteProcedureDescriptionSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_s6p6QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ev_xgH3sEeyivuDeOiJBMg" name="ProcedureNoteProcedureDescriptionSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ev_xgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureDescriptionSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_s7H0UF9xEey5t-mahoHmrg" name="ProcedureNoteProcedureIndicationsSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_s7H0UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EwdrkH3sEeyivuDeOiJBMg" name="ProcedureNoteProcedureIndicationsSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EwdrkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureIndicationsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_s7njkF9xEey5t-mahoHmrg" name="ProcedureNoteAllergiesSectionEntriesOptional" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_s7njkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ew3UMH3sEeyivuDeOiJBMg" name="ProcedureNoteAllergiesSectionEntriesOptional" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ew3UMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_s8GEsF9xEey5t-mahoHmrg" name="ProcedureNoteAnesthesiaSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_s8GEsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ExQVwH3sEeyivuDeOiJBMg" name="ProcedureNoteAnesthesiaSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ExQVwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AnesthesiaSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_s8lM4F9xEey5t-mahoHmrg" name="ProcedureNoteChiefComplaintSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_s8lM4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ExqlcH3sEeyivuDeOiJBMg" name="ProcedureNoteChiefComplaintSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ExqlcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_s9DG8F9xEey5t-mahoHmrg" name="ProcedureNoteChiefComplaintAndReasonForVisitSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_s9DG8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EyDnAH3sEeyivuDeOiJBMg" name="ProcedureNoteChiefComplaintAndReasonForVisitSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EyDnAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_s9kEUF9xEey5t-mahoHmrg" name="ProcedureNoteFamilyHistorySection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_s9kEUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EyedwH3sEeyivuDeOiJBMg" name="ProcedureNoteFamilyHistorySection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EyedwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_s-BXUF9xEey5t-mahoHmrg" name="ProcedureNoteHistoryOfPastIllnessSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_s-BXUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ey4tcH3sEeyivuDeOiJBMg" name="ProcedureNoteHistoryOfPastIllnessSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ey5UgH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_s-hGkF9xEey5t-mahoHmrg" name="ProcedureNoteHistoryOfPresentIllnessSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_s-hGkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_EzTkMH3sEeyivuDeOiJBMg" name="ProcedureNoteHistoryOfPresentIllnessSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_EzTkMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_s-9ygF9xEey5t-mahoHmrg" name="ProcedureNoteMedicalHistorySection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_s-9ygV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Eztz4H3sEeyivuDeOiJBMg" name="ProcedureNoteMedicalHistorySection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Eztz4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicalHistorySection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_s_c6sF9xEey5t-mahoHmrg" name="ProcedureNoteMedicationsSectionEntriesOptional" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_s_c6sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E0MVAH3sEeyivuDeOiJBMg" name="ProcedureNoteMedicationsSectionEntriesOptional" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E0MVAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_s_5moF9xEey5t-mahoHmrg" name="ProcedureNoteMedicationsAdministeredSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_s_5moV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E0nLwH3sEeyivuDeOiJBMg" name="ProcedureNoteMedicationsAdministeredSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E0nLwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsAdministeredSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tAZ88F9xEey5t-mahoHmrg" name="ProcedureNotePhysicalExamSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tAZ88V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E1CCgH3sEeyivuDeOiJBMg" name="ProcedureNotePhysicalExamSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E1CCgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tA33AF9xEey5t-mahoHmrg" name="ProcedureNotePlannedProcedureSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tA33AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E1cSMH3sEeyivuDeOiJBMg" name="ProcedureNotePlannedProcedureSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E1cSMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlannedProcedureSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tBW_MF9xEey5t-mahoHmrg" name="ProcedureNoteProcedureDispositionSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tBW_MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E1160H3sEeyivuDeOiJBMg" name="ProcedureNoteProcedureDispositionSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E1160X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureDispositionSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tB3VgF9xEey5t-mahoHmrg" name="ProcedureNoteProcedureEstimatedBloodLossSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tB3VgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E2PjcH3sEeyivuDeOiJBMg" name="ProcedureNoteProcedureEstimatedBloodLossSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E2PjcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureEstimatedBloodLossSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tCXEwF9xEey5t-mahoHmrg" name="ProcedureNoteProcedureFindingsSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tCXEwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E2pMEH3sEeyivuDeOiJBMg" name="ProcedureNoteProcedureFindingsSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E2pMEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureFindingsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tCzwsF9xEey5t-mahoHmrg" name="ProcedureNoteProcedureImplantsSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tCzwsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E3C0sH3sEeyivuDeOiJBMg" name="ProcedureNoteProcedureImplantsSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E3C0sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureImplantsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tDUHAF9xEey5t-mahoHmrg" name="ProcedureNoteProcedureSpecimensTakenSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tDUHAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E3drcH3sEeyivuDeOiJBMg" name="ProcedureNoteProcedureSpecimensTakenSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E3drcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureSpecimensTakenSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tDz2QF9xEey5t-mahoHmrg" name="ProcedureNoteProceduresSectionEntriesOptional" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tDz2QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E38MkH3sEeyivuDeOiJBMg" name="ProcedureNoteProceduresSectionEntriesOptional" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E38MkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tES-cF9xEey5t-mahoHmrg" name="ProcedureNoteReasonForVisitSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tES-cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E4V1MH3sEeyivuDeOiJBMg" name="ProcedureNoteReasonForVisitSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E4V1MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tEytsF9xEey5t-mahoHmrg" name="ProcedureNoteReviewOfSystemsSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tEytsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E4u2wH3sEeyivuDeOiJBMg" name="ProcedureNoteReviewOfSystemsSection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E4u2wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tFU5MF9xEey5t-mahoHmrg" name="ProcedureNoteSocialHistorySection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tFU5MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E5IfYH3sEeyivuDeOiJBMg" name="ProcedureNoteSocialHistorySection" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E5IfYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_u9O2AF9xEey5t-mahoHmrg" name="ProcedureNoteParticipant1" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_u9O2AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GcOp0H3sEeyivuDeOiJBMg" name="ProcedureNoteParticipant1" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GcOp0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant1 | not participant.oclIsUndefined() and participant.oclIsKindOf(rim::Participation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vBYWMF9xEey5t-mahoHmrg" name="ProcedureNoteDocumentationOf" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vBYWMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GfjqoH3sEeyivuDeOiJBMg" name="ProcedureNoteDocumentationOf" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GfjqoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->exists(documentationOf : cda::DocumentationOf | not documentationOf.oclIsUndefined() and documentationOf.oclIsKindOf(cda::DocumentationOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Vw0gF9xEey5t-mahoHmrg" name="ProcedureNoteComponentOfEncompassingEncounter5LocationHealthCareFacilityId" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Vw0gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QiTh8H3sEeyivuDeOiJBMg" name="ProcedureNoteComponentOfEncompassingEncounter5LocationHealthCareFacilityId" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QiTh8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).location->excluding(null).healthCareFacility->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6Vw0gl9xEey5t-mahoHmrg" name="ProcedureNoteComponentOfEncompassingEncounter5LocationHealthCareFacility" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6Vw0g19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QiTh8n3sEeyivuDeOiJBMg" name="ProcedureNoteComponentOfEncompassingEncounter5LocationHealthCareFacility" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QiTh833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).location->excluding(null)->reject(healthCareFacility->exists(healthCareFacility : cda::HealthCareFacility | not healthCareFacility.oclIsUndefined() and healthCareFacility.oclIsKindOf(cda::HealthCareFacility)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6WRK0F9xEey5t-mahoHmrg" name="ProcedureNoteComponentOfEncompassingEncounter5EncounterParticipantTypeCode" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6WRK0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qiz4QH3sEeyivuDeOiJBMg" name="ProcedureNoteComponentOfEncompassingEncounter5EncounterParticipantTypeCode" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qiz4QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).encounterParticipant->excluding(null)->select(typeCode = vocab::x_EncounterParticipant::REF)->select(typeCode = vocab::x_EncounterParticipant::REF)->reject(typeCode=vocab::x_EncounterParticipant::REF)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6WRx4F9xEey5t-mahoHmrg" name="ProcedureNoteComponentOfEncompassingEncounter5Code" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6WRx4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qiz4Qn3sEeyivuDeOiJBMg" name="ProcedureNoteComponentOfEncompassingEncounter5Code" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qiz4Q33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6WRx4l9xEey5t-mahoHmrg" name="ProcedureNoteComponentOfEncompassingEncounter5Location" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6WRx419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qi0fUH3sEeyivuDeOiJBMg" name="ProcedureNoteComponentOfEncompassingEncounter5Location" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qi0fUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(location->exists(location : cda::Location | not location.oclIsUndefined() and location.oclIsKindOf(cda::Location)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6WRx5F9xEey5t-mahoHmrg" name="ProcedureNoteComponentOfEncompassingEncounter5EncounterParticipant" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6WRx5V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qi0fUn3sEeyivuDeOiJBMg" name="ProcedureNoteComponentOfEncompassingEncounter5EncounterParticipant" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qi0fU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(encounterParticipant->select(encounterParticipant : cda::EncounterParticipant | not encounterParticipant.oclIsUndefined() and encounterParticipant.oclIsKindOf(cda::EncounterParticipant))->select(typeCode = vocab::x_EncounterParticipant::REF)->size() = 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6WSY8F9xEey5t-mahoHmrg" name="ProcedureNoteComponentOfEncompassingEncounter5" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6WSY8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qi1GYH3sEeyivuDeOiJBMg" name="ProcedureNoteComponentOfEncompassingEncounter5" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qi1GYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null)->reject(encompassingEncounter->one(encompassingEncounter : cda::EncompassingEncounter | not encompassingEncounter.oclIsUndefined() and encompassingEncounter.oclIsKindOf(cda::EncompassingEncounter)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6YQH0F9xEey5t-mahoHmrg" name="ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntityCodeP" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6YQH0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QksuoH3sEeyivuDeOiJBMg" name="ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntityCodeP" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QksuoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6YQu4F9xEey5t-mahoHmrg" name="ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntityCode" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6YQu4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qksuon3sEeyivuDeOiJBMg" name="ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntityCode" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qksuo33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6YQu4l9xEey5t-mahoHmrg" name="ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerTypeCode" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6YQu419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QktVsH3sEeyivuDeOiJBMg" name="ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerTypeCode" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QktVsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->reject(typeCode=vocab::x_ServiceEventPerformer::PPRF)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6YQu5F9xEey5t-mahoHmrg" name="ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntity" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6YQu5V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QktVsn3sEeyivuDeOiJBMg" name="ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntity" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QktVs33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6YRV8F9xEey5t-mahoHmrg" name="ProcedureNoteDocumentationOfServiceEvent1ProcedureCodes" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6YRV8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QktVtH3sEeyivuDeOiJBMg" name="ProcedureNoteDocumentationOfServiceEvent1ProcedureCodes" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QktVtX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(code.codeSystem = '2.16.840.1.113883.6.104' or code.codeSystem = '2.16.840.1.113883.6.12' or code.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6YRV8l9xEey5t-mahoHmrg" name="ProcedureNoteDocumentationOfServiceEvent1EffectiveTimeHasLow" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6YRV819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qkt8wH3sEeyivuDeOiJBMg" name="ProcedureNoteDocumentationOfServiceEvent1EffectiveTimeHasLow" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qkt8wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(not effectiveTime.low.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6YR9AF9xEey5t-mahoHmrg" name="ProcedureNoteDocumentationOfServiceEvent1EffectiveTimeHasHighWhenNoWidth" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6YR9AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qkt8wn3sEeyivuDeOiJBMg" name="ProcedureNoteDocumentationOfServiceEvent1EffectiveTimeHasHighWhenNoWidth" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qkt8w33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(not effectiveTime.width.oclIsUndefined() xor not effectiveTime.high.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6YR9Al9xEey5t-mahoHmrg" name="ProcedureNoteDocumentationOfServiceEvent1EffectiveTimeNoHighIfWidth" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6YR9A19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qkt8xH3sEeyivuDeOiJBMg" name="ProcedureNoteDocumentationOfServiceEvent1EffectiveTimeNoHighIfWidth" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qkt8xX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(not effectiveTime.width.oclIsUndefined() xor not effectiveTime.high.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6YR9BF9xEey5t-mahoHmrg" name="ProcedureNoteDocumentationOfServiceEvent1PreciseToTheDay" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6YR9BV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qkuj0H3sEeyivuDeOiJBMg" name="ProcedureNoteDocumentationOfServiceEvent1PreciseToTheDay" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qkuj0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((not effectiveTime.low.value.oclIsUndefined() implies effectiveTime.low.value.size() >= 8) and (not effectiveTime.high.value.oclIsUndefined() implies effectiveTime.high.value.size() >= 8))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6YSkEF9xEey5t-mahoHmrg" name="ProcedureNoteDocumentationOfServiceEvent1PreciseToTheMinute" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6YSkEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qkuj0n3sEeyivuDeOiJBMg" name="ProcedureNoteDocumentationOfServiceEvent1PreciseToTheMinute" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qkuj033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((not effectiveTime.low.value.oclIsUndefined() implies effectiveTime.low.value.size() >= 12) and (not effectiveTime.high.value.oclIsUndefined() implies effectiveTime.high.value.size() >= 12))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6YSkEl9xEey5t-mahoHmrg" name="ProcedureNoteDocumentationOfServiceEvent1PreciseToTheSecond" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6YSkE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qkuj1H3sEeyivuDeOiJBMg" name="ProcedureNoteDocumentationOfServiceEvent1PreciseToTheSecond" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qkuj1X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((not effectiveTime.low.value.oclIsUndefined() implies effectiveTime.low.value.size() >= 14) and (not effectiveTime.high.value.oclIsUndefined() implies effectiveTime.high.value.size() >= 14))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6YSkFF9xEey5t-mahoHmrg" name="ProcedureNoteDocumentationOfServiceEvent1IfMorePreciseThanDayIncludeTimeZoneOffset" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6YSkFV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QkvK4H3sEeyivuDeOiJBMg" name="ProcedureNoteDocumentationOfServiceEvent1IfMorePreciseThanDayIncludeTimeZoneOffset" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QkvK4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((not effectiveTime.low.value.oclIsUndefined() and effectiveTime.low.value.size() > 8 implies effectiveTime.low.value.size() >= 15) and (not effectiveTime.high.value.oclIsUndefined() and effectiveTime.high.value.size() > 8 implies effectiveTime.high.value.size() >= 15))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6YSkFl9xEey5t-mahoHmrg" name="ProcedureNoteDocumentationOfServiceEvent1Code" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6YTLIF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QkvK4n3sEeyivuDeOiJBMg" name="ProcedureNoteDocumentationOfServiceEvent1Code" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QkvK433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6YTLIV9xEey5t-mahoHmrg" name="ProcedureNoteDocumentationOfServiceEvent1EffectiveTime" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6YTLIl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QkvK5H3sEeyivuDeOiJBMg" name="ProcedureNoteDocumentationOfServiceEvent1EffectiveTime" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QkvK5X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6YTLI19xEey5t-mahoHmrg" name="ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformer" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6YTLJF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qkvx8H3sEeyivuDeOiJBMg" name="ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformer" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qkvx8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(performer->select(performer : cda::Performer1 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer1))->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->size() = 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6YTLJV9xEey5t-mahoHmrg" name="ProcedureNoteDocumentationOfServiceEvent1" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6YTLJl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qkvx8n3sEeyivuDeOiJBMg" name="ProcedureNoteDocumentationOfServiceEvent1" constrainedElement="_LuYEsD7YEeGvOdejHZ7dYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qkvx833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null)->reject(serviceEvent->one(serviceEvent : cda::ServiceEvent | not serviceEvent.oclIsUndefined() and serviceEvent.oclIsKindOf(cda::ServiceEvent)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_Luag8D7YEeGvOdejHZ7dYg" general="_2DNRcBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_s3t7Al9xEey5t-mahoHmrg" name="getAssessmentSection" bodyCondition="_s3t7BV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_s3t7BV9xEey5t-mahoHmrg" name="body" constrainedElement="_s3t7Al9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_s3t7Bl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Et-_UH3sEeyivuDeOiJBMg" name="getAssessmentSection" bodyCondition="_Et-_U33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Et-_U33sEeyivuDeOiJBMg" name="body" constrainedElement="_Et-_UH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Et-_VH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))->asSequence()->any(true).oclAsType(consol::AssessmentSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_s3t7A19xEey5t-mahoHmrg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s3t7BF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Et-_UX3sEeyivuDeOiJBMg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Et-_Un3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_s4ldsl9xEey5t-mahoHmrg" name="getPlanOfCareSection" bodyCondition="_s4mEwl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_s4mEwl9xEey5t-mahoHmrg" name="body" constrainedElement="_s4ldsl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_s4mEw19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EuZPAn3sEeyivuDeOiJBMg" name="getPlanOfCareSection" bodyCondition="_EuZPBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EuZPBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_EuZPAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EuZPBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfCareSection))->asSequence()->any(true).oclAsType(consol::PlanOfCareSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_s4mEwF9xEey5t-mahoHmrg" type="_2NP-QxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s4mEwV9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EuZPA33sEeyivuDeOiJBMg" type="_2NP-QxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EuZPBH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_s5LTkl9xEey5t-mahoHmrg" name="getAssessmentAndPlanSection" bodyCondition="_s5LTlV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_s5LTlV9xEey5t-mahoHmrg" name="body" constrainedElement="_s5LTkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_s5LTll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Euy3oX3sEeyivuDeOiJBMg" name="getAssessmentAndPlanSection" bodyCondition="_Euy3pH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Euy3pH3sEeyivuDeOiJBMg" name="body" constrainedElement="_Euy3oX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Euy3pX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection))->asSequence()->any(true).oclAsType(consol::AssessmentAndPlanSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_s5LTk19xEey5t-mahoHmrg" type="_2Rwq0BSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s5LTlF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Euy3on3sEeyivuDeOiJBMg" type="_2Rwq0BSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Euy3o33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_s5sQ8F9xEey5t-mahoHmrg" name="getComplicationsSection" bodyCondition="_s5sQ819xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_s5sQ819xEey5t-mahoHmrg" name="body" constrainedElement="_s5sQ8F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_s5sQ9F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EvMgQH3sEeyivuDeOiJBMg" name="getComplicationsSection" bodyCondition="_EvMgQ33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EvMgQ33sEeyivuDeOiJBMg" name="body" constrainedElement="_EvMgQH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EvMgRH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ComplicationsSection))->asSequence()->any(true).oclAsType(consol::ComplicationsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_s5sQ8V9xEey5t-mahoHmrg" type="_R1OXcDVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s5sQ8l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EvMgQX3sEeyivuDeOiJBMg" type="_R1OXcDVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EvMgQn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_s6KLAl9xEey5t-mahoHmrg" name="getPostprocedureDiagnosisSection" bodyCondition="_s6KLBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_s6KLBV9xEey5t-mahoHmrg" name="body" constrainedElement="_s6KLAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_s6KLBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EvmI4n3sEeyivuDeOiJBMg" name="getPostprocedureDiagnosisSection" bodyCondition="_EvmI5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EvmI5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_EvmI4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EvmI5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PostprocedureDiagnosisSection))->asSequence()->any(true).oclAsType(consol::PostprocedureDiagnosisSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_s6KLA19xEey5t-mahoHmrg" type="_-jlSMDVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s6KLBF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EvmI433sEeyivuDeOiJBMg" type="_-jlSMDVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EvmI5H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_s6p6Ql9xEey5t-mahoHmrg" name="getProcedureDescriptionSection" bodyCondition="_s6p6RV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_s6p6RV9xEey5t-mahoHmrg" name="body" constrainedElement="_s6p6Ql9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_s6p6Rl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EwAYkH3sEeyivuDeOiJBMg" name="getProcedureDescriptionSection" bodyCondition="_EwAYk33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EwAYk33sEeyivuDeOiJBMg" name="body" constrainedElement="_EwAYkH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EwAYlH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureDescriptionSection))->asSequence()->any(true).oclAsType(consol::ProcedureDescriptionSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_s6p6Q19xEey5t-mahoHmrg" type="_HNUIIDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s6p6RF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EwAYkX3sEeyivuDeOiJBMg" type="_HNUIIDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EwAYkn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_s7IbYF9xEey5t-mahoHmrg" name="getProcedureIndicationsSection" bodyCondition="_s7IbY19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_s7IbY19xEey5t-mahoHmrg" name="body" constrainedElement="_s7IbYF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_s7IbZF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ewdrkn3sEeyivuDeOiJBMg" name="getProcedureIndicationsSection" bodyCondition="_EweSon3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EweSon3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ewdrkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EweSo33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureIndicationsSection))->asSequence()->any(true).oclAsType(consol::ProcedureIndicationsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_s7IbYV9xEey5t-mahoHmrg" type="_cjmJMDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s7IbYl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EweSoH3sEeyivuDeOiJBMg" type="_cjmJMDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EweSoX3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_s7njkl9xEey5t-mahoHmrg" name="getAllergiesSectionEntriesOptional" bodyCondition="_s7njlV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_s7njlV9xEey5t-mahoHmrg" name="body" constrainedElement="_s7njkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_s7njll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ew3UMn3sEeyivuDeOiJBMg" name="getAllergiesSectionEntriesOptional" bodyCondition="_Ew3UNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ew3UNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ew3UMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ew3UNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::AllergiesSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_s7njk19xEey5t-mahoHmrg" type="_bGzYgBVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s7njlF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Ew3UM33sEeyivuDeOiJBMg" type="_bGzYgBVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ew3UNH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_s8GEsl9xEey5t-mahoHmrg" name="getAnesthesiaSection" bodyCondition="_s8GEtV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_s8GEtV9xEey5t-mahoHmrg" name="body" constrainedElement="_s8GEsl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_s8GEtl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_ExQ80H3sEeyivuDeOiJBMg" name="getAnesthesiaSection" bodyCondition="_ExQ8033sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ExQ8033sEeyivuDeOiJBMg" name="body" constrainedElement="_ExQ80H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ExQ81H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AnesthesiaSection))->asSequence()->any(true).oclAsType(consol::AnesthesiaSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_s8GEs19xEey5t-mahoHmrg" type="_OA_Q0DVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s8GEtF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_ExQ80X3sEeyivuDeOiJBMg" type="_OA_Q0DVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ExQ80n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_s8lz8F9xEey5t-mahoHmrg" name="getChiefComplaintSection" bodyCondition="_s8lz819xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_s8lz819xEey5t-mahoHmrg" name="body" constrainedElement="_s8lz8F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_s8lz9F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Exqlcn3sEeyivuDeOiJBMg" name="getChiefComplaintSection" bodyCondition="_ExqldX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ExqldX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Exqlcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Exqldn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))->asSequence()->any(true).oclAsType(consol::ChiefComplaintSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_s8lz8V9xEey5t-mahoHmrg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s8lz8l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Exqlc33sEeyivuDeOiJBMg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ExqldH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_s9DuAF9xEey5t-mahoHmrg" name="getChiefComplaintAndReasonForVisitSection" bodyCondition="_s9DuA19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_s9DuA19xEey5t-mahoHmrg" name="body" constrainedElement="_s9DuAF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_s9DuBF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EyEOEH3sEeyivuDeOiJBMg" name="getChiefComplaintAndReasonForVisitSection" bodyCondition="_EyEOE33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EyEOE33sEeyivuDeOiJBMg" name="body" constrainedElement="_EyEOEH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EyEOFH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))->asSequence()->any(true).oclAsType(consol::ChiefComplaintAndReasonForVisitSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_s9DuAV9xEey5t-mahoHmrg" type="_oI7CQCsaEeGHF88-qhhUMA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s9DuAl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EyEOEX3sEeyivuDeOiJBMg" type="_oI7CQCsaEeGHF88-qhhUMA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EyEOEn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_s9kEUl9xEey5t-mahoHmrg" name="getFamilyHistorySection" bodyCondition="_s9kEVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_s9kEVV9xEey5t-mahoHmrg" name="body" constrainedElement="_s9kEUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_s9kEVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Eyedwn3sEeyivuDeOiJBMg" name="getFamilyHistorySection" bodyCondition="_EyedxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EyedxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Eyedwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Eyedxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection))->asSequence()->any(true).oclAsType(consol::FamilyHistorySection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_s9kEU19xEey5t-mahoHmrg" type="_2IWQIxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s9kEVF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Eyedw33sEeyivuDeOiJBMg" type="_2IWQIxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EyedxH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_s-BXUl9xEey5t-mahoHmrg" name="getHistoryOfPastIllnessSection" bodyCondition="_s-BXVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_s-BXVV9xEey5t-mahoHmrg" name="body" constrainedElement="_s-BXUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_s-BXVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ey5UgX3sEeyivuDeOiJBMg" name="getHistoryOfPastIllnessSection" bodyCondition="_Ey5UhH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ey5UhH3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ey5UgX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ey5UhX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection))->asSequence()->any(true).oclAsType(consol::HistoryOfPastIllnessSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_s-BXU19xEey5t-mahoHmrg" type="_2PQJcxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s-BXVF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Ey5Ugn3sEeyivuDeOiJBMg" type="_2PQJcxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ey5Ug33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_s-hGkl9xEey5t-mahoHmrg" name="getHistoryOfPresentIllnessSection" bodyCondition="_s-htoF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_s-htoF9xEey5t-mahoHmrg" name="body" constrainedElement="_s-hGkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_s-htoV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_EzULQH3sEeyivuDeOiJBMg" name="getHistoryOfPresentIllnessSection" bodyCondition="_EzULQ33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_EzULQ33sEeyivuDeOiJBMg" name="body" constrainedElement="_EzULQH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_EzULRH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))->asSequence()->any(true).oclAsType(consol::HistoryOfPresentIllnessSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_s-hGk19xEey5t-mahoHmrg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s-hGlF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_EzULQX3sEeyivuDeOiJBMg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EzULQn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_s-9ygl9xEey5t-mahoHmrg" name="getMedicalHistorySection" bodyCondition="_s-9yhV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_s-9yhV9xEey5t-mahoHmrg" name="body" constrainedElement="_s-9ygl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_s-9yhl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ezua8H3sEeyivuDeOiJBMg" name="getMedicalHistorySection" bodyCondition="_Ezua833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ezua833sEeyivuDeOiJBMg" name="body" constrainedElement="_Ezua8H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ezua9H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicalHistorySection))->asSequence()->any(true).oclAsType(consol::MedicalHistorySection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_s-9yg19xEey5t-mahoHmrg" type="_mEIgwDVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s-9yhF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Ezua8X3sEeyivuDeOiJBMg" type="_mEIgwDVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ezua8n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_s_c6sl9xEey5t-mahoHmrg" name="getMedicationsSectionEntriesOptional" bodyCondition="_s_c6tV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_s_c6tV9xEey5t-mahoHmrg" name="body" constrainedElement="_s_c6sl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_s_c6tl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E0MVAn3sEeyivuDeOiJBMg" name="getMedicationsSectionEntriesOptional" bodyCondition="_E0MVBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E0MVBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_E0MVAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E0MVBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::MedicationsSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_s_c6s19xEey5t-mahoHmrg" type="_iAoXEBVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s_c6tF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E0MVA33sEeyivuDeOiJBMg" type="_iAoXEBVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E0MVBH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_s_5mol9xEey5t-mahoHmrg" name="getMedicationsAdministeredSection" bodyCondition="_s_5mpV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_s_5mpV9xEey5t-mahoHmrg" name="body" constrainedElement="_s_5mol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_s_5mpl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E0ny0H3sEeyivuDeOiJBMg" name="getMedicationsAdministeredSection" bodyCondition="_E0ny033sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E0ny033sEeyivuDeOiJBMg" name="body" constrainedElement="_E0ny0H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E0ny1H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsAdministeredSection))->asSequence()->any(true).oclAsType(consol::MedicationsAdministeredSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_s_5mo19xEey5t-mahoHmrg" type="_2Poj_BSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s_5mpF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E0ny0X3sEeyivuDeOiJBMg" type="_2Poj_BSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E0ny0n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tAZ88l9xEey5t-mahoHmrg" name="getPhysicalExamSection" bodyCondition="_tAZ89V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tAZ89V9xEey5t-mahoHmrg" name="body" constrainedElement="_tAZ88l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tAZ89l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E1CpkH3sEeyivuDeOiJBMg" name="getPhysicalExamSection" bodyCondition="_E1Cpk33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E1Cpk33sEeyivuDeOiJBMg" name="body" constrainedElement="_E1CpkH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E1CplH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection))->asSequence()->any(true).oclAsType(consol::PhysicalExamSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tAZ8819xEey5t-mahoHmrg" type="_2Pxt0hSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tAZ89F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E1CpkX3sEeyivuDeOiJBMg" type="_2Pxt0hSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E1Cpkn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tA33Al9xEey5t-mahoHmrg" name="getPlannedProcedureSection" bodyCondition="_tA33BV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tA33BV9xEey5t-mahoHmrg" name="body" constrainedElement="_tA33Al9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tA33Bl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E1cSMn3sEeyivuDeOiJBMg" name="getPlannedProcedureSection" bodyCondition="_E1cSNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E1cSNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_E1cSMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E1cSNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlannedProcedureSection))->asSequence()->any(true).oclAsType(consol::PlannedProcedureSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tA33A19xEey5t-mahoHmrg" type="_3b6E4DVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tA33BF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E1cSM33sEeyivuDeOiJBMg" type="_3b6E4DVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E1cSNH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tBW_Ml9xEey5t-mahoHmrg" name="getProcedureDispositionSection" bodyCondition="_tBXmQV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tBXmQV9xEey5t-mahoHmrg" name="body" constrainedElement="_tBW_Ml9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tBXmQl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E1160n3sEeyivuDeOiJBMg" name="getProcedureDispositionSection" bodyCondition="_E12h4H3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E12h4H3sEeyivuDeOiJBMg" name="body" constrainedElement="_E1160n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E12h4X3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureDispositionSection))->asSequence()->any(true).oclAsType(consol::ProcedureDispositionSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tBW_M19xEey5t-mahoHmrg" type="_QhXGYDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tBXmQF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E116033sEeyivuDeOiJBMg" type="_QhXGYDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E1161H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tB3Vgl9xEey5t-mahoHmrg" name="getProcedureEstimatedBloodLossSection" bodyCondition="_tB3VhV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tB3VhV9xEey5t-mahoHmrg" name="body" constrainedElement="_tB3Vgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tB3Vhl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E2Pjcn3sEeyivuDeOiJBMg" name="getProcedureEstimatedBloodLossSection" bodyCondition="_E2PjdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E2PjdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_E2Pjcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E2Pjdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureEstimatedBloodLossSection))->asSequence()->any(true).oclAsType(consol::ProcedureEstimatedBloodLossSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tB3Vg19xEey5t-mahoHmrg" type="_TvcL8DVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tB3VhF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E2Pjc33sEeyivuDeOiJBMg" type="_TvcL8DVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E2PjdH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tCXEwl9xEey5t-mahoHmrg" name="getProcedureFindingsSection" bodyCondition="_tCXExV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tCXExV9xEey5t-mahoHmrg" name="body" constrainedElement="_tCXEwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tCXExl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E2pMEn3sEeyivuDeOiJBMg" name="getProcedureFindingsSection" bodyCondition="_E2pMFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E2pMFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_E2pMEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E2pMFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureFindingsSection))->asSequence()->any(true).oclAsType(consol::ProcedureFindingsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tCXEw19xEey5t-mahoHmrg" type="_W4UBYDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tCXExF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E2pME33sEeyivuDeOiJBMg" type="_W4UBYDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E2pMFH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tCzwsl9xEey5t-mahoHmrg" name="getProcedureImplantsSection" bodyCondition="_tCzwtV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tCzwtV9xEey5t-mahoHmrg" name="body" constrainedElement="_tCzwsl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tCzwtl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E3C0sn3sEeyivuDeOiJBMg" name="getProcedureImplantsSection" bodyCondition="_E3C0tX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E3C0tX3sEeyivuDeOiJBMg" name="body" constrainedElement="_E3C0sn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E3C0tn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureImplantsSection))->asSequence()->any(true).oclAsType(consol::ProcedureImplantsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tCzws19xEey5t-mahoHmrg" type="_Z662wDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tCzwtF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E3C0s33sEeyivuDeOiJBMg" type="_Z662wDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E3C0tH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tDUHAl9xEey5t-mahoHmrg" name="getProcedureSpecimensTakenSection" bodyCondition="_tDUHBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tDUHBV9xEey5t-mahoHmrg" name="body" constrainedElement="_tDUHAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tDUHBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E3drcn3sEeyivuDeOiJBMg" name="getProcedureSpecimensTakenSection" bodyCondition="_E3eSgH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E3eSgH3sEeyivuDeOiJBMg" name="body" constrainedElement="_E3drcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E3eSgX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureSpecimensTakenSection))->asSequence()->any(true).oclAsType(consol::ProcedureSpecimensTakenSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tDUHA19xEey5t-mahoHmrg" type="_gSUdsDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tDUHBF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E3drc33sEeyivuDeOiJBMg" type="_gSUdsDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E3drdH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tDz2Ql9xEey5t-mahoHmrg" name="getProceduresSectionEntriesOptional" bodyCondition="_tD0dUl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tD0dUl9xEey5t-mahoHmrg" name="body" constrainedElement="_tDz2Ql9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tD0dU19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E38Mkn3sEeyivuDeOiJBMg" name="getProceduresSectionEntriesOptional" bodyCondition="_E38MlX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E38MlX3sEeyivuDeOiJBMg" name="body" constrainedElement="_E38Mkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E38Mln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::ProceduresSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tD0dUF9xEey5t-mahoHmrg" type="_s9Ig4BVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tD0dUV9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E38Mk33sEeyivuDeOiJBMg" type="_s9Ig4BVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E38MlH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tES-cl9xEey5t-mahoHmrg" name="getReasonForVisitSection" bodyCondition="_tES-dV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tES-dV9xEey5t-mahoHmrg" name="body" constrainedElement="_tES-cl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tETlgF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E4V1Mn3sEeyivuDeOiJBMg" name="getReasonForVisitSection" bodyCondition="_E4V1NX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E4V1NX3sEeyivuDeOiJBMg" name="body" constrainedElement="_E4V1Mn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E4V1Nn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))->asSequence()->any(true).oclAsType(consol::ReasonForVisitSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tES-c19xEey5t-mahoHmrg" type="_Nm64UCscEeGHF88-qhhUMA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tES-dF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E4V1M33sEeyivuDeOiJBMg" type="_Nm64UCscEeGHF88-qhhUMA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E4V1NH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tEzUwF9xEey5t-mahoHmrg" name="getReviewOfSystemsSection" bodyCondition="_tEzUw19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tEzUw19xEey5t-mahoHmrg" name="body" constrainedElement="_tEzUwF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tEzUxF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E4vd0H3sEeyivuDeOiJBMg" name="getReviewOfSystemsSection" bodyCondition="_E4vd033sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E4vd033sEeyivuDeOiJBMg" name="body" constrainedElement="_E4vd0H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E4vd1H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))->asSequence()->any(true).oclAsType(consol::ReviewOfSystemsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tEzUwV9xEey5t-mahoHmrg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tEzUwl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E4vd0X3sEeyivuDeOiJBMg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E4vd0n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tFU5Ml9xEey5t-mahoHmrg" name="getSocialHistorySection" bodyCondition="_tFU5NV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tFU5NV9xEey5t-mahoHmrg" name="body" constrainedElement="_tFU5Ml9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tFU5Nl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E5IfYn3sEeyivuDeOiJBMg" name="getSocialHistorySection" bodyCondition="_E5IfZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E5IfZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_E5IfYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E5IfZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection))->asSequence()->any(true).oclAsType(consol::SocialHistorySection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tFU5M19xEey5t-mahoHmrg" type="_2JKvgBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tFU5NF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E5IfY33sEeyivuDeOiJBMg" type="_2JKvgBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E5IfZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -14994,412 +14994,412 @@ A Progress Note is not a re-evaluation note. A Progress Note is not intended to
           <body>(self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfCareSection)) or  self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))) xor self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tFVgQF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tFVgQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E5JGcH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E5JGcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.9')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tF3rwF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCodeP" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tF3rwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E5kkQH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCodeP" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E5kkQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tFWuYF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCode" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tFXVcF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E5KUkH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCode" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E5KUkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '11506-3' or value.code = '18733-6' or value.code = '18762-5' or value.code = '28569-2' or value.code = '28617-9' or value.code = '34900-1' or value.code = '34904-3' or value.code = '18764-1' or value.code = '28623-7' or value.code = '11507-1' or value.code = '11508-9' or value.code = '11509-7' or value.code = '28627-8' or value.code = '11510-5' or value.code = '28656-7' or value.code = '11512-1' or value.code = '34126-3' or value.code = '15507-7' or value.code = '34129-7' or value.code = '34125-5' or value.code = '34130-5' or value.code = '34131-3' or value.code = '34124-8' or value.code = '34127-1' or value.code = '34128-9' or value.code = '34901-9' or value.code = '34132-1'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tHCJYF9xEey5t-mahoHmrg" name="ProgressNoteDocumentationOf" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tHCJYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E6iNkH3sEeyivuDeOiJBMg" name="ProgressNoteDocumentationOf" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E6iNkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->one(documentationOf : cda::DocumentationOf | not documentationOf.oclIsUndefined() and documentationOf.oclIsKindOf(cda::DocumentationOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tHjt0F9xEey5t-mahoHmrg" name="ProgressNoteComponentOf" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tHjt0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E68dQH3sEeyivuDeOiJBMg" name="ProgressNoteComponentOf" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E68dQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->one(componentOf : cda::Component1 | not componentOf.oclIsUndefined() and componentOf.oclIsKindOf(cda::Component1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tJ0XoF9xEey5t-mahoHmrg" name="ProgressNoteAssessmentSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tJ0XoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E8qUgH3sEeyivuDeOiJBMg" name="ProgressNoteAssessmentSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E8qUgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tKUG4F9xEey5t-mahoHmrg" name="ProgressNotePlanOfCareSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tKUG4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E9D9IH3sEeyivuDeOiJBMg" name="ProgressNotePlanOfCareSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E9D9IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfCareSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tKwy0F9xEey5t-mahoHmrg" name="ProgressNoteAssessmentAndPlanSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tKxZ4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E9eM0H3sEeyivuDeOiJBMg" name="ProgressNoteAssessmentAndPlanSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E9eM0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tLP7AF9xEey5t-mahoHmrg" name="ProgressNoteAllergiesSectionEntriesOptional" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tLP7AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E931cH3sEeyivuDeOiJBMg" name="ProgressNoteAllergiesSectionEntriesOptional" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E94cgH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tLvqQF9xEey5t-mahoHmrg" name="ProgressNoteChiefComplaintSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tLvqQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E-T6UH3sEeyivuDeOiJBMg" name="ProgressNoteChiefComplaintSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E-T6UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tMQAkF9xEey5t-mahoHmrg" name="ProgressNoteInterventionsSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tMQAkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E-uxEH3sEeyivuDeOiJBMg" name="ProgressNoteInterventionsSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E-uxEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::InterventionsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tMtTkF9xEey5t-mahoHmrg" name="ProgressNoteMedicationsSectionEntriesOptional" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tMtTkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E_IZsH3sEeyivuDeOiJBMg" name="ProgressNoteMedicationsSectionEntriesOptional" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E_IZsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tNL0sF9xEey5t-mahoHmrg" name="ProgressNoteObjectiveSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tNL0sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_E_m60H3sEeyivuDeOiJBMg" name="ProgressNoteObjectiveSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_E_m60X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ObjectiveSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tNpuwF9xEey5t-mahoHmrg" name="ProgressNotePhysicalExamSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tNqV0F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FABxkH3sEeyivuDeOiJBMg" name="ProgressNotePhysicalExamSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FABxkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tOLTMF9xEey5t-mahoHmrg" name="ProgressNoteProblemSectionEntriesOptional" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tOLTMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FAbaMH3sEeyivuDeOiJBMg" name="ProgressNoteProblemSectionEntriesOptional" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FAbaMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tOp0UF9xEey5t-mahoHmrg" name="ProgressNoteResultsSectionEntriesOptional" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tOp0UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FA1p4H3sEeyivuDeOiJBMg" name="ProgressNoteResultsSectionEntriesOptional" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FA1p4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tPJjkF9xEey5t-mahoHmrg" name="ProgressNoteReviewOfSystemsSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tPJjkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FBP5kH3sEeyivuDeOiJBMg" name="ProgressNoteReviewOfSystemsSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FBP5kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tPpS0F9xEey5t-mahoHmrg" name="ProgressNoteSubjectiveSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tPpS0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FBpiMH3sEeyivuDeOiJBMg" name="ProgressNoteSubjectiveSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FBpiMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SubjectiveSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tQJpIF9xEey5t-mahoHmrg" name="ProgressNoteVitalSignsSectionEntriesOptional" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tQJpIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FCDK0H3sEeyivuDeOiJBMg" name="ProgressNoteVitalSignsSectionEntriesOptional" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FCDK0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSectionEntriesOptional))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_u-MfUF9xEey5t-mahoHmrg" name="ProgressNoteInstructionsSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_u-MfUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GdBUAH3sEeyivuDeOiJBMg" name="ProgressNoteInstructionsSection" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GdBUAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::InstructionsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6a_50F9xEey5t-mahoHmrg" name="ProgressNoteDocumentationOfServiceEvent2EffectiveTimeLow" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6a_50V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QndHsH3sEeyivuDeOiJBMg" name="ProgressNoteDocumentationOfServiceEvent2EffectiveTimeLow" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QndHsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(effectiveTime->forAll(not low.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6a_50l9xEey5t-mahoHmrg" name="ProgressNoteDocumentationOfServiceEvent2EffectiveTimeHigh" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6a_5019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QndHsn3sEeyivuDeOiJBMg" name="ProgressNoteDocumentationOfServiceEvent2EffectiveTimeHigh" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QndHs33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(effectiveTime->forAll(width.oclIsUndefined() implies not high.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6bAg4F9xEey5t-mahoHmrg" name="ProgressNoteDocumentationOfServiceEvent2PreciseToTheDay" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6bAg4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QnduwH3sEeyivuDeOiJBMg" name="ProgressNoteDocumentationOfServiceEvent2PreciseToTheDay" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QnduwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((not effectiveTime.low.value.oclIsUndefined() implies effectiveTime.low.value.size() >= 8) and (not effectiveTime.high.value.oclIsUndefined() implies effectiveTime.high.value.size() >= 8))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6bAg4l9xEey5t-mahoHmrg" name="ProgressNoteDocumentationOfServiceEvent2PreciseToTheMinute" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6bBH8F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qnduwn3sEeyivuDeOiJBMg" name="ProgressNoteDocumentationOfServiceEvent2PreciseToTheMinute" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qnduw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((not effectiveTime.low.value.oclIsUndefined() implies effectiveTime.low.value.size() >= 12) and (not effectiveTime.high.value.oclIsUndefined() implies effectiveTime.high.value.size() >= 12))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6bBH8V9xEey5t-mahoHmrg" name="ProgressNoteDocumentationOfServiceEvent2PreciseToTheSecond" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6bBH8l9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QneV0H3sEeyivuDeOiJBMg" name="ProgressNoteDocumentationOfServiceEvent2PreciseToTheSecond" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QneV0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((not effectiveTime.low.value.oclIsUndefined() implies effectiveTime.low.value.size() >= 14) and (not effectiveTime.high.value.oclIsUndefined() implies effectiveTime.high.value.size() >= 14))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6bBvAF9xEey5t-mahoHmrg" name="ProgressNoteDocumentationOfServiceEvent2IfMorePreciseThanDayIncludeTimeZoneOffset" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6bBvAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QneV0n3sEeyivuDeOiJBMg" name="ProgressNoteDocumentationOfServiceEvent2IfMorePreciseThanDayIncludeTimeZoneOffset" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QneV033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((not effectiveTime.low.value.oclIsUndefined() and effectiveTime.low.value.size() > 8 implies effectiveTime.low.value.size() >= 15) and (not effectiveTime.high.value.oclIsUndefined() and effectiveTime.high.value.size() > 8 implies effectiveTime.high.value.size() >= 15))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6bBvAl9xEey5t-mahoHmrg" name="ProgressNoteDocumentationOfServiceEvent2TemplateId" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6bBvA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qne84H3sEeyivuDeOiJBMg" name="ProgressNoteDocumentationOfServiceEvent2TemplateId" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qne84X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.21.3.1'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6bCWEF9xEey5t-mahoHmrg" name="ProgressNoteDocumentationOfServiceEvent2ClassCode" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6bCWEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qne84n3sEeyivuDeOiJBMg" name="ProgressNoteDocumentationOfServiceEvent2ClassCode" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qne8433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(isDefined('classCode') and classCode=vocab::ActClassRoot::PCPR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6bCWEl9xEey5t-mahoHmrg" name="ProgressNoteDocumentationOfServiceEvent2EffectiveTime" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6bCWE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qnfj8H3sEeyivuDeOiJBMg" name="ProgressNoteDocumentationOfServiceEvent2EffectiveTime" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qnfj8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6bC9IF9xEey5t-mahoHmrg" name="ProgressNoteDocumentationOfServiceEvent2" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6bC9IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qnfj8n3sEeyivuDeOiJBMg" name="ProgressNoteDocumentationOfServiceEvent2" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qnfj833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null)->reject(serviceEvent->one(serviceEvent : cda::ServiceEvent | not serviceEvent.oclIsUndefined() and serviceEvent.oclIsKindOf(cda::ServiceEvent)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6dEWYF9xEey5t-mahoHmrg" name="ProgressNoteComponentOfEncompassingEncounter6LocationHealthCareFacility1Id" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6dEWYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qp5-wH3sEeyivuDeOiJBMg" name="ProgressNoteComponentOfEncompassingEncounter6LocationHealthCareFacility1Id" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qp5-wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).location->excluding(null).healthCareFacility->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (id->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6dEWYl9xEey5t-mahoHmrg" name="ProgressNoteComponentOfEncompassingEncounter6LocationHealthCareFacility" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6dEWY19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qp5-wn3sEeyivuDeOiJBMg" name="ProgressNoteComponentOfEncompassingEncounter6LocationHealthCareFacility" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qp5-w33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).location->excluding(null)->reject(healthCareFacility->one(healthCareFacility : cda::HealthCareFacility | not healthCareFacility.oclIsUndefined() and healthCareFacility.oclIsKindOf(cda::HealthCareFacility)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6dEWZF9xEey5t-mahoHmrg" name="ProgressNoteComponentOfEncompassingEncounter6PreciseToTheDay" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6dEWZV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qp6l0H3sEeyivuDeOiJBMg" name="ProgressNoteComponentOfEncompassingEncounter6PreciseToTheDay" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qp6l0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(not effectiveTime.value.oclIsUndefined() implies effectiveTime.value.size() >= 8)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6dE9cF9xEey5t-mahoHmrg" name="ProgressNoteComponentOfEncompassingEncounter6PreciseToTheMinute" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6dE9cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qp6l0n3sEeyivuDeOiJBMg" name="ProgressNoteComponentOfEncompassingEncounter6PreciseToTheMinute" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qp6l033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(not effectiveTime.value.oclIsUndefined() implies effectiveTime.value.size() >= 12)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6dE9cl9xEey5t-mahoHmrg" name="ProgressNoteComponentOfEncompassingEncounter6PreciseToTheSecond" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6dE9c19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qp6l1H3sEeyivuDeOiJBMg" name="ProgressNoteComponentOfEncompassingEncounter6PreciseToTheSecond" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qp6l1X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(not effectiveTime.value.oclIsUndefined() implies effectiveTime.value.size() >= 14)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6dE9dF9xEey5t-mahoHmrg" name="ProgressNoteComponentOfEncompassingEncounter6IfMorePreciseThanDayIncludeTimeZoneOffset" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6dE9dV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qp7M4H3sEeyivuDeOiJBMg" name="ProgressNoteComponentOfEncompassingEncounter6IfMorePreciseThanDayIncludeTimeZoneOffset" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qp7M4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(not effectiveTime.value.oclIsUndefined() and effectiveTime.value.size() > 8 implies effectiveTime.value.size() >= 15)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6dFkgF9xEey5t-mahoHmrg" name="ProgressNoteComponentOfEncompassingEncounter6EffectiveTime" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6dFkgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qp7M4n3sEeyivuDeOiJBMg" name="ProgressNoteComponentOfEncompassingEncounter6EffectiveTime" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qp7M433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6dFkgl9xEey5t-mahoHmrg" name="ProgressNoteComponentOfEncompassingEncounter6Id" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6dFkg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qp7M5H3sEeyivuDeOiJBMg" name="ProgressNoteComponentOfEncompassingEncounter6Id" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qp7M5X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6dFkhF9xEey5t-mahoHmrg" name="ProgressNoteComponentOfEncompassingEncounter6Location" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6dFkhV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qp7z8H3sEeyivuDeOiJBMg" name="ProgressNoteComponentOfEncompassingEncounter6Location" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qp7z8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(location->one(location : cda::Location | not location.oclIsUndefined() and location.oclIsKindOf(cda::Location)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6dFkhl9xEey5t-mahoHmrg" name="ProgressNoteComponentOfEncompassingEncounter6" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6dFkh19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qp7z8n3sEeyivuDeOiJBMg" name="ProgressNoteComponentOfEncompassingEncounter6" constrainedElement="_UBzvED_LEeGXieeKs7NJjA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qp7z833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null)->reject(encompassingEncounter->one(encompassingEncounter : cda::EncompassingEncounter | not encompassingEncounter.oclIsUndefined() and encompassingEncounter.oclIsKindOf(cda::EncompassingEncounter)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_UCQbAD_LEeGXieeKs7NJjA" general="_2DNRcBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_tJ0Xol9xEey5t-mahoHmrg" name="getAssessmentSection" bodyCondition="_tJ0XpV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tJ0XpV9xEey5t-mahoHmrg" name="body" constrainedElement="_tJ0Xol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tJ0Xpl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E8qUgn3sEeyivuDeOiJBMg" name="getAssessmentSection" bodyCondition="_E8qUhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E8qUhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_E8qUgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E8qUhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))->asSequence()->any(true).oclAsType(consol::AssessmentSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tJ0Xo19xEey5t-mahoHmrg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tJ0XpF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E8qUg33sEeyivuDeOiJBMg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E8qUhH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tKUG4l9xEey5t-mahoHmrg" name="getPlanOfCareSection" bodyCondition="_tKUG5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tKUG5V9xEey5t-mahoHmrg" name="body" constrainedElement="_tKUG4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tKUG5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E9EkMH3sEeyivuDeOiJBMg" name="getPlanOfCareSection" bodyCondition="_E9EkM33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E9EkM33sEeyivuDeOiJBMg" name="body" constrainedElement="_E9EkMH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E9EkNH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfCareSection))->asSequence()->any(true).oclAsType(consol::PlanOfCareSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tKUG419xEey5t-mahoHmrg" type="_2NP-QxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tKUG5F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E9EkMX3sEeyivuDeOiJBMg" type="_2NP-QxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E9EkMn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tKxZ4V9xEey5t-mahoHmrg" name="getAssessmentAndPlanSection" bodyCondition="_tKxZ5F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tKxZ5F9xEey5t-mahoHmrg" name="body" constrainedElement="_tKxZ4V9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tKxZ5V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E9ez4H3sEeyivuDeOiJBMg" name="getAssessmentAndPlanSection" bodyCondition="_E9ez433sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E9ez433sEeyivuDeOiJBMg" name="body" constrainedElement="_E9ez4H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E9ez5H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection))->asSequence()->any(true).oclAsType(consol::AssessmentAndPlanSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tKxZ4l9xEey5t-mahoHmrg" type="_2Rwq0BSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tKxZ419xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E9ez4X3sEeyivuDeOiJBMg" type="_2Rwq0BSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E9ez4n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tLP7Al9xEey5t-mahoHmrg" name="getAllergiesSectionEntriesOptional" bodyCondition="_tLP7BV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tLP7BV9xEey5t-mahoHmrg" name="body" constrainedElement="_tLP7Al9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tLP7Bl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E94cgX3sEeyivuDeOiJBMg" name="getAllergiesSectionEntriesOptional" bodyCondition="_E94chH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E94chH3sEeyivuDeOiJBMg" name="body" constrainedElement="_E94cgX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E94chX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::AllergiesSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tLP7A19xEey5t-mahoHmrg" type="_bGzYgBVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tLP7BF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E94cgn3sEeyivuDeOiJBMg" type="_bGzYgBVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E94cg33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tLwRUF9xEey5t-mahoHmrg" name="getChiefComplaintSection" bodyCondition="_tLwRU19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tLwRU19xEey5t-mahoHmrg" name="body" constrainedElement="_tLwRUF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tLwRVF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E-UhYH3sEeyivuDeOiJBMg" name="getChiefComplaintSection" bodyCondition="_E-UhY33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E-UhY33sEeyivuDeOiJBMg" name="body" constrainedElement="_E-UhYH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E-UhZH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))->asSequence()->any(true).oclAsType(consol::ChiefComplaintSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tLwRUV9xEey5t-mahoHmrg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tLwRUl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E-UhYX3sEeyivuDeOiJBMg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E-UhYn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tMQnoF9xEey5t-mahoHmrg" name="getInterventionsSection" bodyCondition="_tMQno19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tMQno19xEey5t-mahoHmrg" name="body" constrainedElement="_tMQnoF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tMQnpF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E-uxEn3sEeyivuDeOiJBMg" name="getInterventionsSection" bodyCondition="_E-uxFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E-uxFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_E-uxEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E-uxFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::InterventionsSection))->asSequence()->any(true).oclAsType(consol::InterventionsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tMQnoV9xEey5t-mahoHmrg" type="_hqzJADVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tMQnol9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E-uxE33sEeyivuDeOiJBMg" type="_hqzJADVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E-uxFH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tMtTkl9xEey5t-mahoHmrg" name="getMedicationsSectionEntriesOptional" bodyCondition="_tMtTlV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tMtTlV9xEey5t-mahoHmrg" name="body" constrainedElement="_tMtTkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tMtTll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E_JAwH3sEeyivuDeOiJBMg" name="getMedicationsSectionEntriesOptional" bodyCondition="_E_JAw33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E_JAw33sEeyivuDeOiJBMg" name="body" constrainedElement="_E_JAwH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E_JAxH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::MedicationsSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tMtTk19xEey5t-mahoHmrg" type="_iAoXEBVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tMtTlF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E_JAwX3sEeyivuDeOiJBMg" type="_iAoXEBVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E_JAwn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tNL0sl9xEey5t-mahoHmrg" name="getObjectiveSection" bodyCondition="_tNMbwl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tNMbwl9xEey5t-mahoHmrg" name="body" constrainedElement="_tNL0sl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tNMbw19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_E_m60n3sEeyivuDeOiJBMg" name="getObjectiveSection" bodyCondition="_E_m61X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_E_m61X3sEeyivuDeOiJBMg" name="body" constrainedElement="_E_m60n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_E_nh4H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ObjectiveSection))->asSequence()->any(true).oclAsType(consol::ObjectiveSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tNMbwF9xEey5t-mahoHmrg" type="_rNJpADVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tNMbwV9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_E_m6033sEeyivuDeOiJBMg" type="_rNJpADVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E_m61H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tNqV0V9xEey5t-mahoHmrg" name="getPhysicalExamSection" bodyCondition="_tNqV1F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tNqV1F9xEey5t-mahoHmrg" name="body" constrainedElement="_tNqV0V9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tNqV1V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FABxkn3sEeyivuDeOiJBMg" name="getPhysicalExamSection" bodyCondition="_FABxlX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FABxlX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FABxkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FABxln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection))->asSequence()->any(true).oclAsType(consol::PhysicalExamSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tNqV0l9xEey5t-mahoHmrg" type="_2Pxt0hSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tNqV019xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FABxk33sEeyivuDeOiJBMg" type="_2Pxt0hSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FABxlH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tOL6QF9xEey5t-mahoHmrg" name="getProblemSectionEntriesOptional" bodyCondition="_tOL6Q19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tOL6Q19xEey5t-mahoHmrg" name="body" constrainedElement="_tOL6QF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tOL6RF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FAbaMn3sEeyivuDeOiJBMg" name="getProblemSectionEntriesOptional" bodyCondition="_FAbaNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FAbaNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FAbaMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FAbaNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::ProblemSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tOL6QV9xEey5t-mahoHmrg" type="_naxrkBVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tOL6Ql9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FAbaM33sEeyivuDeOiJBMg" type="_naxrkBVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FAbaNH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tOp0Ul9xEey5t-mahoHmrg" name="getResultsSectionEntriesOptional" bodyCondition="_tOp0VV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tOp0VV9xEey5t-mahoHmrg" name="body" constrainedElement="_tOp0Ul9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tOp0Vl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FA2Q8H3sEeyivuDeOiJBMg" name="getResultsSectionEntriesOptional" bodyCondition="_FA2Q833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FA2Q833sEeyivuDeOiJBMg" name="body" constrainedElement="_FA2Q8H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FA2Q9H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::ResultsSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tOp0U19xEey5t-mahoHmrg" type="_xGqiEBVdEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tOp0VF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FA2Q8X3sEeyivuDeOiJBMg" type="_xGqiEBVdEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FA2Q8n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tPKKoF9xEey5t-mahoHmrg" name="getReviewOfSystemsSection" bodyCondition="_tPKKo19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tPKKo19xEey5t-mahoHmrg" name="body" constrainedElement="_tPKKoF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tPKKpF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FBQgoH3sEeyivuDeOiJBMg" name="getReviewOfSystemsSection" bodyCondition="_FBQgo33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FBQgo33sEeyivuDeOiJBMg" name="body" constrainedElement="_FBQgoH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FBQgpH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))->asSequence()->any(true).oclAsType(consol::ReviewOfSystemsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tPKKoV9xEey5t-mahoHmrg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tPKKol9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FBQgoX3sEeyivuDeOiJBMg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FBQgon3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tPpS0l9xEey5t-mahoHmrg" name="getSubjectiveSection" bodyCondition="_tPpS1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tPpS1V9xEey5t-mahoHmrg" name="body" constrainedElement="_tPpS0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tPpS1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FBpiMn3sEeyivuDeOiJBMg" name="getSubjectiveSection" bodyCondition="_FBpiNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FBpiNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FBpiMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FBpiNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SubjectiveSection))->asSequence()->any(true).oclAsType(consol::SubjectiveSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tPpS019xEey5t-mahoHmrg" type="_iy8nYDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tPpS1F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FBpiM33sEeyivuDeOiJBMg" type="_iy8nYDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FBpiNH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_tQKQMF9xEey5t-mahoHmrg" name="getVitalSignsSectionEntriesOptional" bodyCondition="_tQKQM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tQKQM19xEey5t-mahoHmrg" name="body" constrainedElement="_tQKQMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tQKQNF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FCDx4H3sEeyivuDeOiJBMg" name="getVitalSignsSectionEntriesOptional" bodyCondition="_FCDx433sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FCDx433sEeyivuDeOiJBMg" name="body" constrainedElement="_FCDx4H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FCDx5H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSectionEntriesOptional))->asSequence()->any(true).oclAsType(consol::VitalSignsSectionEntriesOptional)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tQKQMV9xEey5t-mahoHmrg" type="_bRH8sBVeEeGQCvUGzi1kDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tQKQMl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FCDx4X3sEeyivuDeOiJBMg" type="_bRH8sBVeEeGQCvUGzi1kDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FCDx4n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_u-NGYF9xEey5t-mahoHmrg" name="getInstructionsSection" bodyCondition="_u-NGY19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_u-NGY19xEey5t-mahoHmrg" name="body" constrainedElement="_u-NGYF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_u-NGZF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GdB7EH3sEeyivuDeOiJBMg" name="getInstructionsSection" bodyCondition="_GdB7E33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GdB7E33sEeyivuDeOiJBMg" name="body" constrainedElement="_GdB7EH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GdB7FH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::InstructionsSection))->asSequence()->any(true).oclAsType(consol::InstructionsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_u-NGYV9xEey5t-mahoHmrg" type="_4qKukEE1EeGdmoWy_aLP0Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_u-NGYl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_GdB7EX3sEeyivuDeOiJBMg" type="_4qKukEE1EeGdmoWy_aLP0Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GdB7En3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -15407,34 +15407,34 @@ value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '11506-3' or value.
       <ownedComment xmi:id="_rQo48FmwEeGRqYkwoeymcA">
         <body>The Postprocedure Diagnosis entry encodes the diagnosis or diagnoses discovered or confirmed during the procedure. Often it is the same as the pre-procedure diagnosis or indication.</body>
       </ownedComment>
-      <ownedRule xmi:id="_tVCJJV9xEey5t-mahoHmrg" name="PostprocedureDiagnosisTemplateId" constrainedElement="_0fjXAEEvEeGdmoWy_aLP0Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tVCJJl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FGPHRX3sEeyivuDeOiJBMg" name="PostprocedureDiagnosisTemplateId" constrainedElement="_0fjXAEEvEeGdmoWy_aLP0Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FGPHRn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.51')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tVDXQF9xEey5t-mahoHmrg" name="PostprocedureDiagnosisClassCode" constrainedElement="_0fjXAEEvEeGdmoWy_aLP0Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tVDXQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FGQVYH3sEeyivuDeOiJBMg" name="PostprocedureDiagnosisClassCode" constrainedElement="_0fjXAEEvEeGdmoWy_aLP0Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FGQVYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tVFMcF9xEey5t-mahoHmrg" name="PostprocedureDiagnosisMoodCode" constrainedElement="_0fjXAEEvEeGdmoWy_aLP0Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tVFMcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FGRjgH3sEeyivuDeOiJBMg" name="PostprocedureDiagnosisMoodCode" constrainedElement="_0fjXAEEvEeGdmoWy_aLP0Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FGRjgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tVGakF9xEey5t-mahoHmrg" name="PostprocedureDiagnosisCode" constrainedElement="_0fjXAEEvEeGdmoWy_aLP0Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tVGakV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FGSxoH3sEeyivuDeOiJBMg" name="PostprocedureDiagnosisCode" constrainedElement="_0fjXAEEvEeGdmoWy_aLP0Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FGSxoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '59769-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tVmJ0F9xEey5t-mahoHmrg" name="PostprocedureDiagnosisProblemObservation" constrainedElement="_0fjXAEEvEeGdmoWy_aLP0Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tVmJ0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FGtBUH3sEeyivuDeOiJBMg" name="PostprocedureDiagnosisProblemObservation" constrainedElement="_0fjXAEEvEeGdmoWy_aLP0Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FGtBUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
@@ -15442,47 +15442,47 @@ value.code = '59769-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_0fjXAUEvEeGdmoWy_aLP0Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_tVmJ0l9xEey5t-mahoHmrg" name="getProblemObservations" bodyCondition="_tVmJ1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tVmJ1V9xEey5t-mahoHmrg" name="body" constrainedElement="_tVmJ0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tVmJ1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FGtBUn3sEeyivuDeOiJBMg" name="getProblemObservations" bodyCondition="_FGtBVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FGtBVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FGtBUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FGtBVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation)).oclAsType(consol::ProblemObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tVmJ019xEey5t-mahoHmrg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tVmJ1F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_FGtBU33sEeyivuDeOiJBMg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FGtBVH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_0baBYEEwEeGdmoWy_aLP0Q" name="PreoperativeDiagnosis">
-      <ownedRule xmi:id="_tWHuQF9xEey5t-mahoHmrg" name="PreoperativeDiagnosisTemplateId" constrainedElement="_0baBYEEwEeGdmoWy_aLP0Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tWHuQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FHMJgH3sEeyivuDeOiJBMg" name="PreoperativeDiagnosisTemplateId" constrainedElement="_0baBYEEwEeGdmoWy_aLP0Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FHMJgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.65')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tWI8YF9xEey5t-mahoHmrg" name="PreoperativeDiagnosisClassCode" constrainedElement="_0baBYEEwEeGdmoWy_aLP0Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tWI8YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FHNXoH3sEeyivuDeOiJBMg" name="PreoperativeDiagnosisClassCode" constrainedElement="_0baBYEEwEeGdmoWy_aLP0Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FHNXoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tWKKgF9xEey5t-mahoHmrg" name="PreoperativeDiagnosisMoodCode" constrainedElement="_0baBYEEwEeGdmoWy_aLP0Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tWKKgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FHOlwH3sEeyivuDeOiJBMg" name="PreoperativeDiagnosisMoodCode" constrainedElement="_0baBYEEwEeGdmoWy_aLP0Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FHOlwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tWLYoF9xEey5t-mahoHmrg" name="PreoperativeDiagnosisCode" constrainedElement="_0baBYEEwEeGdmoWy_aLP0Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tWLYoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FHPz4H3sEeyivuDeOiJBMg" name="PreoperativeDiagnosisCode" constrainedElement="_0baBYEEwEeGdmoWy_aLP0Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FHPz4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '10219-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tWsWAF9xEey5t-mahoHmrg" name="PreoperativeDiagnosisProblemObservation" constrainedElement="_0baBYEEwEeGdmoWy_aLP0Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tWsWAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FHqqoH3sEeyivuDeOiJBMg" name="PreoperativeDiagnosisProblemObservation" constrainedElement="_0baBYEEwEeGdmoWy_aLP0Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FHqqoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
@@ -15490,15 +15490,15 @@ value.code = '10219-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_0baBYUEwEeGdmoWy_aLP0Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_tWs9EF9xEey5t-mahoHmrg" name="getProblemObservations" bodyCondition="_tWs9E19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tWs9E19xEey5t-mahoHmrg" name="body" constrainedElement="_tWs9EF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tWs9FF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FHqqon3sEeyivuDeOiJBMg" name="getProblemObservations" bodyCondition="_FHqqpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FHqqpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FHqqon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FHqqpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation)).oclAsType(consol::ProblemObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tWs9EV9xEey5t-mahoHmrg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tWs9El9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_FHqqo33sEeyivuDeOiJBMg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FHqqpH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -15506,40 +15506,40 @@ value.code = '10219-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_9It9gEE1EeGdmoWy_aLP0Q">
         <body>The Instructions section records instructions given to a patient. List patient decision aids here.</body>
       </ownedComment>
-      <ownedRule xmi:id="_tXp_UF9xEey5t-mahoHmrg" name="InstructionsSectionTemplateId" constrainedElement="_4qKukEE1EeGdmoWy_aLP0Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tXp_UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FIg_N33sEeyivuDeOiJBMg" name="InstructionsSectionTemplateId" constrainedElement="_4qKukEE1EeGdmoWy_aLP0Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FIg_OH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.45')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tXqmYF9xEey5t-mahoHmrg" name="InstructionsSectionCode" constrainedElement="_4qKukEE1EeGdmoWy_aLP0Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tXqmYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FIiNUH3sEeyivuDeOiJBMg" name="InstructionsSectionCode" constrainedElement="_4qKukEE1EeGdmoWy_aLP0Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FIiNUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '69730-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tXr0gF9xEey5t-mahoHmrg" name="InstructionsSectionCodeP" constrainedElement="_4qKukEE1EeGdmoWy_aLP0Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tXr0gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FIjbcH3sEeyivuDeOiJBMg" name="InstructionsSectionCodeP" constrainedElement="_4qKukEE1EeGdmoWy_aLP0Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FIjbcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tXtCoF9xEey5t-mahoHmrg" name="InstructionsSectionTitle" constrainedElement="_4qKukEE1EeGdmoWy_aLP0Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tXtCoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FIkpkH3sEeyivuDeOiJBMg" name="InstructionsSectionTitle" constrainedElement="_4qKukEE1EeGdmoWy_aLP0Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FIkpkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tXuQwF9xEey5t-mahoHmrg" name="InstructionsSectionText" constrainedElement="_4qKukEE1EeGdmoWy_aLP0Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tXuQwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FIl3sH3sEeyivuDeOiJBMg" name="InstructionsSectionText" constrainedElement="_4qKukEE1EeGdmoWy_aLP0Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FIl3sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tYfs0F9xEey5t-mahoHmrg" name="InstructionsSectionInstructions" constrainedElement="_4qKukEE1EeGdmoWy_aLP0Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tYgT4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FJAHYH3sEeyivuDeOiJBMg" name="InstructionsSectionInstructions" constrainedElement="_4qKukEE1EeGdmoWy_aLP0Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FJAucH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::Instructions))</body>
         </specification>
@@ -15547,15 +15547,15 @@ value.code = '69730-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_4qKukUE1EeGdmoWy_aLP0Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_tYgT4V9xEey5t-mahoHmrg" name="getInstructionss" bodyCondition="_tYgT5F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tYgT5F9xEey5t-mahoHmrg" name="body" constrainedElement="_tYgT4V9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tYgT5V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FJAucX3sEeyivuDeOiJBMg" name="getInstructionss" bodyCondition="_FJAudH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FJAudH3sEeyivuDeOiJBMg" name="body" constrainedElement="_FJAucX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FJAudX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instructions)).oclAsType(consol::Instructions)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tYgT4l9xEey5t-mahoHmrg" type="_2G8h9RSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tYgT419xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_FJAucn3sEeyivuDeOiJBMg" type="_2G8h9RSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FJAuc33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -15563,40 +15563,40 @@ value.code = '69730-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_NdKLUHhrEeGJtvg2iiStYg">
         <body>The Admission Medications entry codes medications that the patient took prior to admission.</body>
       </ownedComment>
-      <ownedRule xmi:id="_tYgT5l9xEey5t-mahoHmrg" name="AdmissionMedicationTemplateId" constrainedElement="_LNP08EFGEeGorO80f-Cppg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tYgT519xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FJAudn3sEeyivuDeOiJBMg" name="AdmissionMedicationTemplateId" constrainedElement="_LNP08EFGEeGorO80f-Cppg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FJAud33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.36')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tYiJEF9xEey5t-mahoHmrg" name="AdmissionMedicationClassCode" constrainedElement="_LNP08EFGEeGorO80f-Cppg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tYiJEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FJB8kH3sEeyivuDeOiJBMg" name="AdmissionMedicationClassCode" constrainedElement="_LNP08EFGEeGorO80f-Cppg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FJB8kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tYjXMF9xEey5t-mahoHmrg" name="AdmissionMedicationMoodCode" constrainedElement="_LNP08EFGEeGorO80f-Cppg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tYjXMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FJDKsH3sEeyivuDeOiJBMg" name="AdmissionMedicationMoodCode" constrainedElement="_LNP08EFGEeGorO80f-Cppg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FJDKsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tYlzcF9xEey5t-mahoHmrg" name="AdmissionMedicationCodeP" constrainedElement="_LNP08EFGEeGorO80f-Cppg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tYlzcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FJE_4H3sEeyivuDeOiJBMg" name="AdmissionMedicationCodeP" constrainedElement="_LNP08EFGEeGorO80f-Cppg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FJE_4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tYklUF9xEey5t-mahoHmrg" name="AdmissionMedicationCode" constrainedElement="_LNP08EFGEeGorO80f-Cppg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tYklUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FJDxwH3sEeyivuDeOiJBMg" name="AdmissionMedicationCode" constrainedElement="_LNP08EFGEeGorO80f-Cppg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FJEY0H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 not value.codeSystem.oclIsUndefined() or not value.codeSystemName.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tZHX4F9xEey5t-mahoHmrg" name="AdmissionMedicationMedicationActivity" constrainedElement="_LNP08EFGEeGorO80f-Cppg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tZHX4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FJfPkH3sEeyivuDeOiJBMg" name="AdmissionMedicationMedicationActivity" constrainedElement="_LNP08EFGEeGorO80f-Cppg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FJfPkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::MedicationActivity) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
@@ -15604,15 +15604,15 @@ not value.codeSystem.oclIsUndefined() or not value.codeSystemName.oclIsUndefined
       <generalization xmi:id="_LNsg4EFGEeGorO80f-Cppg">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_tZHX4l9xEey5t-mahoHmrg" name="getMedicationActivities" bodyCondition="_tZHX5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tZHX5V9xEey5t-mahoHmrg" name="body" constrainedElement="_tZHX4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tZHX5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FJfPkn3sEeyivuDeOiJBMg" name="getMedicationActivities" bodyCondition="_FJfPlX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FJfPlX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FJfPkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FJfPln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity)).oclAsType(consol::MedicationActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tZHX419xEey5t-mahoHmrg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tZHX5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_FJfPk33sEeyivuDeOiJBMg" type="_2GHbgBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FJfPlH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -15620,34 +15620,34 @@ not value.codeSystem.oclIsUndefined() or not value.codeSystemName.oclIsUndefined
       <ownedComment xmi:id="_90pKMEFHEeGorO80f-Cppg">
         <body>The Hospital Admission Diagnosis entry describes the relevant problems or diagnoses at the time of admission.</body>
       </ownedComment>
-      <ownedRule xmi:id="_tZmgFl9xEey5t-mahoHmrg" name="HospitalAdmissionDiagnosisTemplateId" constrainedElement="_5K6mAEFHEeGorO80f-Cppg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tZmgF19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FJ5fR33sEeyivuDeOiJBMg" name="HospitalAdmissionDiagnosisTemplateId" constrainedElement="_5K6mAEFHEeGorO80f-Cppg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FJ6GUH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.34')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tZnuMF9xEey5t-mahoHmrg" name="HospitalAdmissionDiagnosisClassCode" constrainedElement="_5K6mAEFHEeGorO80f-Cppg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tZnuMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FJ6tYH3sEeyivuDeOiJBMg" name="HospitalAdmissionDiagnosisClassCode" constrainedElement="_5K6mAEFHEeGorO80f-Cppg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FJ6tYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tZo8UF9xEey5t-mahoHmrg" name="HospitalAdmissionDiagnosisMoodCode" constrainedElement="_5K6mAEFHEeGorO80f-Cppg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tZo8UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FJ8ikH3sEeyivuDeOiJBMg" name="HospitalAdmissionDiagnosisMoodCode" constrainedElement="_5K6mAEFHEeGorO80f-Cppg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FJ8ikX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tZqKcF9xEey5t-mahoHmrg" name="HospitalAdmissionDiagnosisCode" constrainedElement="_5K6mAEFHEeGorO80f-Cppg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tZqKcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FJ9JoH3sEeyivuDeOiJBMg" name="HospitalAdmissionDiagnosisCode" constrainedElement="_5K6mAEFHEeGorO80f-Cppg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FJ9JoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '46241-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_taLH0F9xEey5t-mahoHmrg" name="HospitalAdmissionDiagnosisProblemObservation" constrainedElement="_5K6mAEFHEeGorO80f-Cppg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_taLH0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FKZOgH3sEeyivuDeOiJBMg" name="HospitalAdmissionDiagnosisProblemObservation" constrainedElement="_5K6mAEFHEeGorO80f-Cppg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FKZOgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
@@ -15655,15 +15655,15 @@ value.code = '46241-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_5K6mAUFHEeGorO80f-Cppg">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_taLH0l9xEey5t-mahoHmrg" name="getProblemObservations" bodyCondition="_taLH1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_taLH1V9xEey5t-mahoHmrg" name="body" constrainedElement="_taLH0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_taLH1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FKZOgn3sEeyivuDeOiJBMg" name="getProblemObservations" bodyCondition="_FKZOhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FKZOhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FKZOgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FKZOhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation)).oclAsType(consol::ProblemObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_taLH019xEey5t-mahoHmrg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_taLH1F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_FKZOg33sEeyivuDeOiJBMg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FKZOhH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -15689,221 +15689,221 @@ value.code = '46241-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>self.getAllSections()->reject(section : cda::Section | section.templateId->exists(root = '2.16.840.1.113883.10.20.6.1.1'))->forAll(section : cda::Section | not section.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tl7r4F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tl7r4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FUiB8H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsTemplateId" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FUiB8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.5')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tmdQUF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCodeP" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tmdQUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FU_U8H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCodeP" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FU_U8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tl9hEF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCode" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tl9hEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FUkeMH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCode" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FUkeMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '18748-4' or value.code = '18747-6' or value.code = '18755-9' or value.code = '18760-9' or value.code = '18757-5' or value.code = '18758-3' or value.code = '18745-0' or value.code = '11522-0' or value.code = '18746-8' or value.code = '18751-8' or value.code = '11525-3'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tm-NsF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsId" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tm-NsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FVaLsH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsId" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FVaLsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id.oclIsUndefined() or self.id.isNullFlavorUndefined()) implies (not self.id.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tnqxQF9xEey5t-mahoHmrg" name="DiagnosticImagingReportInformant" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tnqxQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FV9lUH3sEeyivuDeOiJBMg" name="DiagnosticImagingReportInformant" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FV9lUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->select(informant : cda::Informant12 | not informant.oclIsUndefined() and informant.oclIsKindOf(rim::Participation))->isEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_toa_MF9xEey5t-mahoHmrg" name="DiagnosticImagingReportInformationRecipient" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_toa_MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FWZDIH3sEeyivuDeOiJBMg" name="DiagnosticImagingReportInformationRecipient" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FWZDIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->exists(informationRecipient : cda::InformationRecipient | not informationRecipient.oclIsUndefined() and informationRecipient.oclIsKindOf(rim::Participation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_to_m8F9xEey5t-mahoHmrg" name="DiagnosticImagingReportParticipant1" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_to_m8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FW3kQH3sEeyivuDeOiJBMg" name="DiagnosticImagingReportParticipant1" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FW3kQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->one(participant : cda::Participant1 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tqe0sF9xEey5t-mahoHmrg" name="DiagnosticImagingReportInFulfillmentOf" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tqe0sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FYFFMH3sEeyivuDeOiJBMg" name="DiagnosticImagingReportInFulfillmentOf" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FYFFMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->one(inFulfillmentOf : cda::InFulfillmentOf | not inFulfillmentOf.oclIsUndefined() and inFulfillmentOf.oclIsKindOf(cda::InFulfillmentOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_trBAMF9xEey5t-mahoHmrg" name="DiagnosticImagingReportDocumentationOf" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_trBAMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FYfU4H3sEeyivuDeOiJBMg" name="DiagnosticImagingReportDocumentationOf" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FYfU4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->one(documentationOf : cda::DocumentationOf | not documentationOf.oclIsUndefined() and documentationOf.oclIsKindOf(cda::DocumentationOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tsr0IF9xEey5t-mahoHmrg" name="DiagnosticImagingReportRelatedDocument" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tssbMF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FZ1_wH3sEeyivuDeOiJBMg" name="DiagnosticImagingReportRelatedDocument" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FZ1_wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.relatedDocument->one(relatedDocument : cda::RelatedDocument | not relatedDocument.oclIsUndefined() and relatedDocument.oclIsKindOf(cda::RelatedDocument))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tt1qsF9xEey5t-mahoHmrg" name="DiagnosticImagingReportComponentOf" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tt1qsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fa1eQH3sEeyivuDeOiJBMg" name="DiagnosticImagingReportComponentOf" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fa1eQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->one(componentOf : cda::Component1 | not componentOf.oclIsUndefined() and componentOf.oclIsKindOf(cda::Component1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tzb8YF9xEey5t-mahoHmrg" name="DiagnosticImagingReportFindingsSection" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tzb8YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FfSgcH3sEeyivuDeOiJBMg" name="DiagnosticImagingReportFindingsSection" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FfSgcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FindingsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_u6z0IF9xEey5t-mahoHmrg" name="DiagnosticImagingReportDICOMObjectCatalogSection" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_u6z0IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GaC4gH3sEeyivuDeOiJBMg" name="DiagnosticImagingReportDICOMObjectCatalogSection" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GaC4gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::DICOMObjectCatalogSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6ekyQF9xEey5t-mahoHmrg" name="DiagnosticImagingReportParticipantAssociatedEntityPersonName" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6ekyQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QrghQH3sEeyivuDeOiJBMg" name="DiagnosticImagingReportParticipantAssociatedEntityPersonName" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QrghQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).associatedEntity->excluding(null).associatedPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (name->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6elZUF9xEey5t-mahoHmrg" name="DiagnosticImagingReportParticipantAssociatedEntityAssociatedPerson" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6elZUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QrhIUH3sEeyivuDeOiJBMg" name="DiagnosticImagingReportParticipantAssociatedEntityAssociatedPerson" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QrhIUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).associatedEntity->excluding(null)->reject(associatedPerson->one(associatedPerson : cda::Person | not associatedPerson.oclIsUndefined() and associatedPerson.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6elZUl9xEey5t-mahoHmrg" name="DiagnosticImagingReportParticipantAssociatedEntity" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6elZU19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QrhIUn3sEeyivuDeOiJBMg" name="DiagnosticImagingReportParticipantAssociatedEntity" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QrhIU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(associatedEntity->one(associatedEntity : cda::AssociatedEntity | not associatedEntity.oclIsUndefined() and associatedEntity.oclIsKindOf(cda::AssociatedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6gDY8F9xEey5t-mahoHmrg" name="DiagnosticImagingReportDocumentationOfServiceEvent4ClassCode" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6gDY8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QtUfIH3sEeyivuDeOiJBMg" name="DiagnosticImagingReportDocumentationOfServiceEvent4ClassCode" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QtUfIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(isDefined('classCode') and classCode=vocab::ActClassRoot::ACT)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6gDY8l9xEey5t-mahoHmrg" name="DiagnosticImagingReportDocumentationOfServiceEvent4Code" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6gDY819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QtUfIn3sEeyivuDeOiJBMg" name="DiagnosticImagingReportDocumentationOfServiceEvent4Code" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QtUfI33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6gEAAF9xEey5t-mahoHmrg" name="DiagnosticImagingReportDocumentationOfServiceEvent4Id" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6gEAAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QtVGMH3sEeyivuDeOiJBMg" name="DiagnosticImagingReportDocumentationOfServiceEvent4Id" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QtVGMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6gEAAl9xEey5t-mahoHmrg" name="DiagnosticImagingReportDocumentationOfServiceEvent4PhysicianReadingStudyPerformer" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6gEAA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QtVGMn3sEeyivuDeOiJBMg" name="DiagnosticImagingReportDocumentationOfServiceEvent4PhysicianReadingStudyPerformer" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QtVGM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(performer->exists(performer : cda::Performer1 | not performer.oclIsUndefined() and performer.oclIsKindOf(consol::PhysicianReadingStudyPerformer)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6gEABF9xEey5t-mahoHmrg" name="DiagnosticImagingReportDocumentationOfServiceEvent3" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6gEABV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QtVGNH3sEeyivuDeOiJBMg" name="DiagnosticImagingReportDocumentationOfServiceEvent3" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QtVGNX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null)->reject(serviceEvent->one(serviceEvent : cda::ServiceEvent | not serviceEvent.oclIsUndefined() and serviceEvent.oclIsKindOf(cda::ServiceEvent)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6ijTUF9xEey5t-mahoHmrg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7ResponsiblePartyAssignedEntityHasAssignPersonOrRepresentedOrganization" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6ijTUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QwBN0H3sEeyivuDeOiJBMg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7ResponsiblePartyAssignedEntityHasAssignPersonOrRepresentedOrganization" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QwBN0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).responsibleParty->excluding(null).assignedEntity->excluding(null)->reject(assignedPerson->size() = 1 or representedOrganization->size() = 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6ij6YF9xEey5t-mahoHmrg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7ResponsiblePartyAssignedEntity" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6ij6YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QwB04H3sEeyivuDeOiJBMg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7ResponsiblePartyAssignedEntity" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QwB04X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).responsibleParty->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6ij6Yl9xEey5t-mahoHmrg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7PreciseToTheDay" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6ij6Y19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QwB04n3sEeyivuDeOiJBMg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7PreciseToTheDay" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QwB0433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(not effectiveTime.value.oclIsUndefined() implies effectiveTime.value.size() >= 8)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6ij6ZF9xEey5t-mahoHmrg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7PreciseToTheMinute" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6ij6ZV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QwCb8H3sEeyivuDeOiJBMg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7PreciseToTheMinute" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QwCb8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(not effectiveTime.value.oclIsUndefined() implies effectiveTime.value.size() >= 12)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6ikhcF9xEey5t-mahoHmrg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7PreciseToTheSecond" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6ikhcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QwCb8n3sEeyivuDeOiJBMg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7PreciseToTheSecond" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QwCb833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(not effectiveTime.value.oclIsUndefined() implies effectiveTime.value.size() >= 14)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6ikhcl9xEey5t-mahoHmrg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7IfMorePreciseThanDayIncludeTimeZoneOffset" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6ikhc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QwCb9H3sEeyivuDeOiJBMg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7IfMorePreciseThanDayIncludeTimeZoneOffset" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QwCb9X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(not effectiveTime.value.oclIsUndefined() and effectiveTime.value.size() > 8 implies effectiveTime.value.size() >= 15)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6ikhdF9xEey5t-mahoHmrg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7EffectiveTime" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6ikhdV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QwDDAH3sEeyivuDeOiJBMg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7EffectiveTime" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QwDDAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6ilIgF9xEey5t-mahoHmrg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7Id" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6ilIgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QwDDAn3sEeyivuDeOiJBMg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7Id" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QwDDA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6ilIgl9xEey5t-mahoHmrg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7PhysicianofRecordParticipant" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6ilIg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QwDDBH3sEeyivuDeOiJBMg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7PhysicianofRecordParticipant" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QwDDBX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(encounterParticipant->one(encounterParticipant : cda::EncounterParticipant | not encounterParticipant.oclIsUndefined() and encounterParticipant.oclIsKindOf(consol::PhysicianofRecordParticipant)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6ilvkF9xEey5t-mahoHmrg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7ResponsibleParty" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6ilvkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QwDqEH3sEeyivuDeOiJBMg" name="DiagnosticImagingReportComponentOfEncompassingEncounter7ResponsibleParty" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QwDqEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(responsibleParty->one(responsibleParty : cda::ResponsibleParty | not responsibleParty.oclIsUndefined() and responsibleParty.oclIsKindOf(cda::ResponsibleParty)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6ilvkl9xEey5t-mahoHmrg" name="DiagnosticImagingReportComponentOfEncompassingEncounter" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6ilvk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QwDqEn3sEeyivuDeOiJBMg" name="DiagnosticImagingReportComponentOfEncompassingEncounter" constrainedElement="_XwBooEUuEeGdQ4KWAmnbhw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QwDqE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null)->reject(encompassingEncounter->one(encompassingEncounter : cda::EncompassingEncounter | not encompassingEncounter.oclIsUndefined() and encompassingEncounter.oclIsKindOf(cda::EncompassingEncounter)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_XwdtgEUuEeGdQ4KWAmnbhw" general="_2DNRcBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_tzcjcF9xEey5t-mahoHmrg" name="getFindingsSection" bodyCondition="_tzcjc19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_tzcjc19xEey5t-mahoHmrg" name="body" constrainedElement="_tzcjcF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_tzcjdF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FfSgcn3sEeyivuDeOiJBMg" name="getFindingsSection" bodyCondition="_FfSgdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FfSgdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FfSgcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FfTHgH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FindingsSection))->asSequence()->any(true).oclAsType(consol::FindingsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_tzcjcV9xEey5t-mahoHmrg" type="_ZcC-4DVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tzcjcl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FfSgc33sEeyivuDeOiJBMg" type="_ZcC-4DVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FfSgdH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_u6z0Il9xEey5t-mahoHmrg" name="getDICOMObjectCatalogSection" bodyCondition="_u6z0JV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_u6z0JV9xEey5t-mahoHmrg" name="body" constrainedElement="_u6z0Il9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_u6z0Jl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GaDfkH3sEeyivuDeOiJBMg" name="getDICOMObjectCatalogSection" bodyCondition="_GaDfk33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GaDfk33sEeyivuDeOiJBMg" name="body" constrainedElement="_GaDfkH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GaDflH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::DICOMObjectCatalogSection))->asSequence()->any(true).oclAsType(consol::DICOMObjectCatalogSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_u6z0I19xEey5t-mahoHmrg" type="_WPTWEDVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_u6z0JF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_GaDfkX3sEeyivuDeOiJBMg" type="_WPTWEDVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GaDfkn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -15911,80 +15911,80 @@ value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '18748-4' or value.
       <ownedComment xmi:id="_s137QIfHEeSBauRYePLghA">
         <body>This participant is the Physician Reading Study Performer defined in documentationOf/serviceEvent and is usually different from the attending physician. The reading physician??interprets the images and evidence of the study (DICOM Definition)</body>
       </ownedComment>
-      <ownedRule xmi:id="_trikoV9xEey5t-mahoHmrg" name="PhysicianReadingStudyPerformerTemplateId" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_trikol9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FY6Lo33sEeyivuDeOiJBMg" name="PhysicianReadingStudyPerformerTemplateId" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FY6LpH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.6.2.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_trkZ0F9xEey5t-mahoHmrg" name="PhysicianReadingStudyPerformerTime" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_trkZ0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FY7ZwH3sEeyivuDeOiJBMg" name="PhysicianReadingStudyPerformerTime" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FY7ZwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.time.oclIsUndefined() or self.time.isNullFlavorUndefined()) implies (not self.time.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_trmPAF9xEey5t-mahoHmrg" name="PhysicianReadingStudyPerformerTypeCode" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_trmPAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FY8n4H3sEeyivuDeOiJBMg" name="PhysicianReadingStudyPerformerTypeCode" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FY8n4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.typeCode=vocab::x_ServiceEventPerformer::PRF</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tx6SYF9xEey5t-mahoHmrg" name="PhysicianReadingStudyPerformerAssignedEntity" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tx6SYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FeBVIH3sEeyivuDeOiJBMg" name="PhysicianReadingStudyPerformerAssignedEntity" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FeBVIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6im9sF9xEey5t-mahoHmrg" name="PhysicianReadingStudyPerformerGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheDayIVLTS" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6im9sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QwE4MH3sEeyivuDeOiJBMg" name="PhysicianReadingStudyPerformerGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheDayIVLTS" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QwE4MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.time->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ((not value.oclIsUndefined() implies value.size() >= 8) and ((not low.value.oclIsUndefined() and low.isNullFlavorUndefined() implies low.value.size() >= 8) and (not high.value.oclIsUndefined() and high.isNullFlavorUndefined() implies high.value.size() >= 8))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6im9sl9xEey5t-mahoHmrg" name="PhysicianReadingStudyPerformerGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheMinuteIVLTS" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6im9s19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QwFfQH3sEeyivuDeOiJBMg" name="PhysicianReadingStudyPerformerGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheMinuteIVLTS" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QwFfQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.time->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ((not value.oclIsUndefined() implies value.size() >= 12) and ((not low.value.oclIsUndefined() and low.isNullFlavorUndefined() implies low.value.size() >= 12) and (not high.value.oclIsUndefined() and high.isNullFlavorUndefined() implies high.value.size() >= 12))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6inkwF9xEey5t-mahoHmrg" name="PhysicianReadingStudyPerformerGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheSecondIVLTS" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6inkwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QwGGUH3sEeyivuDeOiJBMg" name="PhysicianReadingStudyPerformerGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheSecondIVLTS" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QwGGUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.time->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ((not value.oclIsUndefined() implies value.size() >= 14) and ((not low.value.oclIsUndefined() and low.isNullFlavorUndefined() implies low.value.size() >= 14) and (not high.value.oclIsUndefined() and high.isNullFlavorUndefined() implies high.value.size() >= 14))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6inkwl9xEey5t-mahoHmrg" name="PhysicianReadingStudyPerformerGeneralHeaderConstraintsUSRealmDateAndTimeDTIfMorePreciseThanDayIncludeTimeZoneOffsetIVLTS" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6inkw19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QwGGUn3sEeyivuDeOiJBMg" name="PhysicianReadingStudyPerformerGeneralHeaderConstraintsUSRealmDateAndTimeDTIfMorePreciseThanDayIncludeTimeZoneOffsetIVLTS" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QwGGU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.time->excluding(null)->select(isNullFlavorUndefined())->reject((not value.oclIsUndefined() and value.size() > 8 implies value.size() >= 15) and ((not low.value.oclIsUndefined() and low.value.size() > 8 implies low.value.size() >= 15) and (not high.value.oclIsUndefined() and high.value.size() > 8 implies high.value.size() >= 15)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6jH7EF9xEey5t-mahoHmrg" name="PhysicianReadingStudyPerformerAssignedEntityHasDICOM" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6jH7EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QwzQ8H3sEeyivuDeOiJBMg" name="PhysicianReadingStudyPerformerAssignedEntityHasDICOM" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QwzQ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->excluding(null)->reject(code.codeSystem = '1.2.840.10008.2.16.4' or code.codeSystem = '2.16.840.1.113883.6.101')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6jIiIF9xEey5t-mahoHmrg" name="PhysicianReadingStudyPerformerAssignedEntityHasAssignedPersonOrRepresentedOrganization" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6jIiIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QwzQ8n3sEeyivuDeOiJBMg" name="PhysicianReadingStudyPerformerAssignedEntityHasAssignedPersonOrRepresentedOrganization" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QwzQ833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->excluding(null)->reject(not assignedPerson->isEmpty() or  not representedOrganization->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6jIiIl9xEey5t-mahoHmrg" name="PhysicianReadingStudyPerformerAssignedEntityHasNationalProviderId" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6jIiI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QwzQ9H3sEeyivuDeOiJBMg" name="PhysicianReadingStudyPerformerAssignedEntityHasNationalProviderId" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qwz4AH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->excluding(null)->reject(id->exists( root='2.16.840.1.113883.4.6' ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6jIiJF9xEey5t-mahoHmrg" name="PhysicianReadingStudyPerformerAssignedEntityId" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6jIiJV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qwz4AX3sEeyivuDeOiJBMg" name="PhysicianReadingStudyPerformerAssignedEntityId" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qwz4An3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6jJJMF9xEey5t-mahoHmrg" name="PhysicianReadingStudyPerformerAssignedEntityCode" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6jJJMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qwz4A33sEeyivuDeOiJBMg" name="PhysicianReadingStudyPerformerAssignedEntityCode" constrainedElement="_H1UdcEVEEeGAh_iQGJvI5w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qwz4BH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
@@ -15997,56 +15997,56 @@ value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '18748-4' or value.
       <ownedComment xmi:id="_TthdwEb1EeGp67IkyTw1fg">
         <body>This encounterParticipant is the attending physician and is usually different from the Physician Reading Study Performer defined in documentationOf/serviceEvent.</body>
       </ownedComment>
-      <ownedRule xmi:id="_tssbMV9xEey5t-mahoHmrg" name="PhysicianofRecordParticipantTemplateId" constrainedElement="_H_izsEb1EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tssbMl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FZ2m0H3sEeyivuDeOiJBMg" name="PhysicianofRecordParticipantTemplateId" constrainedElement="_H_izsEb1EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FZ2m0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.6.2.2')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tsuQYF9xEey5t-mahoHmrg" name="PhysicianofRecordParticipantTypeCode" constrainedElement="_H_izsEb1EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tsuQYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FZ308H3sEeyivuDeOiJBMg" name="PhysicianofRecordParticipantTypeCode" constrainedElement="_H_izsEb1EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FZ308X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.typeCode=vocab::x_EncounterParticipant::ATND</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tyb20F9xEey5t-mahoHmrg" name="PhysicianofRecordParticipantAssignedEntity" constrainedElement="_H_izsEb1EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tyb20V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FecL4H3sEeyivuDeOiJBMg" name="PhysicianofRecordParticipantAssignedEntity" constrainedElement="_H_izsEb1EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FecL4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6kJ10F9xEey5t-mahoHmrg" name="PhysicianofRecordParticipantAssignedEntityAssignedPersonName" constrainedElement="_H_izsEb1EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6kJ10V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qx75YH3sEeyivuDeOiJBMg" name="PhysicianofRecordParticipantAssignedEntityAssignedPersonName" constrainedElement="_H_izsEb1EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qx75YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->excluding(null).assignedPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6kKc4F9xEey5t-mahoHmrg" name="PhysicianofRecordParticipantAssignedEntityHasDICOMOrNUCCCode" constrainedElement="_H_izsEb1EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6kKc4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qx75Yn3sEeyivuDeOiJBMg" name="PhysicianofRecordParticipantAssignedEntityHasDICOMOrNUCCCode" constrainedElement="_H_izsEb1EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qx75Y33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->excluding(null)->reject(code.codeSystem = '1.2.840.10008.2.16.4' or code.codeSystem = '2.16.840.1.113883.6.101')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6kKc4l9xEey5t-mahoHmrg" name="PhysicianofRecordParticipantAssignedEntityHasNationalProviderId" constrainedElement="_H_izsEb1EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6kKc419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qx8gcH3sEeyivuDeOiJBMg" name="PhysicianofRecordParticipantAssignedEntityHasNationalProviderId" constrainedElement="_H_izsEb1EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qx8gcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->excluding(null)->reject(id->exists( root='2.16.840.1.113883.4.6' ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6kKc5F9xEey5t-mahoHmrg" name="PhysicianofRecordParticipantAssignedEntityCode" constrainedElement="_H_izsEb1EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6kKc5V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qx8gcn3sEeyivuDeOiJBMg" name="PhysicianofRecordParticipantAssignedEntityCode" constrainedElement="_H_izsEb1EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qx8gc33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6kLD8F9xEey5t-mahoHmrg" name="PhysicianofRecordParticipantAssignedEntityId" constrainedElement="_H_izsEb1EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6kLD8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qx9HgH3sEeyivuDeOiJBMg" name="PhysicianofRecordParticipantAssignedEntityId" constrainedElement="_H_izsEb1EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qx9HgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6kLD8l9xEey5t-mahoHmrg" name="PhysicianofRecordParticipantAssignedEntityAssignedPerson" constrainedElement="_H_izsEb1EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6kLD819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qx9Hgn3sEeyivuDeOiJBMg" name="PhysicianofRecordParticipantAssignedEntityAssignedPerson" constrainedElement="_H_izsEb1EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qx9Hg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->excluding(null)->reject(assignedPerson->one(assignedPerson : cda::Person | not assignedPerson.oclIsUndefined() and assignedPerson.oclIsKindOf(cda::Person)))</body>
         </specification>
@@ -16092,52 +16092,52 @@ value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '18748-4' or value.
           <body>not self.text.reference.value.oclIsUndefined() implies not self.getSection().text.getText(self.text.reference.value.substring(2, self.text.reference.value.size())).oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tu2-Y19xEey5t-mahoHmrg" name="StudyActTemplateId" constrainedElement="_vjf-wEb4EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tu3lcF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fbry033sEeyivuDeOiJBMg" name="StudyActTemplateId" constrainedElement="_vjf-wEb4EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fbry1H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.6.2.6')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tu5aoF9xEey5t-mahoHmrg" name="StudyActClassCode" constrainedElement="_vjf-wEb4EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tu5aoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FbuPEH3sEeyivuDeOiJBMg" name="StudyActClassCode" constrainedElement="_vjf-wEb4EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FbuPEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tu7P0F9xEey5t-mahoHmrg" name="StudyActMoodCode" constrainedElement="_vjf-wEb4EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tu7P0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FbvdMH3sEeyivuDeOiJBMg" name="StudyActMoodCode" constrainedElement="_vjf-wEb4EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FbvdMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tu8d8F9xEey5t-mahoHmrg" name="StudyActId" constrainedElement="_vjf-wEb4EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tu8d8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FbwrUH3sEeyivuDeOiJBMg" name="StudyActId" constrainedElement="_vjf-wEb4EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FbwrUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tu9sEF9xEey5t-mahoHmrg" name="StudyActCode" constrainedElement="_vjf-wEb4EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tu9sEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fbx5cH3sEeyivuDeOiJBMg" name="StudyActCode" constrainedElement="_vjf-wEb4EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fbx5cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '113014' and value.codeSystem = '1.2.840.10008.2.16.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tu_hQF9xEey5t-mahoHmrg" name="StudyActEffectiveTime" constrainedElement="_vjf-wEb4EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tu_hQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FbzHkH3sEeyivuDeOiJBMg" name="StudyActEffectiveTime" constrainedElement="_vjf-wEb4EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FbzHkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvAvYF9xEey5t-mahoHmrg" name="StudyActText" constrainedElement="_vjf-wEb4EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvAvYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fb0VsH3sEeyivuDeOiJBMg" name="StudyActText" constrainedElement="_vjf-wEb4EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fb0VsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_t0ZlsF9xEey5t-mahoHmrg" name="StudyActSeriesAct" constrainedElement="_vjf-wEb4EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_t0ZlsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FgHm4H3sEeyivuDeOiJBMg" name="StudyActSeriesAct" constrainedElement="_vjf-wEb4EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FgHm4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::SeriesAct) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
@@ -16145,15 +16145,15 @@ value.code = '113014' and value.codeSystem = '1.2.840.10008.2.16.4')</body>
       <generalization xmi:id="_vjpIsEb4EeGp67IkyTw1fg">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_t0Zlsl9xEey5t-mahoHmrg" name="getSeriesAct" bodyCondition="_t0ZltV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_t0ZltV9xEey5t-mahoHmrg" name="body" constrainedElement="_t0Zlsl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_t0Zltl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FgHm4n3sEeyivuDeOiJBMg" name="getSeriesAct" bodyCondition="_FgHm5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FgHm5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_FgHm4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FgHm5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::SeriesAct))->asSequence()->any(true).oclAsType(consol::SeriesAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_t0Zls19xEey5t-mahoHmrg" type="_N2wscEb6EeGp67IkyTw1fg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t0ZltF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FgHm433sEeyivuDeOiJBMg" type="_N2wscEb6EeGp67IkyTw1fg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FgHm5H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -16200,52 +16200,52 @@ value.code = '113014' and value.codeSystem = '1.2.840.10008.2.16.4')</body>
           <body>self.code.qualifier.value->one(val | (not val.oclIsUndefined() or val.isNullFlavorUndefined()) implies val.oclIsKindOf(datatypes::ANY) and val.codeSystem = '1.2.840.10008.2.16.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvB9gF9xEey5t-mahoHmrg" name="SeriesActTemplateId" constrainedElement="_N2wscEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvB9gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fb1j0H3sEeyivuDeOiJBMg" name="SeriesActTemplateId" constrainedElement="_N2wscEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fb1j0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.63')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvFA0F9xEey5t-mahoHmrg" name="SeriesActClassCode" constrainedElement="_N2wscEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvFA0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fb4AEH3sEeyivuDeOiJBMg" name="SeriesActClassCode" constrainedElement="_N2wscEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fb4AEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvGO8F9xEey5t-mahoHmrg" name="SeriesActMoodCode" constrainedElement="_N2wscEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvGO8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fb5OMH3sEeyivuDeOiJBMg" name="SeriesActMoodCode" constrainedElement="_N2wscEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fb5OMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvHdEF9xEey5t-mahoHmrg" name="SeriesActCode" constrainedElement="_N2wscEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvHdEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fb51QH3sEeyivuDeOiJBMg" name="SeriesActCode" constrainedElement="_N2wscEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fb51QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '113015' and value.codeSystem = '1.2.840.10008.2.16.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvJSQF9xEey5t-mahoHmrg" name="SeriesActEffectiveTime" constrainedElement="_N2wscEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvJSQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fb7DYH3sEeyivuDeOiJBMg" name="SeriesActEffectiveTime" constrainedElement="_N2wscEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fb7DYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvKgYF9xEey5t-mahoHmrg" name="SeriesActId" constrainedElement="_N2wscEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvKgYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fb8RgH3sEeyivuDeOiJBMg" name="SeriesActId" constrainedElement="_N2wscEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fb8RgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvMVkF9xEey5t-mahoHmrg" name="SeriesActText" constrainedElement="_N2wscEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvMVkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fb9foH3sEeyivuDeOiJBMg" name="SeriesActText" constrainedElement="_N2wscEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fb9foX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_t06jEF9xEey5t-mahoHmrg" name="SeriesActSOPInstanceObservation" constrainedElement="_N2wscEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_t06jEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FggocH3sEeyivuDeOiJBMg" name="SeriesActSOPInstanceObservation" constrainedElement="_N2wscEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FggocX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SOPInstanceObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
@@ -16253,15 +16253,15 @@ value.code = '113015' and value.codeSystem = '1.2.840.10008.2.16.4')</body>
       <generalization xmi:id="_N2wscUb6EeGp67IkyTw1fg">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_t07KIF9xEey5t-mahoHmrg" name="getSOPInstanceObservations" bodyCondition="_t07KI19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_t07KI19xEey5t-mahoHmrg" name="body" constrainedElement="_t07KIF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_t07KJF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FghPgH3sEeyivuDeOiJBMg" name="getSOPInstanceObservations" bodyCondition="_FghPg33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FghPg33sEeyivuDeOiJBMg" name="body" constrainedElement="_FghPgH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FghPhH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SOPInstanceObservation)).oclAsType(consol::SOPInstanceObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_t07KIV9xEey5t-mahoHmrg" type="_9o7WcEb6EeGp67IkyTw1fg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t07KIl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_FghPgX3sEeyivuDeOiJBMg" type="_9o7WcEb6EeGp67IkyTw1fg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FghPgn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -16305,70 +16305,70 @@ value.code = '113015' and value.codeSystem = '1.2.840.10008.2.16.4')</body>
           <body>not self.text.oclIsUndefined() implies self.text.reference.value->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvNjsF9xEey5t-mahoHmrg" name="SOPInstanceObservationTemplateId" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvNjsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fb-GsH3sEeyivuDeOiJBMg" name="SOPInstanceObservationTemplateId" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fb-twH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.6.2.8')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvP_8F9xEey5t-mahoHmrg" name="SOPInstanceObservationClassCode" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvP_8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FcAi8H3sEeyivuDeOiJBMg" name="SOPInstanceObservationClassCode" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FcAi8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::DGIMG</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvR1IF9xEey5t-mahoHmrg" name="SOPInstanceObservationEffectiveTime" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvR1IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FcCYIH3sEeyivuDeOiJBMg" name="SOPInstanceObservationEffectiveTime" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FcCYIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvTDQF9xEey5t-mahoHmrg" name="SOPInstanceObservationId" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvTDQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FcC_MH3sEeyivuDeOiJBMg" name="SOPInstanceObservationId" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FcC_MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvURYF9xEey5t-mahoHmrg" name="SOPInstanceObservationMoodCode" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvURYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FcENUH3sEeyivuDeOiJBMg" name="SOPInstanceObservationMoodCode" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FcENUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvWGkF9xEey5t-mahoHmrg" name="SOPInstanceObservationText" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvWGkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FcGCgH3sEeyivuDeOiJBMg" name="SOPInstanceObservationText" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FcGCgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvZw8F9xEey5t-mahoHmrg" name="SOPInstanceObservationCodeP" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvZw8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FcH3sH3sEeyivuDeOiJBMg" name="SOPInstanceObservationCodeP" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FcH3sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvX7wF9xEey5t-mahoHmrg" name="SOPInstanceObservationCode" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvX7wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FcGpkH3sEeyivuDeOiJBMg" name="SOPInstanceObservationCode" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FcGpkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '1.2.840.10008.2.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_t1d8sF9xEey5t-mahoHmrg" name="SOPInstanceObservationSOPInstanceObservation" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_t1ejwF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fg6REH3sEeyivuDeOiJBMg" name="SOPInstanceObservationSOPInstanceObservation" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fg6REX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SOPInstanceObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_t2FnwF9xEey5t-mahoHmrg" name="SOPInstanceObservationPurposeofReferenceObservation" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_t2FnwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FhT5sH3sEeyivuDeOiJBMg" name="SOPInstanceObservationPurposeofReferenceObservation" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FhT5sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PurposeofReferenceObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_t2pBYF9xEey5t-mahoHmrg" name="SOPInstanceObservationReferencedFramesObservation" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_t2pocF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FhtiUH3sEeyivuDeOiJBMg" name="SOPInstanceObservationReferencedFramesObservation" constrainedElement="_9o7WcEb6EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FhtiUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ReferencedFramesObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
@@ -16376,37 +16376,37 @@ value.codeSystem = '1.2.840.10008.2.6.1')</body>
       <generalization xmi:id="_9o7WcUb6EeGp67IkyTw1fg">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_t1ejwV9xEey5t-mahoHmrg" name="getSOPInstanceObservations" bodyCondition="_t1ejxF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_t1ejxF9xEey5t-mahoHmrg" name="body" constrainedElement="_t1ejwV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_t1ejxV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Fg64IH3sEeyivuDeOiJBMg" name="getSOPInstanceObservations" bodyCondition="_Fg64I33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Fg64I33sEeyivuDeOiJBMg" name="body" constrainedElement="_Fg64IH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fg64JH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SOPInstanceObservation)).oclAsType(consol::SOPInstanceObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_t1ejwl9xEey5t-mahoHmrg" type="_9o7WcEb6EeGp67IkyTw1fg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t1ejw19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Fg64IX3sEeyivuDeOiJBMg" type="_9o7WcEb6EeGp67IkyTw1fg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Fg64In3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_t2Fnwl9xEey5t-mahoHmrg" name="getPurposeofReferenceObservations" bodyCondition="_t2FnxV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_t2FnxV9xEey5t-mahoHmrg" name="body" constrainedElement="_t2Fnwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_t2Fnxl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FhT5sn3sEeyivuDeOiJBMg" name="getPurposeofReferenceObservations" bodyCondition="_FhT5tX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FhT5tX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FhT5sn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FhT5tn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PurposeofReferenceObservation)).oclAsType(consol::PurposeofReferenceObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_t2Fnw19xEey5t-mahoHmrg" type="_J-F8UEb7EeGp67IkyTw1fg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t2FnxF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_FhT5s33sEeyivuDeOiJBMg" type="_J-F8UEb7EeGp67IkyTw1fg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FhT5tH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_t2pocV9xEey5t-mahoHmrg" name="getReferencedFramesObservations" bodyCondition="_t2podF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_t2podF9xEey5t-mahoHmrg" name="body" constrainedElement="_t2pocV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_t2podV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FhtiUn3sEeyivuDeOiJBMg" name="getReferencedFramesObservations" bodyCondition="_FhtiVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FhtiVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_FhtiUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FhtiVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ReferencedFramesObservation)).oclAsType(consol::ReferencedFramesObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_t2pocl9xEey5t-mahoHmrg" type="_1Zyf4Eb8EeGp67IkyTw1fg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t2poc19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_FhtiU33sEeyivuDeOiJBMg" type="_1Zyf4Eb8EeGp67IkyTw1fg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FhtiVH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -16423,32 +16423,32 @@ value.codeSystem = '1.2.840.10008.2.6.1')</body>
           <body>self.code.isNullFlavorDefined() or (self.code.code = 'ASSERTION' and self.code.codeSystem = '2.16.840.1.113883.5.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvaYAF9xEey5t-mahoHmrg" name="PurposeofReferenceObservationTemplateId" constrainedElement="_J-F8UEb7EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tva_EF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FcIewH3sEeyivuDeOiJBMg" name="PurposeofReferenceObservationTemplateId" constrainedElement="_J-F8UEb7EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FcIewX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.6.2.9')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvc0QF9xEey5t-mahoHmrg" name="PurposeofReferenceObservationClassCode" constrainedElement="_J-F8UEb7EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvc0QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FcJs4H3sEeyivuDeOiJBMg" name="PurposeofReferenceObservationClassCode" constrainedElement="_J-F8UEb7EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FcJs4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvfQgF9xEey5t-mahoHmrg" name="PurposeofReferenceObservationCode" constrainedElement="_J-F8UEb7EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvfQgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FcK7AH3sEeyivuDeOiJBMg" name="PurposeofReferenceObservationCode" constrainedElement="_J-F8UEb7EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FcK7AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvgeoF9xEey5t-mahoHmrg" name="PurposeofReferenceObservationMoodCode" constrainedElement="_J-F8UEb7EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvgeoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FcMJIH3sEeyivuDeOiJBMg" name="PurposeofReferenceObservationMoodCode" constrainedElement="_J-F8UEb7EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FcMJIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tvhswF9xEey5t-mahoHmrg" name="PurposeofReferenceObservationValue" constrainedElement="_J-F8UEb7EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tvhswV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FcNXQH3sEeyivuDeOiJBMg" name="PurposeofReferenceObservationValue" constrainedElement="_J-F8UEb7EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FcNXQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
@@ -16463,34 +16463,34 @@ value.codeSystem = '1.2.840.10008.2.16.4' and (value.code = '121079' or value.co
       <ownedComment xmi:id="_E1-4EEriEeGJpZWiuxRVIw">
         <body>A Referenced Frames Observation is used if the referenced DICOM SOP instance is a multiframe image and the reference does not apply to all frames. The list of integer values for the referenced frames of a DICOM multiframe image SOP instance is contained in a Boundary Observation nested inside this class.</body>
       </ownedComment>
-      <ownedRule xmi:id="_twEfUF9xEey5t-mahoHmrg" name="ReferencedFramesObservationTemplateId" constrainedElement="_1Zyf4Eb8EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twEfUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FcoOAH3sEeyivuDeOiJBMg" name="ReferencedFramesObservationTemplateId" constrainedElement="_1Zyf4Eb8EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FcoOAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.6.2.10')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twFtcF9xEey5t-mahoHmrg" name="ReferencedFramesObservationClassCode" constrainedElement="_1Zyf4Eb8EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twFtcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FcpcIH3sEeyivuDeOiJBMg" name="ReferencedFramesObservationClassCode" constrainedElement="_1Zyf4Eb8EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FcpcIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::ROIBND</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twHioF9xEey5t-mahoHmrg" name="ReferencedFramesObservationMoodCode" constrainedElement="_1Zyf4Eb8EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twHioV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FcqqQH3sEeyivuDeOiJBMg" name="ReferencedFramesObservationMoodCode" constrainedElement="_1Zyf4Eb8EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FcqqQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twIwwF9xEey5t-mahoHmrg" name="ReferencedFramesObservationCode" constrainedElement="_1Zyf4Eb8EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twIwwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fcr4YH3sEeyivuDeOiJBMg" name="ReferencedFramesObservationCode" constrainedElement="_1Zyf4Eb8EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fcr4YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '121190' and value.codeSystem = '1.2.840.10008.2.16.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_t3NpIF9xEey5t-mahoHmrg" name="ReferencedFramesObservationBoundaryObservation" constrainedElement="_1Zyf4Eb8EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_t3NpIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FiHK8H3sEeyivuDeOiJBMg" name="ReferencedFramesObservationBoundaryObservation" constrainedElement="_1Zyf4Eb8EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FiHK8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::BoundaryObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
@@ -16498,15 +16498,15 @@ value.code = '121190' and value.codeSystem = '1.2.840.10008.2.16.4')</body>
       <generalization xmi:id="_1Zyf4Ub8EeGp67IkyTw1fg">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_t3NpIl9xEey5t-mahoHmrg" name="getBoundaryObservation" bodyCondition="_t3NpJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_t3NpJV9xEey5t-mahoHmrg" name="body" constrainedElement="_t3NpIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_t3NpJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FiHK8n3sEeyivuDeOiJBMg" name="getBoundaryObservation" bodyCondition="_FiHK9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FiHK9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_FiHK8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FiHK9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::BoundaryObservation))->asSequence()->any(true).oclAsType(consol::BoundaryObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_t3NpI19xEey5t-mahoHmrg" type="_9Yv6gEb8EeGp67IkyTw1fg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t3NpJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_FiHK833sEeyivuDeOiJBMg" type="_9Yv6gEb8EeGp67IkyTw1fg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FiHK9H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -16514,34 +16514,34 @@ value.code = '121190' and value.codeSystem = '1.2.840.10008.2.16.4')</body>
       <ownedComment xmi:id="_xkMo4EriEeGJpZWiuxRVIw">
         <body>A Boundary Observation contains a list of integer values for the referenced frames of a DICOM multiframe image SOP instance. It identifies the frame numbers within the referenced SOP instance to which the reference applies. The CDA Boundary Observation numbers frames using the same convention as DICOM, with the first frame in the referenced object being Frame 1. A Boundary Observation must be used if a referenced DICOM SOP instance is a multiframe image and the reference does not apply to all frames.</body>
       </ownedComment>
-      <ownedRule xmi:id="_twKl8F9xEey5t-mahoHmrg" name="BoundaryObservationTemplateId" constrainedElement="_9Yv6gEb8EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twKl8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FctGgH3sEeyivuDeOiJBMg" name="BoundaryObservationTemplateId" constrainedElement="_9Yv6gEb8EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FctGgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.6.2.11')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twL0EF9xEey5t-mahoHmrg" name="BoundaryObservationClassCode" constrainedElement="_9Yv6gEb8EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twL0EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FcttkH3sEeyivuDeOiJBMg" name="BoundaryObservationClassCode" constrainedElement="_9Yv6gEb8EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FcuUoH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twNpQF9xEey5t-mahoHmrg" name="BoundaryObservationCode" constrainedElement="_9Yv6gEb8EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twNpQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fcu7sH3sEeyivuDeOiJBMg" name="BoundaryObservationCode" constrainedElement="_9Yv6gEb8EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fcu7sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '113036' and value.codeSystem = '1.2.840.10008.2.16.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twO3YF9xEey5t-mahoHmrg" name="BoundaryObservationMoodCode" constrainedElement="_9Yv6gEb8EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twO3YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FcwJ0H3sEeyivuDeOiJBMg" name="BoundaryObservationMoodCode" constrainedElement="_9Yv6gEb8EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FcwJ0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twQskF9xEey5t-mahoHmrg" name="BoundaryObservationValue" constrainedElement="_9Yv6gEb8EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twQskV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FcxX8H3sEeyivuDeOiJBMg" name="BoundaryObservationValue" constrainedElement="_9Yv6gEb8EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FcxX8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (( not self.value->isEmpty())  and self.value->forAll(element | element.oclIsTypeOf(datatypes::INT)))</body>
         </specification>
@@ -16573,56 +16573,56 @@ A Text Observation is required if the findings in the section text are represent
           <body>not self.text.reference.value.oclIsUndefined() implies not self.getSection().text.getText(self.text.reference.value.substring(2, self.text.reference.value.size())).oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twRToF9xEey5t-mahoHmrg" name="TextObservationTemplateId" constrainedElement="_9xjKIEb-EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twR6sF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fcx_AH3sEeyivuDeOiJBMg" name="TextObservationTemplateId" constrainedElement="_9xjKIEb-EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fcx_AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.6.2.12')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twTv4F9xEey5t-mahoHmrg" name="TextObservationClassCode" constrainedElement="_9xjKIEb-EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twTv4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fcz0MH3sEeyivuDeOiJBMg" name="TextObservationClassCode" constrainedElement="_9xjKIEb-EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fcz0MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twVlEF9xEey5t-mahoHmrg" name="TextObservationMoodCode" constrainedElement="_9xjKIEb-EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twVlEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fc1CUH3sEeyivuDeOiJBMg" name="TextObservationMoodCode" constrainedElement="_9xjKIEb-EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fc1CUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twWzMF9xEey5t-mahoHmrg" name="TextObservationCode" constrainedElement="_9xjKIEb-EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twWzMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fc2QcH3sEeyivuDeOiJBMg" name="TextObservationCode" constrainedElement="_9xjKIEb-EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fc2QcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twYoYF9xEey5t-mahoHmrg" name="TextObservationEffectiveTime" constrainedElement="_9xjKIEb-EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twYoYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fc3ekH3sEeyivuDeOiJBMg" name="TextObservationEffectiveTime" constrainedElement="_9xjKIEb-EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fc3ekX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twZ2gF9xEey5t-mahoHmrg" name="TextObservationText" constrainedElement="_9xjKIEb-EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twZ2gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fc4ssH3sEeyivuDeOiJBMg" name="TextObservationText" constrainedElement="_9xjKIEb-EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fc4ssX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twbrsF9xEey5t-mahoHmrg" name="TextObservationValue" constrainedElement="_9xjKIEb-EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twbrsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fc5TwH3sEeyivuDeOiJBMg" name="TextObservationValue" constrainedElement="_9xjKIEb-EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fc560H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::ED)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uVDbsF9xEey5t-mahoHmrg" name="TextObservationSOPInstanceObservation" constrainedElement="_9xjKIEb-EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uVDbsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F6GNIH3sEeyivuDeOiJBMg" name="TextObservationSOPInstanceObservation" constrainedElement="_9xjKIEb-EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F6GNIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SOPInstanceObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SPRT)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uVjyAF9xEey5t-mahoHmrg" name="TextObservationQuantityMeasurementObservation" constrainedElement="_9xjKIEb-EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uVkZEF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F6jgIH3sEeyivuDeOiJBMg" name="TextObservationQuantityMeasurementObservation" constrainedElement="_9xjKIEb-EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F6jgIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::QuantityMeasurementObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SPRT)</body>
         </specification>
@@ -16630,26 +16630,26 @@ A Text Observation is required if the findings in the section text are represent
       <generalization xmi:id="_9xjKIUb-EeGp67IkyTw1fg">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_uVDbsl9xEey5t-mahoHmrg" name="getSOPInstanceObservations" bodyCondition="_uVDbtV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uVDbtV9xEey5t-mahoHmrg" name="body" constrainedElement="_uVDbsl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uVDbtl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_F6G0MH3sEeyivuDeOiJBMg" name="getSOPInstanceObservations" bodyCondition="_F6G0M33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_F6G0M33sEeyivuDeOiJBMg" name="body" constrainedElement="_F6G0MH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_F6G0NH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SOPInstanceObservation)).oclAsType(consol::SOPInstanceObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uVDbs19xEey5t-mahoHmrg" type="_9o7WcEb6EeGp67IkyTw1fg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uVDbtF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_F6G0MX3sEeyivuDeOiJBMg" type="_9o7WcEb6EeGp67IkyTw1fg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F6G0Mn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uVkZEV9xEey5t-mahoHmrg" name="getQuantityMeasurementObservations" bodyCondition="_uVkZFF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uVkZFF9xEey5t-mahoHmrg" name="body" constrainedElement="_uVkZEV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uVkZFV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_F6jgIn3sEeyivuDeOiJBMg" name="getQuantityMeasurementObservations" bodyCondition="_F6jgJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_F6jgJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_F6jgIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_F6jgJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::QuantityMeasurementObservation)).oclAsType(consol::QuantityMeasurementObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uVkZEl9xEey5t-mahoHmrg" type="_Px2t4Eb_EeGp67IkyTw1fg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uVkZE19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_F6jgI33sEeyivuDeOiJBMg" type="_Px2t4Eb_EeGp67IkyTw1fg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F6jgJH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -16669,44 +16669,44 @@ A Text Observation is required if the findings in the section text are represent
           <body>self.code.isNullFlavorDefined() or self.code.codeSystem='1.2.840.10008.2.16.4'</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twc50F9xEey5t-mahoHmrg" name="QuantityMeasurementObservationTemplateId" constrainedElement="_Px2t4Eb_EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twdg4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fc6h4H3sEeyivuDeOiJBMg" name="QuantityMeasurementObservationTemplateId" constrainedElement="_Px2t4Eb_EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fc6h4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.6.2.14')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twf9IF9xEey5t-mahoHmrg" name="QuantityMeasurementObservationClassCode" constrainedElement="_Px2t4Eb_EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twf9IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fc7wAH3sEeyivuDeOiJBMg" name="QuantityMeasurementObservationClassCode" constrainedElement="_Px2t4Eb_EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fc7wAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twhyUF9xEey5t-mahoHmrg" name="QuantityMeasurementObservationMoodCode" constrainedElement="_Px2t4Eb_EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twhyUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fc8-IH3sEeyivuDeOiJBMg" name="QuantityMeasurementObservationMoodCode" constrainedElement="_Px2t4Eb_EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fc8-IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twjAcF9xEey5t-mahoHmrg" name="QuantityMeasurementObservationCode" constrainedElement="_Px2t4Eb_EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twjAcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fc-MQH3sEeyivuDeOiJBMg" name="QuantityMeasurementObservationCode" constrainedElement="_Px2t4Eb_EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fc-MQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twk1oF9xEey5t-mahoHmrg" name="QuantityMeasurementObservationEffectiveTime" constrainedElement="_Px2t4Eb_EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twk1oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fc_aYH3sEeyivuDeOiJBMg" name="QuantityMeasurementObservationEffectiveTime" constrainedElement="_Px2t4Eb_EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fc_aYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twmDwF9xEey5t-mahoHmrg" name="QuantityMeasurementObservationValue" constrainedElement="_Px2t4Eb_EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twmDwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FdAogH3sEeyivuDeOiJBMg" name="QuantityMeasurementObservationValue" constrainedElement="_Px2t4Eb_EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FdAogX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::PQ)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uUjscF9xEey5t-mahoHmrg" name="QuantityMeasurementObservationSOPInstanceObservation" constrainedElement="_Px2t4Eb_EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uUkTgF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F5r9cH3sEeyivuDeOiJBMg" name="QuantityMeasurementObservationSOPInstanceObservation" constrainedElement="_Px2t4Eb_EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F5r9cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SOPInstanceObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SPRT)</body>
         </specification>
@@ -16714,15 +16714,15 @@ A Text Observation is required if the findings in the section text are represent
       <generalization xmi:id="_Px2t4Ub_EeGp67IkyTw1fg">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_uUkTgV9xEey5t-mahoHmrg" name="getSOPInstanceObservations" bodyCondition="_uUkThF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uUkThF9xEey5t-mahoHmrg" name="body" constrainedElement="_uUkTgV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uUkThV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_F5r9cn3sEeyivuDeOiJBMg" name="getSOPInstanceObservations" bodyCondition="_F5r9dX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_F5r9dX3sEeyivuDeOiJBMg" name="body" constrainedElement="_F5r9cn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_F5r9dn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SOPInstanceObservation)).oclAsType(consol::SOPInstanceObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uUkTgl9xEey5t-mahoHmrg" type="_9o7WcEb6EeGp67IkyTw1fg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uUkTg19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_F5r9c33sEeyivuDeOiJBMg" type="_9o7WcEb6EeGp67IkyTw1fg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F5r9dH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -16730,50 +16730,50 @@ A Text Observation is required if the findings in the section text are represent
       <ownedComment xmi:id="_uqo_8Eb_EeGp67IkyTw1fg">
         <body>DICOM Template 2000 specifies that Imaging Report Elements of Value Type Code are contained in sections. The Imaging Report Elements are inferred from Basic Diagnostic Imaging Report Observations that consist of image references and measurements (linear, area, volume, and numeric). Coded DICOM Imaging Report Elements in this context are mapped to CDA-coded observations that are section components and are related to the SOP Instance Observations (templateId 2.16.840.1.113883.10.20.6.2.8) or Quantity Measurement Observations (templateId 2.16.840.1.113883.10.20.6.2.14) by the SPRT (Support) act relationship.</body>
       </ownedComment>
-      <ownedRule xmi:id="_twnR4F9xEey5t-mahoHmrg" name="CodeObservationsTemplateId" constrainedElement="_pmiz8Eb_EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twnR4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FdBPkH3sEeyivuDeOiJBMg" name="CodeObservationsTemplateId" constrainedElement="_pmiz8Eb_EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FdBPkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.6.2.13')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twogAF9xEey5t-mahoHmrg" name="CodeObservationsClassCode" constrainedElement="_pmiz8Eb_EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twogAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FdCdsH3sEeyivuDeOiJBMg" name="CodeObservationsClassCode" constrainedElement="_pmiz8Eb_EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FdCdsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twqVMF9xEey5t-mahoHmrg" name="CodeObservationsMoodCode" constrainedElement="_pmiz8Eb_EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twqVMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FdDr0H3sEeyivuDeOiJBMg" name="CodeObservationsMoodCode" constrainedElement="_pmiz8Eb_EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FdDr0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twsKYF9xEey5t-mahoHmrg" name="CodeObservationsCode" constrainedElement="_pmiz8Eb_EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twsKYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FdE58H3sEeyivuDeOiJBMg" name="CodeObservationsCode" constrainedElement="_pmiz8Eb_EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FdE58X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twt_kF9xEey5t-mahoHmrg" name="CodeObservationsEffectiveTime" constrainedElement="_pmiz8Eb_EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twt_kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FdGIEH3sEeyivuDeOiJBMg" name="CodeObservationsEffectiveTime" constrainedElement="_pmiz8Eb_EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FdGIEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twvNsF9xEey5t-mahoHmrg" name="CodeObservationsValue" constrainedElement="_pmiz8Eb_EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twvNsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FdHWMH3sEeyivuDeOiJBMg" name="CodeObservationsValue" constrainedElement="_pmiz8Eb_EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FdHWMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uTWLgF9xEey5t-mahoHmrg" name="CodeObservationsSOPInstanceObservation" constrainedElement="_pmiz8Eb_EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uTWLgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F4o0kH3sEeyivuDeOiJBMg" name="CodeObservationsSOPInstanceObservation" constrainedElement="_pmiz8Eb_EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F4o0kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SOPInstanceObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SPRT)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uT3I4F9xEey5t-mahoHmrg" name="CodeObservationsQuantityMeasurementObservation" constrainedElement="_pmiz8Eb_EeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uT3I4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F5ESYH3sEeyivuDeOiJBMg" name="CodeObservationsQuantityMeasurementObservation" constrainedElement="_pmiz8Eb_EeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F5ESYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::QuantityMeasurementObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SPRT)</body>
         </specification>
@@ -16781,26 +16781,26 @@ A Text Observation is required if the findings in the section text are represent
       <generalization xmi:id="_pmiz8Ub_EeGp67IkyTw1fg">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_uTWLgl9xEey5t-mahoHmrg" name="getSOPInstanceObservations" bodyCondition="_uTWLhV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uTWLhV9xEey5t-mahoHmrg" name="body" constrainedElement="_uTWLgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uTWLhl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_F4o0kn3sEeyivuDeOiJBMg" name="getSOPInstanceObservations" bodyCondition="_F4o0lX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_F4o0lX3sEeyivuDeOiJBMg" name="body" constrainedElement="_F4o0kn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_F4o0ln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SOPInstanceObservation)).oclAsType(consol::SOPInstanceObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uTWLg19xEey5t-mahoHmrg" type="_9o7WcEb6EeGp67IkyTw1fg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uTWLhF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_F4o0k33sEeyivuDeOiJBMg" type="_9o7WcEb6EeGp67IkyTw1fg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F4o0lH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uT3I4l9xEey5t-mahoHmrg" name="getQuantityMeasurementObservations" bodyCondition="_uT3I5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uT3I5V9xEey5t-mahoHmrg" name="body" constrainedElement="_uT3I4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uT3I5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_F5ESYn3sEeyivuDeOiJBMg" name="getQuantityMeasurementObservations" bodyCondition="_F5ESZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_F5ESZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_F5ESYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_F5ESZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::QuantityMeasurementObservation)).oclAsType(consol::QuantityMeasurementObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uT3I419xEey5t-mahoHmrg" type="_Px2t4Eb_EeGp67IkyTw1fg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uT3I5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_F5ESY33sEeyivuDeOiJBMg" type="_Px2t4Eb_EeGp67IkyTw1fg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F5ESZH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -16814,32 +16814,32 @@ A Text Observation is required if the findings in the section text are represent
           <body>not self.effectiveTime.oclIsUndefined() implies self.effectiveTime.value->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twwb0F9xEey5t-mahoHmrg" name="ProcedureContextTemplateId" constrainedElement="_crHC0EcAEeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twwb0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FdH9QH3sEeyivuDeOiJBMg" name="ProcedureContextTemplateId" constrainedElement="_crHC0EcAEeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FdH9QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.6.2.5')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_twyRAF9xEey5t-mahoHmrg" name="ProcedureContextClassCode" constrainedElement="_crHC0EcAEeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_twyRAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FdJLYH3sEeyivuDeOiJBMg" name="ProcedureContextClassCode" constrainedElement="_crHC0EcAEeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FdJLYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tw0GMF9xEey5t-mahoHmrg" name="ProcedureContextMoodCode" constrainedElement="_crHC0EcAEeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tw0GMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FdKZgH3sEeyivuDeOiJBMg" name="ProcedureContextMoodCode" constrainedElement="_crHC0EcAEeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FdKZgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tw17YF9xEey5t-mahoHmrg" name="ProcedureContextCode" constrainedElement="_crHC0EcAEeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tw17YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FdLnoH3sEeyivuDeOiJBMg" name="ProcedureContextCode" constrainedElement="_crHC0EcAEeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FdLnoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_tw3JgF9xEey5t-mahoHmrg" name="ProcedureContextEffectiveTime" constrainedElement="_crHC0EcAEeGp67IkyTw1fg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_tw3JgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FdM1wH3sEeyivuDeOiJBMg" name="ProcedureContextEffectiveTime" constrainedElement="_crHC0EcAEeGp67IkyTw1fg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FdM1wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
@@ -16852,40 +16852,40 @@ A Text Observation is required if the findings in the section text are represent
       <ownedComment xmi:id="_yctScOM2EeGfv4R-kzpM0g">
         <body>This template wraps relevant problems or diagnoses at the close of a visit or that need to be followed after the visit. If the encounter is associated with a Hospital Discharge, the Hospital Discharge Diagnosis must be used. This entry requires at least one Problem Observation entry.</body>
       </ownedComment>
-      <ownedRule xmi:id="_uHxNo19xEey5t-mahoHmrg" name="EncounterDiagnosisTemplateId" constrainedElement="_Ker6MOM2EeGfv4R-kzpM0g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uHxNpF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fvp3sH3sEeyivuDeOiJBMg" name="EncounterDiagnosisTemplateId" constrainedElement="_Ker6MOM2EeGfv4R-kzpM0g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fvp3sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.80')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uHybwF9xEey5t-mahoHmrg" name="EncounterDiagnosisClassCode" constrainedElement="_Ker6MOM2EeGfv4R-kzpM0g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uHybwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FvqewH3sEeyivuDeOiJBMg" name="EncounterDiagnosisClassCode" constrainedElement="_Ker6MOM2EeGfv4R-kzpM0g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FvrF0H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uHzp4F9xEey5t-mahoHmrg" name="EncounterDiagnosisMoodCode" constrainedElement="_Ker6MOM2EeGfv4R-kzpM0g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uHzp4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FvsT8H3sEeyivuDeOiJBMg" name="EncounterDiagnosisMoodCode" constrainedElement="_Ker6MOM2EeGfv4R-kzpM0g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FvsT8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uH2GIF9xEey5t-mahoHmrg" name="EncounterDiagnosisCodeP" constrainedElement="_Ker6MOM2EeGfv4R-kzpM0g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uH2GIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FvuJIH3sEeyivuDeOiJBMg" name="EncounterDiagnosisCodeP" constrainedElement="_Ker6MOM2EeGfv4R-kzpM0g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FvuJIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uH04AF9xEey5t-mahoHmrg" name="EncounterDiagnosisCode" constrainedElement="_Ker6MOM2EeGfv4R-kzpM0g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uH04AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fvs7AH3sEeyivuDeOiJBMg" name="EncounterDiagnosisCode" constrainedElement="_Ker6MOM2EeGfv4R-kzpM0g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fvs7AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '29308-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uIY4sF9xEey5t-mahoHmrg" name="EncounterDiagnosisProblemObservation" constrainedElement="_Ker6MOM2EeGfv4R-kzpM0g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uIY4sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FwIY0H3sEeyivuDeOiJBMg" name="EncounterDiagnosisProblemObservation" constrainedElement="_Ker6MOM2EeGfv4R-kzpM0g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FwIY0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
@@ -16893,15 +16893,15 @@ value.code = '29308-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_Ker6MeM2EeGfv4R-kzpM0g">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_uIY4sl9xEey5t-mahoHmrg" name="getProblemObservations" bodyCondition="_uIZfwV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uIZfwV9xEey5t-mahoHmrg" name="body" constrainedElement="_uIY4sl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uIZfwl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_FwIY0n3sEeyivuDeOiJBMg" name="getProblemObservations" bodyCondition="_FwIY1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_FwIY1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_FwIY0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_FwIY1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation)).oclAsType(consol::ProblemObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uIY4s19xEey5t-mahoHmrg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uIZfwF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_FwIY033sEeyivuDeOiJBMg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FwIY1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -16911,102 +16911,102 @@ value.code = '29308-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
 If the patient is a smoker (77176002), the effectiveTime/low element must be present. If the patient is an ex-smoker (8517006), both the effectiveTime/low and effectiveTime/high element must be present.&#xD;
 The smoking status value set includes a special code to communicate if the smoking status is unknown which is different from how Consolidated CDA generally communicates unknown information.</body>
       </ownedComment>
-      <ownedRule xmi:id="_uKr-xV9xEey5t-mahoHmrg" name="SmokingStatusObservationTemplateId" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uKr-xl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fx5TZ33sEeyivuDeOiJBMg" name="SmokingStatusObservationTemplateId" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fx56cH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.78')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uKubAF9xEey5t-mahoHmrg" name="SmokingStatusObservationClassCode" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uKubAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fx6hgH3sEeyivuDeOiJBMg" name="SmokingStatusObservationClassCode" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fx6hgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uKwQMF9xEey5t-mahoHmrg" name="SmokingStatusObservationMoodCode" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uKwQMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fx7voH3sEeyivuDeOiJBMg" name="SmokingStatusObservationMoodCode" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fx7voX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uKyscF9xEey5t-mahoHmrg" name="SmokingStatusObservationCode" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uKyscV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fx9k0H3sEeyivuDeOiJBMg" name="SmokingStatusObservationCode" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fx9k0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uKz6kF9xEey5t-mahoHmrg" name="SmokingStatusObservationStatusCode" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uKz6kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fx-L4H3sEeyivuDeOiJBMg" name="SmokingStatusObservationStatusCode" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fx-L4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uK1vwF9xEey5t-mahoHmrg" name="SmokingStatusObservationStatusCodeP" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uK1vwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fx_aAH3sEeyivuDeOiJBMg" name="SmokingStatusObservationStatusCodeP" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fx_aAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uK3k8F9xEey5t-mahoHmrg" name="SmokingStatusObservationEffectiveTime" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uK3k8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FyAoIH3sEeyivuDeOiJBMg" name="SmokingStatusObservationEffectiveTime" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FyAoIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uK4zEF9xEey5t-mahoHmrg" name="SmokingStatusObservationValue" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uK4zEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FyBPMH3sEeyivuDeOiJBMg" name="SmokingStatusObservationValue" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FyBPMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '449868002' or value.code = '428041000124106' or value.code = '8517006' or value.code = '266919005' or value.code = '77176002' or value.code = '266927001' or value.code = '428071000124103' or value.code = '428061000124105')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uLnL0F9xEey5t-mahoHmrg" name="SmokingStatusObservationValueP" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uLnL0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FyeiMH3sEeyivuDeOiJBMg" name="SmokingStatusObservationValueP" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FyeiMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6kM5IF9xEey5t-mahoHmrg" name="SmokingStatusObservationCDCodeTermAssertionOrLoinc" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6kM5IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qx-8sH3sEeyivuDeOiJBMg" name="SmokingStatusObservationCDCodeTermAssertionOrLoinc" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qx-8sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject((code = 'ASSERTION' and codeSystem = '2.16.840.1.113883.5.4') or (code = '72166-2' and codeSystem = '2.16.840.1.113883.6.1'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6kM5Il9xEey5t-mahoHmrg" name="SmokingStatusObservationCDCode" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6kM5I19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qx_jwH3sEeyivuDeOiJBMg" name="SmokingStatusObservationCDCode" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qx_jwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not code.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6kNgMF9xEey5t-mahoHmrg" name="SmokingStatusObservationCDCodeSystem" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6kNgMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Qx_jwn3sEeyivuDeOiJBMg" name="SmokingStatusObservationCDCodeSystem" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Qx_jw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not codeSystem.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6kNgMl9xEey5t-mahoHmrg" name="SmokingStatusObservationIVLTSCenter" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6kNgM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QyAK0H3sEeyivuDeOiJBMg" name="SmokingStatusObservationIVLTSCenter" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QyAK0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (center.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6kOHQF9xEey5t-mahoHmrg" name="SmokingStatusObservationIVLTSHigh" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6kOHQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QyAx4H3sEeyivuDeOiJBMg" name="SmokingStatusObservationIVLTSHigh" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QyAx4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (high.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6kOHQl9xEey5t-mahoHmrg" name="SmokingStatusObservationIVLTSLow" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6kOHQ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QyAx4n3sEeyivuDeOiJBMg" name="SmokingStatusObservationIVLTSLow" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QyAx433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (low.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6kOHRF9xEey5t-mahoHmrg" name="SmokingStatusObservationIVLTSWidth" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6kOHRV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QyBY8H3sEeyivuDeOiJBMg" name="SmokingStatusObservationIVLTSWidth" constrainedElement="_RYJj0OWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QyBY8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (width.oclIsUndefined() )))</body>
         </specification>
@@ -17025,78 +17025,78 @@ value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '449868002' or val
           <body>not self.effectiveTime.oclIsUndefined() implies not self.effectiveTime.low.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uMRTIF9xEey5t-mahoHmrg" name="TobaccoUseTemplateId" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uMR6MF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fy-Rcn3sEeyivuDeOiJBMg" name="TobaccoUseTemplateId" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fy-Rc33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.85')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uMTIUF9xEey5t-mahoHmrg" name="TobaccoUseClassCode" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uMTIUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fy_fkH3sEeyivuDeOiJBMg" name="TobaccoUseClassCode" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fy_fkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uMU9gF9xEey5t-mahoHmrg" name="TobaccoUseMoodCode" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uMU9gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FzAtsH3sEeyivuDeOiJBMg" name="TobaccoUseMoodCode" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FzBUwH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uMWLoF9xEey5t-mahoHmrg" name="TobaccoUseCode" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uMWLoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FzCi4H3sEeyivuDeOiJBMg" name="TobaccoUseCode" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FzCi4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uMXZwF9xEey5t-mahoHmrg" name="TobaccoUseStatusCode" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uMXZwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FzDJ8H3sEeyivuDeOiJBMg" name="TobaccoUseStatusCode" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FzDJ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uMZO8F9xEey5t-mahoHmrg" name="TobaccoUseStatusCodeP" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uMZO8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FzEYEH3sEeyivuDeOiJBMg" name="TobaccoUseStatusCodeP" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FzEYEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uMadEF9xEey5t-mahoHmrg" name="TobaccoUseEffectiveTime" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uMadEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FzE_IH3sEeyivuDeOiJBMg" name="TobaccoUseEffectiveTime" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FzE_IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uMbrMF9xEey5t-mahoHmrg" name="TobaccoUseValue" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uMbrMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_FzGNQH3sEeyivuDeOiJBMg" name="TobaccoUseValue" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_FzGNQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uM8okF9xEey5t-mahoHmrg" name="TobaccoUseValueP" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uM8okV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Fzf14H3sEeyivuDeOiJBMg" name="TobaccoUseValueP" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Fzf14X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6kPVYF9xEey5t-mahoHmrg" name="TobaccoUseCDCodeTermAssertionOrLoinc" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6kPVYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QyCAAH3sEeyivuDeOiJBMg" name="TobaccoUseCDCodeTermAssertionOrLoinc" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QyCAAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject((code = 'ASSERTION' and codeSystem = '2.16.840.1.113883.5.4') or (code = '11367-0' and codeSystem = '2.16.840.1.113883.6.1'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6kPVYl9xEey5t-mahoHmrg" name="TobaccoUseCDCode" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6kPVY19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QyCnEH3sEeyivuDeOiJBMg" name="TobaccoUseCDCode" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QyCnEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not code.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6kPVZF9xEey5t-mahoHmrg" name="TobaccoUseCDCodeSystem" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6kPVZV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QyCnEn3sEeyivuDeOiJBMg" name="TobaccoUseCDCodeSystem" constrainedElement="_gIH_QOWQEeGKmvzED_He2w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QyCnE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not codeSystem.oclIsUndefined() )))</body>
         </specification>
@@ -17121,118 +17121,118 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
           <body>self.interpretationCode->size() > 0 implies self.interpretationCode.translation->size() > 0</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uPDhYF9xEey5t-mahoHmrg" name="AssessmentScaleObservationTemplateId" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uPDhYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F1INkH3sEeyivuDeOiJBMg" name="AssessmentScaleObservationTemplateId" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F1INkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.69')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uPFWkF9xEey5t-mahoHmrg" name="AssessmentScaleObservationClassCode" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uPFWkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F1JbsH3sEeyivuDeOiJBMg" name="AssessmentScaleObservationClassCode" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F1JbsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uPHLwF9xEey5t-mahoHmrg" name="AssessmentScaleObservationMoodCode" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uPHLwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F1Kp0H3sEeyivuDeOiJBMg" name="AssessmentScaleObservationMoodCode" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F1Kp0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uPJA8F9xEey5t-mahoHmrg" name="AssessmentScaleObservationCode" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uPJA8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F1L38H3sEeyivuDeOiJBMg" name="AssessmentScaleObservationCode" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F1MfAH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uPKPEF9xEey5t-mahoHmrg" name="AssessmentScaleObservationDerivationExpr" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uPKPEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F1NGEH3sEeyivuDeOiJBMg" name="AssessmentScaleObservationDerivationExpr" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F1NGEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.derivationExpr.oclIsUndefined() or self.derivationExpr.isNullFlavorUndefined()) implies (not self.derivationExpr.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uPLdMF9xEey5t-mahoHmrg" name="AssessmentScaleObservationEffectiveTime" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uPLdMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F1OUMH3sEeyivuDeOiJBMg" name="AssessmentScaleObservationEffectiveTime" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F1OUMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uPNSYF9xEey5t-mahoHmrg" name="AssessmentScaleObservationId" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uPNSYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F1PiUH3sEeyivuDeOiJBMg" name="AssessmentScaleObservationId" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F1PiUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uPOggF9xEey5t-mahoHmrg" name="AssessmentScaleObservationInterpretationCode" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uPOggV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F1QwcH3sEeyivuDeOiJBMg" name="AssessmentScaleObservationInterpretationCode" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F1QwcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.interpretationCode->isEmpty() or self.interpretationCode->exists(element | element.isNullFlavorUndefined())) implies (not self.interpretationCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uPPuoF9xEey5t-mahoHmrg" name="AssessmentScaleObservationStatusCode" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uPPuoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F1R-kH3sEeyivuDeOiJBMg" name="AssessmentScaleObservationStatusCode" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F1R-kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uPQ8wF9xEey5t-mahoHmrg" name="AssessmentScaleObservationStatusCodeP" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uPQ8wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F1TMsH3sEeyivuDeOiJBMg" name="AssessmentScaleObservationStatusCodeP" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F1TMsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uPSK4F9xEey5t-mahoHmrg" name="AssessmentScaleObservationValue" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uPSK4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F1VB4H3sEeyivuDeOiJBMg" name="AssessmentScaleObservationValue" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F1VB4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uPxTEF9xEey5t-mahoHmrg" name="AssessmentScaleObservationAuthor" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uPxTEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F1xGwH3sEeyivuDeOiJBMg" name="AssessmentScaleObservationAuthor" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F1xGwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(rim::Participation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uQRCUF9xEey5t-mahoHmrg" name="AssessmentScaleObservationReferenceRange" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uQRCUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F2LWcH3sEeyivuDeOiJBMg" name="AssessmentScaleObservationReferenceRange" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F2LWcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->exists(referenceRange : cda::ReferenceRange | not referenceRange.oclIsUndefined() and referenceRange.oclIsKindOf(cda::ReferenceRange))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uRejQF9xEey5t-mahoHmrg" name="AssessmentScaleObservationAssessmentScaleSupportingObservation" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uRejQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F3NRMH3sEeyivuDeOiJBMg" name="AssessmentScaleObservationAssessmentScaleSupportingObservation" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F3N4QH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AssessmentScaleSupportingObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6lQpEF9xEey5t-mahoHmrg" name="AssessmentScaleObservationReferenceRangeObservationRangeTextReference" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6lQpEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QzMdoH3sEeyivuDeOiJBMg" name="AssessmentScaleObservationReferenceRangeObservationRangeTextReference" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QzMdoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->excluding(null).observationRange->excluding(null)->reject(not text.oclIsUndefined() implies text->forAll(reference->size() = 1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6lQpEl9xEey5t-mahoHmrg" name="AssessmentScaleObservationReferenceRangeObservationRangeTextReferenceValue" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6lQpE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QzNEsH3sEeyivuDeOiJBMg" name="AssessmentScaleObservationReferenceRangeObservationRangeTextReferenceValue" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QzNEsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->excluding(null).observationRange->excluding(null)->reject(text->forAll(reference->size() = 1) implies text->forAll(reference->one(value->size() = 1)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6lRQIF9xEey5t-mahoHmrg" name="AssessmentScaleObservationReferenceRangeObservationRangeReferenceValue" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6lRQIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QzNEsn3sEeyivuDeOiJBMg" name="AssessmentScaleObservationReferenceRangeObservationRangeReferenceValue" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QzNEs33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->excluding(null).observationRange->excluding(null)->reject(not text.reference.value.oclIsUndefined() implies not getSection().text.getText(text.reference.value.substring(2, text.reference.value.size())).oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6lRQIl9xEey5t-mahoHmrg" name="AssessmentScaleObservationReferenceRangeObservationRangeText" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6lRQI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QzNrwH3sEeyivuDeOiJBMg" name="AssessmentScaleObservationReferenceRangeObservationRangeText" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QzNrwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->excluding(null).observationRange->excluding(null)->reject((text.oclIsUndefined() or text.isNullFlavorUndefined()) implies (not text.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6lRQJF9xEey5t-mahoHmrg" name="AssessmentScaleObservationReferenceRangeObservationRange" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6lRQJV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_QzNrwn3sEeyivuDeOiJBMg" name="AssessmentScaleObservationReferenceRangeObservationRange" constrainedElement="_Zi33YOYxEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_QzNrw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->excluding(null)->reject(observationRange->one(observationRange : cda::ObservationRange | not observationRange.oclIsUndefined() and observationRange.oclIsKindOf(cda::ObservationRange)))</body>
         </specification>
@@ -17240,15 +17240,15 @@ value.code = 'completed')</body>
       <generalization xmi:id="_Zi33YeYxEeGINOJ_SD9_dA">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_uRejQl9xEey5t-mahoHmrg" name="getAssessmentScaleSupportingObservations" bodyCondition="_uRfKUl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uRfKUl9xEey5t-mahoHmrg" name="body" constrainedElement="_uRejQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uRfKU19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_F3N4QX3sEeyivuDeOiJBMg" name="getAssessmentScaleSupportingObservations" bodyCondition="_F3N4RH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_F3N4RH3sEeyivuDeOiJBMg" name="body" constrainedElement="_F3N4QX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_F3N4RX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AssessmentScaleSupportingObservation)).oclAsType(consol::AssessmentScaleSupportingObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uRfKUF9xEey5t-mahoHmrg" type="_1ZKPgOY2EeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uRfKUV9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_F3N4Qn3sEeyivuDeOiJBMg" type="_1ZKPgOY2EeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F3N4Q33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -17268,52 +17268,52 @@ value.code = 'completed')</body>
           <body>self.value.oclAsType(datatypes::CD).translation->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uQymw19xEey5t-mahoHmrg" name="AssessmentScaleSupportingObservationTemplateId" constrainedElement="_1ZKPgOY2EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uQzN0F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F2p3kX3sEeyivuDeOiJBMg" name="AssessmentScaleSupportingObservationTemplateId" constrainedElement="_1ZKPgOY2EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F2p3kn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.86')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uQ0b8F9xEey5t-mahoHmrg" name="AssessmentScaleSupportingObservationClassCode" constrainedElement="_1ZKPgOY2EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uQ1DAF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F2rFsH3sEeyivuDeOiJBMg" name="AssessmentScaleSupportingObservationClassCode" constrainedElement="_1ZKPgOY2EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F2rFsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uQ2RIF9xEey5t-mahoHmrg" name="AssessmentScaleSupportingObservationMoodCode" constrainedElement="_1ZKPgOY2EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uQ2RIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F2sT0H3sEeyivuDeOiJBMg" name="AssessmentScaleSupportingObservationMoodCode" constrainedElement="_1ZKPgOY2EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F2sT0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uQ4GUF9xEey5t-mahoHmrg" name="AssessmentScaleSupportingObservationCode" constrainedElement="_1ZKPgOY2EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uQ4GUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F2uJAH3sEeyivuDeOiJBMg" name="AssessmentScaleSupportingObservationCode" constrainedElement="_1ZKPgOY2EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F2uJAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uQ5UcF9xEey5t-mahoHmrg" name="AssessmentScaleSupportingObservationId" constrainedElement="_1ZKPgOY2EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uQ5UcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F2uwEH3sEeyivuDeOiJBMg" name="AssessmentScaleSupportingObservationId" constrainedElement="_1ZKPgOY2EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F2uwEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uQ6ikF9xEey5t-mahoHmrg" name="AssessmentScaleSupportingObservationStatusCode" constrainedElement="_1ZKPgOY2EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uQ6ikV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F2v-MH3sEeyivuDeOiJBMg" name="AssessmentScaleSupportingObservationStatusCode" constrainedElement="_1ZKPgOY2EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F2v-MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uQ7wsF9xEey5t-mahoHmrg" name="AssessmentScaleSupportingObservationStatusCodeP" constrainedElement="_1ZKPgOY2EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uQ7wsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F2wlQH3sEeyivuDeOiJBMg" name="AssessmentScaleSupportingObservationStatusCodeP" constrainedElement="_1ZKPgOY2EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F2wlQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uQ9l4F9xEey5t-mahoHmrg" name="AssessmentScaleSupportingObservationValue" constrainedElement="_1ZKPgOY2EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uQ9l4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F2xzYH3sEeyivuDeOiJBMg" name="AssessmentScaleSupportingObservationValue" constrainedElement="_1ZKPgOY2EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F2xzYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (( not self.value->isEmpty()) )</body>
         </specification>
@@ -17329,94 +17329,94 @@ value.code = 'completed')</body>
           <body>self.value->forAll(val | val.isNullFlavorDefined() or val.oclAsType(datatypes::CD).codeSystem = '2.16.840.1.113883.6.1' or val.oclAsType(datatypes::CD).codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uRfKVF9xEey5t-mahoHmrg" name="CaregiverCharacteristicsTemplateId" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uRfKVV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F3N4Rn3sEeyivuDeOiJBMg" name="CaregiverCharacteristicsTemplateId" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F3N4R33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.72')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uRg_gF9xEey5t-mahoHmrg" name="CaregiverCharacteristicsClassCode" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uRg_gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F3PtcH3sEeyivuDeOiJBMg" name="CaregiverCharacteristicsClassCode" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F3PtcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uRi0sF9xEey5t-mahoHmrg" name="CaregiverCharacteristicsMoodCode" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uRi0sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F3Q7kH3sEeyivuDeOiJBMg" name="CaregiverCharacteristicsMoodCode" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F3Q7kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uRkp4F9xEey5t-mahoHmrg" name="CaregiverCharacteristicsId" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uRkp4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F3SJsH3sEeyivuDeOiJBMg" name="CaregiverCharacteristicsId" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F3SJsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uRl4AF9xEey5t-mahoHmrg" name="CaregiverCharacteristicsCode" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uRl4AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F3TX0H3sEeyivuDeOiJBMg" name="CaregiverCharacteristicsCode" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F3TX0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uRnGIF9xEey5t-mahoHmrg" name="CaregiverCharacteristicsStatusCode" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uRnGIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F3T-4H3sEeyivuDeOiJBMg" name="CaregiverCharacteristicsStatusCode" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F3T-4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uRoUQF9xEey5t-mahoHmrg" name="CaregiverCharacteristicsStatusCodeP" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uRoUQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F3VNAH3sEeyivuDeOiJBMg" name="CaregiverCharacteristicsStatusCodeP" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F3VNAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uRqJcF9xEey5t-mahoHmrg" name="CaregiverCharacteristicsValue" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uRqJcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F3WbIH3sEeyivuDeOiJBMg" name="CaregiverCharacteristicsValue" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F3WbIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uSP_UF9xEey5t-mahoHmrg" name="CaregiverCharacteristicsParticipant" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uSP_UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F308QH3sEeyivuDeOiJBMg" name="CaregiverCharacteristicsParticipant" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F308QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6mSj0F9xEey5t-mahoHmrg" name="CaregiverCharacteristicsParticipantParticipantRoleClassCode" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6mSj0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q1dugH3sEeyivuDeOiJBMg" name="CaregiverCharacteristicsParticipantParticipantRoleClassCode" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q1dugX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null)->reject(isDefined('classCode') and classCode=vocab::RoleClassRoot::CAREGIVER)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6mTK4F9xEey5t-mahoHmrg" name="CaregiverCharacteristicsParticipantTimeLow" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6mTK4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q1eVkH3sEeyivuDeOiJBMg" name="CaregiverCharacteristicsParticipantTimeLow" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q1eVkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(not time.oclIsUndefined() implies time.low->size() = 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6mTK4l9xEey5t-mahoHmrg" name="CaregiverCharacteristicsParticipantTimeHigh" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6mTK419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q1e8oH3sEeyivuDeOiJBMg" name="CaregiverCharacteristicsParticipantTimeHigh" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q1e8oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(not time.oclIsUndefined() implies time.high->size() = 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6mTK5F9xEey5t-mahoHmrg" name="CaregiverCharacteristicsParticipantTypeCode" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6mTK5V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q1fjsH3sEeyivuDeOiJBMg" name="CaregiverCharacteristicsParticipantTypeCode" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q1fjsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(typeCode=vocab::ParticipationType::IND)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6mTx8F9xEey5t-mahoHmrg" name="CaregiverCharacteristicsParticipantTime" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6mTx8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q1gKwH3sEeyivuDeOiJBMg" name="CaregiverCharacteristicsParticipantTime" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q1gKwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject((time.oclIsUndefined() or time.isNullFlavorUndefined()) implies (not time.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6mTx8l9xEey5t-mahoHmrg" name="CaregiverCharacteristicsParticipantParticipantRole" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6mTx819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q1gx0H3sEeyivuDeOiJBMg" name="CaregiverCharacteristicsParticipantParticipantRole" constrainedElement="__pNCUOY-EeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q1gx0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(participantRole->one(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(cda::ParticipantRole)))</body>
         </specification>
@@ -17448,80 +17448,80 @@ This template indicates that the subject is not known to be on any medications.<
           <body>not self.text.reference.value.oclIsUndefined() implies not self.getSection().text.getText(self.text.reference.value.substring(2, self.text.reference.value.size())).oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uT3I519xEey5t-mahoHmrg" name="MedicationUseNoneKnownTemplateId" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uT3v8F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F5ESZ33sEeyivuDeOiJBMg" name="MedicationUseNoneKnownTemplateId" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F5ESaH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.29')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uT5lIF9xEey5t-mahoHmrg" name="MedicationUseNoneKnownClassCode" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uT5lIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F5GHkH3sEeyivuDeOiJBMg" name="MedicationUseNoneKnownClassCode" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F5GHkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uT7aUF9xEey5t-mahoHmrg" name="MedicationUseNoneKnownMoodCode" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uT7aUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F5HVsH3sEeyivuDeOiJBMg" name="MedicationUseNoneKnownMoodCode" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F5HVsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uT8ocF9xEey5t-mahoHmrg" name="MedicationUseNoneKnownId" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uT8ocV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F5Ij0H3sEeyivuDeOiJBMg" name="MedicationUseNoneKnownId" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F5Ij0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uT_EsF9xEey5t-mahoHmrg" name="MedicationUseNoneKnownCodeP" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uT_EsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F5KZAH3sEeyivuDeOiJBMg" name="MedicationUseNoneKnownCodeP" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F5KZAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uT92kF9xEey5t-mahoHmrg" name="MedicationUseNoneKnownCode" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uT92kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F5JK4H3sEeyivuDeOiJBMg" name="MedicationUseNoneKnownCode" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F5JK4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uUA54F9xEey5t-mahoHmrg" name="MedicationUseNoneKnownEffectiveTime" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uUA54V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F5LnIH3sEeyivuDeOiJBMg" name="MedicationUseNoneKnownEffectiveTime" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F5LnIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uUCIAF9xEey5t-mahoHmrg" name="MedicationUseNoneKnownStatusCode" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uUCIAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F5MOMH3sEeyivuDeOiJBMg" name="MedicationUseNoneKnownStatusCode" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F5MOMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uUDWIF9xEey5t-mahoHmrg" name="MedicationUseNoneKnownStatusCodeP" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uUDWIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F5NcUH3sEeyivuDeOiJBMg" name="MedicationUseNoneKnownStatusCodeP" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F5NcUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uUEkQF9xEey5t-mahoHmrg" name="MedicationUseNoneKnownText" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uUEkQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F5OqcH3sEeyivuDeOiJBMg" name="MedicationUseNoneKnownText" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F5OqcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uUFLUF9xEey5t-mahoHmrg" name="MedicationUseNoneKnownValue" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uUFLUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F5P4kH3sEeyivuDeOiJBMg" name="MedicationUseNoneKnownValue" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F5P4kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.code = '182904002' and value.codeSystem = '2.16.840.1.113883.6.96'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uUHAgF9xEey5t-mahoHmrg" name="MedicationUseNoneKnownValueP" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uUHAgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F5RGsH3sEeyivuDeOiJBMg" name="MedicationUseNoneKnownValueP" constrainedElement="_6kIXMOZEEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F5RtwH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
@@ -17575,140 +17575,140 @@ Reason for deprecation: Cognitive Status Problem Observation has been merged, wi
           <body>not self.effectiveTime.high.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uVlAIF9xEey5t-mahoHmrg" name="ProblemObservationTemplateId" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uVlAIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F6kHMX3sEeyivuDeOiJBMg" name="ProblemObservationTemplateId" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F6kHMn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.73')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uVm1UF9xEey5t-mahoHmrg" name="ProblemObservationClassCode" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uVm1UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F6mjcH3sEeyivuDeOiJBMg" name="ProblemObservationClassCode" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F6mjcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uVpRkF9xEey5t-mahoHmrg" name="ProblemObservationMoodCode" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uVpRkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F6oYoH3sEeyivuDeOiJBMg" name="ProblemObservationMoodCode" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F6oYoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uVrt0F9xEey5t-mahoHmrg" name="ProblemObservationNegationInd" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uVrt0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F6qN0H3sEeyivuDeOiJBMg" name="ProblemObservationNegationInd" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F6qN0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.negationInd.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uVtjAF9xEey5t-mahoHmrg" name="ProblemObservationId" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uVtjAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F6sDAH3sEeyivuDeOiJBMg" name="ProblemObservationId" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F6sDAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (not self.id->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uVwmUF9xEey5t-mahoHmrg" name="ProblemObservationCodeP" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uVwmUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F6ufQH3sEeyivuDeOiJBMg" name="ProblemObservationCodeP" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F6ufQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uVuxIF9xEey5t-mahoHmrg" name="ProblemObservationCode" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uVuxIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F6tRIH3sEeyivuDeOiJBMg" name="ProblemObservationCode" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F6tRIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '373930000' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uVybgF9xEey5t-mahoHmrg" name="ProblemObservationText" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uVybgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F6wUcH3sEeyivuDeOiJBMg" name="ProblemObservationText" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F6wUcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uVzpoF9xEey5t-mahoHmrg" name="ProblemObservationStatusCode" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uVzpoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F6xikH3sEeyivuDeOiJBMg" name="ProblemObservationStatusCode" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F6xikX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uV1e0F9xEey5t-mahoHmrg" name="ProblemObservationEffectiveTime" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uV1e0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F6ywsH3sEeyivuDeOiJBMg" name="ProblemObservationEffectiveTime" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F6ywsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uV3UAF9xEey5t-mahoHmrg" name="CognitiveStatusProblemObservationMethodCode" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uV3UAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F60l4H3sEeyivuDeOiJBMg" name="CognitiveStatusProblemObservationMethodCode" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F60l4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.methodCode->isEmpty() or self.methodCode->exists(element | element.isNullFlavorUndefined())) implies (not self.methodCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uWZfgF9xEey5t-mahoHmrg" name="ProblemObservationValueP" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uWaGkF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F7RR0H3sEeyivuDeOiJBMg" name="ProblemObservationValueP" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F7RR0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (not self.value->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uV4iIF9xEey5t-mahoHmrg" name="ProblemObservationValue" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uV4iIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F61M8H3sEeyivuDeOiJBMg" name="ProblemObservationValue" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F61M8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ud5OoF9xEey5t-mahoHmrg" name="CognitiveStatusProblemObservationNonMedicinalSupplyActivity" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ud5OoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GBxicH3sEeyivuDeOiJBMg" name="CognitiveStatusProblemObservationNonMedicinalSupplyActivity" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GBxicX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::NonMedicinalSupplyActivity) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ueazEF9xEey5t-mahoHmrg" name="CognitiveStatusProblemObservationCaregiverCharacteristics" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ueazEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GCLyIH3sEeyivuDeOiJBMg" name="CognitiveStatusProblemObservationCaregiverCharacteristics" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GCLyIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::CaregiverCharacteristics) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ue4GEF9xEey5t-mahoHmrg" name="CognitiveStatusProblemObservationAssessmentScaleObservation" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ue4GEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GCmB0H3sEeyivuDeOiJBMg" name="CognitiveStatusProblemObservationAssessmentScaleObservation" constrainedElement="_dXKPQOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GCmB0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AssessmentScaleObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_JGpG8OZcEeGINOJ_SD9_dA" general="_5Ha7ABUyEeGbmN_W114JUw"/>
-      <ownedOperation xmi:id="_ud5Ool9xEey5t-mahoHmrg" name="getNonMedicinalSupplyActivities" bodyCondition="_ud51sl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ud51sl9xEey5t-mahoHmrg" name="body" constrainedElement="_ud5Ool9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ud51s19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GBxicn3sEeyivuDeOiJBMg" name="getNonMedicinalSupplyActivities" bodyCondition="_GBxidX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GBxidX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GBxicn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GBxidn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::NonMedicinalSupplyActivity)).oclAsType(consol::NonMedicinalSupplyActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ud51sF9xEey5t-mahoHmrg" type="_2HIvMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ud51sV9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GBxic33sEeyivuDeOiJBMg" type="_2HIvMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GBxidH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_ueazEl9xEey5t-mahoHmrg" name="getCaregiverCharacteristicss" bodyCondition="_ueazFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ueazFV9xEey5t-mahoHmrg" name="body" constrainedElement="_ueazEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ueazFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GCLyIn3sEeyivuDeOiJBMg" name="getCaregiverCharacteristicss" bodyCondition="_GCLyJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GCLyJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GCLyIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GCLyJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CaregiverCharacteristics)).oclAsType(consol::CaregiverCharacteristics)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ueazE19xEey5t-mahoHmrg" type="__pNCUOY-EeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ueazFF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GCLyI33sEeyivuDeOiJBMg" type="__pNCUOY-EeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GCLyJH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_ue4GEl9xEey5t-mahoHmrg" name="getAssessmentScaleObservations" bodyCondition="_ue4GFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ue4GFV9xEey5t-mahoHmrg" name="body" constrainedElement="_ue4GEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ue4tIF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GCmo4H3sEeyivuDeOiJBMg" name="getAssessmentScaleObservations" bodyCondition="_GCmo433sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GCmo433sEeyivuDeOiJBMg" name="body" constrainedElement="_GCmo4H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GCmo5H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AssessmentScaleObservation)).oclAsType(consol::AssessmentScaleObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ue4GE19xEey5t-mahoHmrg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ue4GFF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GCmo4X3sEeyivuDeOiJBMg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GCmo4n3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -17735,168 +17735,168 @@ This is different from a cognitive status problem observation, which is a clinic
           <body>self.value->forAll(val | val.oclIsTypeOf(datatypes::CD) implies (val.isNullFlavorDefined() or val.oclAsType(datatypes::CD).codeSystem = '2.16.840.1.113883.6.96'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uW4AoV9xEey5t-mahoHmrg" name="ResultObservationTemplateId" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uW4nsF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F7rhgX3sEeyivuDeOiJBMg" name="ResultObservationTemplateId" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F7rhgn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.74')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uW6c4F9xEey5t-mahoHmrg" name="ResultObservationClassCode" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uW6c4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F7tWsH3sEeyivuDeOiJBMg" name="ResultObservationClassCode" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F7tWsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uW85IF9xEey5t-mahoHmrg" name="ResultObservationMoodCode" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uW85IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F7vL4H3sEeyivuDeOiJBMg" name="ResultObservationMoodCode" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F7vL4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uW-uUF9xEey5t-mahoHmrg" name="ResultObservationId" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uW-uUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F7waAH3sEeyivuDeOiJBMg" name="ResultObservationId" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F7waAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (not self.id->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXBxoF9xEey5t-mahoHmrg" name="ResultObservationCodeP" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXBxoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F7zdUH3sEeyivuDeOiJBMg" name="ResultObservationCodeP" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F7zdUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uW_8cF9xEey5t-mahoHmrg" name="ResultObservationCode" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uW_8cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F7xoIH3sEeyivuDeOiJBMg" name="ResultObservationCode" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F7xoIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '373930000' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXC_wF9xEey5t-mahoHmrg" name="ResultObservationText" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXC_wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F70rcH3sEeyivuDeOiJBMg" name="ResultObservationText" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F70rcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXFcAF9xEey5t-mahoHmrg" name="ResultObservationStatusCodeP" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXFcAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F73uwH3sEeyivuDeOiJBMg" name="ResultObservationStatusCodeP" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F73uwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXEN4F9xEey5t-mahoHmrg" name="ResultObservationStatusCode" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXEN4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F72goH3sEeyivuDeOiJBMg" name="ResultObservationStatusCode" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F72goX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXHRMF9xEey5t-mahoHmrg" name="ResultObservationEffectiveTime" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXHRMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F75j8H3sEeyivuDeOiJBMg" name="ResultObservationEffectiveTime" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F75j8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXIfUF9xEey5t-mahoHmrg" name="ResultObservationValue" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXIfUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F76yEH3sEeyivuDeOiJBMg" name="ResultObservationValue" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F76yEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (not self.value->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXKUgF9xEey5t-mahoHmrg" name="ResultObservationInterpretationCode" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXKUgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F78AMH3sEeyivuDeOiJBMg" name="ResultObservationInterpretationCode" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F78AMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.interpretationCode->isEmpty() or self.interpretationCode->exists(element | element.isNullFlavorUndefined())) implies (not self.interpretationCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXLioF9xEey5t-mahoHmrg" name="ResultObservationMethodCode" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXLioV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F791YH3sEeyivuDeOiJBMg" name="ResultObservationMethodCode" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F791YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.methodCode->isEmpty() or self.methodCode->exists(element | element.isNullFlavorUndefined())) implies (not self.methodCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXNX0F9xEey5t-mahoHmrg" name="ResultObservationTargetSiteCode" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXNX0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F7_DgH3sEeyivuDeOiJBMg" name="ResultObservationTargetSiteCode" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F7_DgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (not self.targetSiteCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ufkCkF9xEey5t-mahoHmrg" name="CognitiveStatusResultObservationAuthor" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ufkCkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GDARgH3sEeyivuDeOiJBMg" name="CognitiveStatusResultObservationAuthor" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GDARgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->one(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(rim::Participation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ugE_8F9xEey5t-mahoHmrg" name="CognitiveStatusResultObservationNonMedicinalSupplyActivity" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ugE_8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GDahMH3sEeyivuDeOiJBMg" name="CognitiveStatusResultObservationNonMedicinalSupplyActivity" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GDahMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::NonMedicinalSupplyActivity) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ughr4F9xEey5t-mahoHmrg" name="CognitiveStatusResultObservationCaregiverCharacteristics" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ughr4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GD1X8H3sEeyivuDeOiJBMg" name="CognitiveStatusResultObservationCaregiverCharacteristics" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GD1_AH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::CaregiverCharacteristics) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uhCCMF9xEey5t-mahoHmrg" name="CognitiveStatusResultObservationAssessmentScaleObservation" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uhCCMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GESq8H3sEeyivuDeOiJBMg" name="CognitiveStatusResultObservationAssessmentScaleObservation" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GESq8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AssessmentScaleObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uhgjUF9xEey5t-mahoHmrg" name="CognitiveStatusResultObservationReferenceRange" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uhgjUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GEvW4H3sEeyivuDeOiJBMg" name="CognitiveStatusResultObservationReferenceRange" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GEvW4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->exists(referenceRange : cda::ReferenceRange | not referenceRange.oclIsUndefined() and referenceRange.oclIsKindOf(cda::ReferenceRange))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6nUekF9xEey5t-mahoHmrg" name="CognitiveStatusResultObservationReferenceRangeObservationRangeNoCode" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6nUekV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q2zyUH3sEeyivuDeOiJBMg" name="CognitiveStatusResultObservationReferenceRangeObservationRangeNoCode" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q2zyUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->excluding(null).observationRange->excluding(null)->reject(code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6nUekl9xEey5t-mahoHmrg" name="CognitiveStatusResultObservationReferenceRangeObservationRange" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6nUek19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q20ZYH3sEeyivuDeOiJBMg" name="CognitiveStatusResultObservationReferenceRangeObservationRange" constrainedElement="_gkBM0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q20ZYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->excluding(null)->reject(observationRange->one(observationRange : cda::ObservationRange | not observationRange.oclIsUndefined() and observationRange.oclIsKindOf(cda::ObservationRange)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_gLy9QOZfEeGINOJ_SD9_dA" general="_2J1d4BSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_ugE_8l9xEey5t-mahoHmrg" name="getNonMedicinalSupplyActivities" bodyCondition="_ugE_9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ugE_9V9xEey5t-mahoHmrg" name="body" constrainedElement="_ugE_8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ugE_9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GDahMn3sEeyivuDeOiJBMg" name="getNonMedicinalSupplyActivities" bodyCondition="_GDahNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GDahNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GDahMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GDahNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::NonMedicinalSupplyActivity)).oclAsType(consol::NonMedicinalSupplyActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ugE_819xEey5t-mahoHmrg" type="_2HIvMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ugE_9F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GDahM33sEeyivuDeOiJBMg" type="_2HIvMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GDahNH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_ughr4l9xEey5t-mahoHmrg" name="getCaregiverCharacteristicss" bodyCondition="_ughr5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ughr5V9xEey5t-mahoHmrg" name="body" constrainedElement="_ughr4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ughr5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GD1_AX3sEeyivuDeOiJBMg" name="getCaregiverCharacteristicss" bodyCondition="_GD1_BH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GD1_BH3sEeyivuDeOiJBMg" name="body" constrainedElement="_GD1_AX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GD1_BX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CaregiverCharacteristics)).oclAsType(consol::CaregiverCharacteristics)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ughr419xEey5t-mahoHmrg" type="__pNCUOY-EeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ughr5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GD1_An3sEeyivuDeOiJBMg" type="__pNCUOY-EeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GD1_A33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uhCCMl9xEey5t-mahoHmrg" name="getAssessmentScaleObservations" bodyCondition="_uhCCNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uhCCNV9xEey5t-mahoHmrg" name="body" constrainedElement="_uhCCMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uhCCNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GESq8n3sEeyivuDeOiJBMg" name="getAssessmentScaleObservations" bodyCondition="_GETSAn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GETSAn3sEeyivuDeOiJBMg" name="body" constrainedElement="_GESq8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GETSA33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AssessmentScaleObservation)).oclAsType(consol::AssessmentScaleObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uhCCM19xEey5t-mahoHmrg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uhCCNF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GETSAH3sEeyivuDeOiJBMg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GETSAX3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -17911,66 +17911,66 @@ An appropriate nullFlavor can be used when the organizer/code or organizer/id is
           <body>self.code.isNullFlavorDefined() or self.code.codeSystem = '2.16.840.1.113883.6.254' or self.code.codeSystem = '2.16.840.1.113883.6.96'</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXPNAF9xEey5t-mahoHmrg" name="ResultOrganizerTemplateId" constrainedElement="_jfoCUOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXPNAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8A4sn3sEeyivuDeOiJBMg" name="ResultOrganizerTemplateId" constrainedElement="_jfoCUOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8A4s33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.75')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXQbIF9xEey5t-mahoHmrg" name="ResultOrganizerClassCode" constrainedElement="_jfoCUOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXQbIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8CG0H3sEeyivuDeOiJBMg" name="ResultOrganizerClassCode" constrainedElement="_jfoCUOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8CG0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryOrganizer::CLUSTER</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXRpQF9xEey5t-mahoHmrg" name="ResultOrganizerMoodCode" constrainedElement="_jfoCUOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXRpQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8DU8H3sEeyivuDeOiJBMg" name="ResultOrganizerMoodCode" constrainedElement="_jfoCUOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8DU8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::ActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXTecF9xEey5t-mahoHmrg" name="ResultOrganizerId" constrainedElement="_jfoCUOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXTecV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8FKIH3sEeyivuDeOiJBMg" name="ResultOrganizerId" constrainedElement="_jfoCUOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8FKIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (not self.id->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXUskF9xEey5t-mahoHmrg" name="ResultOrganizerCode" constrainedElement="_jfoCUOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXUskV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8GYQH3sEeyivuDeOiJBMg" name="ResultOrganizerCode" constrainedElement="_jfoCUOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8GYQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXXI0F9xEey5t-mahoHmrg" name="ResultOrganizerStatusCodeP" constrainedElement="_jfoCUOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXXI0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8INcH3sEeyivuDeOiJBMg" name="ResultOrganizerStatusCodeP" constrainedElement="_jfoCUOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8INcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXV6sF9xEey5t-mahoHmrg" name="ResultOrganizerStatusCode" constrainedElement="_jfoCUOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXV6sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8G_UH3sEeyivuDeOiJBMg" name="ResultOrganizerStatusCode" constrainedElement="_jfoCUOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8G_UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uifawF9xEey5t-mahoHmrg" name="ResultOrganizerResultObservation" constrainedElement="_jfoCUOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uifawV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GFiBEH3sEeyivuDeOiJBMg" name="ResultOrganizerResultObservation" constrainedElement="_jfoCUOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GFiBEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->exists(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::CognitiveStatusResultObservation))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_-QfYkOZiEeGINOJ_SD9_dA" general="_2JxzgBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_uigB0F9xEey5t-mahoHmrg" name="getConsolCognitiveStatusResultObservations" bodyCondition="_uigB019xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uigB019xEey5t-mahoHmrg" name="body" constrainedElement="_uigB0F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uigB1F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GFioIH3sEeyivuDeOiJBMg" name="getConsolCognitiveStatusResultObservations" bodyCondition="_GFioI33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GFioI33sEeyivuDeOiJBMg" name="body" constrainedElement="_GFioIH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GFioJH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CognitiveStatusResultObservation)).oclAsType(consol::CognitiveStatusResultObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uigB0V9xEey5t-mahoHmrg" type="_gkBM0OZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uigB0l9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GFioIX3sEeyivuDeOiJBMg" type="_gkBM0OZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GFioIn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -17984,80 +17984,80 @@ value.code = 'completed')</body>
           <body>not self.effectiveTime.oclIsUndefined() implies self.effectiveTime.low->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXYW8F9xEey5t-mahoHmrg" name="DeceasedObservationTemplateId" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXYW8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8JbkH3sEeyivuDeOiJBMg" name="DeceasedObservationTemplateId" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8JbkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.79')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXZlEF9xEey5t-mahoHmrg" name="DeceasedObservationClassCode" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXZlEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8KpsH3sEeyivuDeOiJBMg" name="DeceasedObservationClassCode" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8KpsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXbaQF9xEey5t-mahoHmrg" name="DeceasedObservationMoodCode" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXbaQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8L30H3sEeyivuDeOiJBMg" name="DeceasedObservationMoodCode" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8L30X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXcoYF9xEey5t-mahoHmrg" name="DeceasedObservationId" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXcoYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8NF8H3sEeyivuDeOiJBMg" name="DeceasedObservationId" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8NF8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXfEoF9xEey5t-mahoHmrg" name="DeceasedObservationCodeP" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXfEoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8O7IH3sEeyivuDeOiJBMg" name="DeceasedObservationCodeP" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8O7IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXd2gF9xEey5t-mahoHmrg" name="DeceasedObservationCode" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXd2gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8NtAH3sEeyivuDeOiJBMg" name="DeceasedObservationCode" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8NtAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXfrsF9xEey5t-mahoHmrg" name="DeceasedObservationStatusCode" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXfrsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8QJQH3sEeyivuDeOiJBMg" name="DeceasedObservationStatusCode" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8QJQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXg50F9xEey5t-mahoHmrg" name="DeceasedObservationStatusCodeP" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXg50V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8QwUH3sEeyivuDeOiJBMg" name="DeceasedObservationStatusCodeP" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8QwUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXiH8F9xEey5t-mahoHmrg" name="DeceasedObservationEffectiveTime" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXiH8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8R-cH3sEeyivuDeOiJBMg" name="DeceasedObservationEffectiveTime" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8R-cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXjWEF9xEey5t-mahoHmrg" name="DeceasedObservationValue" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXjWEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8TMkH3sEeyivuDeOiJBMg" name="DeceasedObservationValue" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8TMkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.code = '419099009' and value.codeSystem = '2.16.840.1.113883.6.96'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXkkMF9xEey5t-mahoHmrg" name="DeceasedObservationValueP" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXkkMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8UasH3sEeyivuDeOiJBMg" name="DeceasedObservationValueP" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8UasX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ui974F9xEey5t-mahoHmrg" name="DeceasedObservationProblemObservation" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ui974V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GF8QwH3sEeyivuDeOiJBMg" name="DeceasedObservationProblemObservation" constrainedElement="_lm3boOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GF8QwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::CAUS)</body>
         </specification>
@@ -18065,15 +18065,15 @@ value.code = '419099009' and value.codeSystem = '2.16.840.1.113883.6.96'))</body
       <generalization xmi:id="_lm3boeZbEeGINOJ_SD9_dA">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_ui974l9xEey5t-mahoHmrg" name="getProblemObservation" bodyCondition="_ui975V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ui975V9xEey5t-mahoHmrg" name="body" constrainedElement="_ui974l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ui975l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GF830H3sEeyivuDeOiJBMg" name="getProblemObservation" bodyCondition="_GF83033sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GF83033sEeyivuDeOiJBMg" name="body" constrainedElement="_GF830H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GF831H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation))->asSequence()->any(true).oclAsType(consol::ProblemObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ui97419xEey5t-mahoHmrg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ui975F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_GF830X3sEeyivuDeOiJBMg" type="_5Ha7ABUyEeGbmN_W114JUw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GF830n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -18134,140 +18134,140 @@ Reason for deprecation: Functional Status Problem Observation has been merged, w
           <body>self.value->forAll(val | not val.isNullFlavorUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXlyUV9xEey5t-mahoHmrg" name="ProblemObservationTemplateId" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXlyUl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8VBwX3sEeyivuDeOiJBMg" name="ProblemObservationTemplateId" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8VBwn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.68')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXoOkF9xEey5t-mahoHmrg" name="ProblemObservationClassCode" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXoOkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8XeAH3sEeyivuDeOiJBMg" name="ProblemObservationClassCode" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8XeAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXqDwF9xEey5t-mahoHmrg" name="ProblemObservationMoodCode" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXqDwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8ZTMH3sEeyivuDeOiJBMg" name="ProblemObservationMoodCode" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8ZTMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXr48F9xEey5t-mahoHmrg" name="ProblemObservationNegationInd" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXr48V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8bvcH3sEeyivuDeOiJBMg" name="ProblemObservationNegationInd" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8bvcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.negationInd.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXtuIF9xEey5t-mahoHmrg" name="ProblemObservationId" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXtuIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8c9kH3sEeyivuDeOiJBMg" name="ProblemObservationId" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8c9kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (not self.id->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXwKYF9xEey5t-mahoHmrg" name="ProblemObservationCodeP" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXwKYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8gA4H3sEeyivuDeOiJBMg" name="ProblemObservationCodeP" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8gA4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXu8QF9xEey5t-mahoHmrg" name="ProblemObservationCode" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXu8QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8eLsH3sEeyivuDeOiJBMg" name="ProblemObservationCode" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8eLsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '248536006' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXxYgF9xEey5t-mahoHmrg" name="ProblemObservationText" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXxYgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8hPAH3sEeyivuDeOiJBMg" name="ProblemObservationText" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8hPAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uXymoF9xEey5t-mahoHmrg" name="ProblemObservationStatusCode" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uXymoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8idIH3sEeyivuDeOiJBMg" name="ProblemObservationStatusCode" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8idIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uX0b0F9xEey5t-mahoHmrg" name="ProblemObservationEffectiveTime" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uX0b0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8jrQH3sEeyivuDeOiJBMg" name="ProblemObservationEffectiveTime" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8jrQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uYUyIF9xEey5t-mahoHmrg" name="ProblemObservationValueP" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uYUyIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8_wIH3sEeyivuDeOiJBMg" name="ProblemObservationValueP" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8_wIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (not self.value->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uX1p8F9xEey5t-mahoHmrg" name="ProblemObservationValue" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uX1p8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F8k5YH3sEeyivuDeOiJBMg" name="ProblemObservationValue" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F8k5YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uY0hYF9xEey5t-mahoHmrg" name="FunctionalStatusProblemObservationMethodCode" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uY0hYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9am4H3sEeyivuDeOiJBMg" name="FunctionalStatusProblemObservationMethodCode" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9am4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.methodCode->isEmpty() or self.methodCode->exists(element | element.isNullFlavorUndefined())) implies (( not self.methodCode->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ujdEEF9xEey5t-mahoHmrg" name="FunctionalStatusProblemObservationNonMedicinalSupplyActivity" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ujdEEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GGXHgH3sEeyivuDeOiJBMg" name="FunctionalStatusProblemObservationNonMedicinalSupplyActivity" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GGXHgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::NonMedicinalSupplyActivity) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uj-BcF9xEey5t-mahoHmrg" name="FunctionalStatusProblemObservationCaregiverCharacteristics" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uj-BcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GGwwIH3sEeyivuDeOiJBMg" name="FunctionalStatusProblemObservationCaregiverCharacteristics" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GGwwIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::CaregiverCharacteristics) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ukcikF9xEey5t-mahoHmrg" name="FunctionalStatusProblemObservationAssessmentScaleObservation" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ukcikV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GHKYwH3sEeyivuDeOiJBMg" name="FunctionalStatusProblemObservationAssessmentScaleObservation" constrainedElement="_rVl5AOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GHKYwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AssessmentScaleObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_whRx8ObjEeGINOJ_SD9_dA" general="_5Ha7ABUyEeGbmN_W114JUw"/>
-      <ownedOperation xmi:id="_ujdEEl9xEey5t-mahoHmrg" name="getNonMedicinalSupplyActivities" bodyCondition="_ujdEFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ujdEFV9xEey5t-mahoHmrg" name="body" constrainedElement="_ujdEEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ujdEFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GGXHgn3sEeyivuDeOiJBMg" name="getNonMedicinalSupplyActivities" bodyCondition="_GGXHhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GGXHhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GGXHgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GGXHhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::NonMedicinalSupplyActivity)).oclAsType(consol::NonMedicinalSupplyActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ujdEE19xEey5t-mahoHmrg" type="_2HIvMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ujdEFF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GGXHg33sEeyivuDeOiJBMg" type="_2HIvMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GGXHhH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_uj-ogF9xEey5t-mahoHmrg" name="getCaregiverCharacteristicss" bodyCondition="_uj-og19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_uj-og19xEey5t-mahoHmrg" name="body" constrainedElement="_uj-ogF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_uj-ohF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GGwwIn3sEeyivuDeOiJBMg" name="getCaregiverCharacteristicss" bodyCondition="_GGwwJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GGwwJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GGwwIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GGwwJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CaregiverCharacteristics)).oclAsType(consol::CaregiverCharacteristics)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_uj-ogV9xEey5t-mahoHmrg" type="__pNCUOY-EeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uj-ogl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GGwwI33sEeyivuDeOiJBMg" type="__pNCUOY-EeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GGwwJH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_ukcikl9xEey5t-mahoHmrg" name="getAssessmentScaleObservations" bodyCondition="_ukdJol9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ukdJol9xEey5t-mahoHmrg" name="body" constrainedElement="_ukcikl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ukdJo19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GHKYwn3sEeyivuDeOiJBMg" name="getAssessmentScaleObservations" bodyCondition="_GHKYxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GHKYxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GHKYwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GHKYxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AssessmentScaleObservation)).oclAsType(consol::AssessmentScaleObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ukdJoF9xEey5t-mahoHmrg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ukdJoV9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GHKYw33sEeyivuDeOiJBMg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GHKYxH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -18293,168 +18293,168 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
           <body>self.value->forAll(val | val.oclIsTypeOf(datatypes::CD) implies (val.isNullFlavorDefined() or val.oclAsType(datatypes::CD).codeSystem = '2.16.840.1.113883.6.96'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uY2WkV9xEey5t-mahoHmrg" name="ResultObservationTemplateId" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uY2Wkl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9b1AX3sEeyivuDeOiJBMg" name="ResultObservationTemplateId" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9b1An3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.67')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uY4y0F9xEey5t-mahoHmrg" name="ResultObservationClassCode" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uY4y0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9dqMH3sEeyivuDeOiJBMg" name="ResultObservationClassCode" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9dqMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uY6oAF9xEey5t-mahoHmrg" name="ResultObservationMoodCode" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uY6oAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9ffYH3sEeyivuDeOiJBMg" name="ResultObservationMoodCode" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9ffYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uY9EQF9xEey5t-mahoHmrg" name="ResultObservationId" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uY9EQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9gtgH3sEeyivuDeOiJBMg" name="ResultObservationId" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9gtgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (not self.id->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZAHkF9xEey5t-mahoHmrg" name="ResultObservationCodeP" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZAHkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9jJwH3sEeyivuDeOiJBMg" name="ResultObservationCodeP" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9jJwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uY-SYF9xEey5t-mahoHmrg" name="ResultObservationCode" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uY-SYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9h7oH3sEeyivuDeOiJBMg" name="ResultObservationCode" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9h7oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZBVsF9xEey5t-mahoHmrg" name="ResultObservationText" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZBVsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9kX4H3sEeyivuDeOiJBMg" name="ResultObservationText" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9kX4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZEZAF9xEey5t-mahoHmrg" name="ResultObservationStatusCodeP" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZEZAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9m0IH3sEeyivuDeOiJBMg" name="ResultObservationStatusCodeP" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9m0IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZCj0F9xEey5t-mahoHmrg" name="ResultObservationStatusCode" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZDK4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9lmAH3sEeyivuDeOiJBMg" name="ResultObservationStatusCode" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9lmAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZGOMF9xEey5t-mahoHmrg" name="ResultObservationEffectiveTime" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZGOMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9opUH3sEeyivuDeOiJBMg" name="ResultObservationEffectiveTime" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9opUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZIDYF9xEey5t-mahoHmrg" name="ResultObservationValue" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZIDYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9p3cH3sEeyivuDeOiJBMg" name="ResultObservationValue" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9p3cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (not self.value->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZJRgF9xEey5t-mahoHmrg" name="ResultObservationInterpretationCode" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZJRgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9rFkH3sEeyivuDeOiJBMg" name="ResultObservationInterpretationCode" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9rFkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.interpretationCode->isEmpty() or self.interpretationCode->exists(element | element.isNullFlavorUndefined())) implies (not self.interpretationCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZLGsF9xEey5t-mahoHmrg" name="ResultObservationMethodCode" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZLGsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9sTsH3sEeyivuDeOiJBMg" name="ResultObservationMethodCode" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9sTsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.methodCode->isEmpty() or self.methodCode->exists(element | element.isNullFlavorUndefined())) implies (not self.methodCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZM74F9xEey5t-mahoHmrg" name="ResultObservationTargetSiteCode" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZM74V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9uI4H3sEeyivuDeOiJBMg" name="ResultObservationTargetSiteCode" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9uI4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (not self.targetSiteCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uk-HAF9xEey5t-mahoHmrg" name="FunctionalStatusResultObservationAuthor" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uk-HAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GHkocH3sEeyivuDeOiJBMg" name="FunctionalStatusResultObservationAuthor" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GHkocX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->one(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(rim::Participation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ulay8F9xEey5t-mahoHmrg" name="FunctionalStatusResultObservationNonMedicinalSupplyActivity" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ulay8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GIAtUH3sEeyivuDeOiJBMg" name="FunctionalStatusResultObservationNonMedicinalSupplyActivity" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GIAtUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::NonMedicinalSupplyActivity) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ul57IF9xEey5t-mahoHmrg" name="FunctionalStatusResultObservationCaregiverCharacteristics" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ul57IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GIcyMH3sEeyivuDeOiJBMg" name="FunctionalStatusResultObservationCaregiverCharacteristics" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GIcyMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::CaregiverCharacteristics) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_umWnEF9xEey5t-mahoHmrg" name="FunctionalStatusResultObservationAssessmentScaleObservation" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_umWnEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GI3B4H3sEeyivuDeOiJBMg" name="FunctionalStatusResultObservationAssessmentScaleObservation" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GI3B4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AssessmentScaleObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_um1vQF9xEey5t-mahoHmrg" name="FunctionalStatusResultObservationReferenceRange" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_um2WUF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GJRRkH3sEeyivuDeOiJBMg" name="FunctionalStatusResultObservationReferenceRange" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GJRRkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->exists(referenceRange : cda::ReferenceRange | not referenceRange.oclIsUndefined() and referenceRange.oclIsKindOf(cda::ReferenceRange))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6oWZUF9xEey5t-mahoHmrg" name="FunctionalStatusResultObservationReferenceRangeObservationRangeNoCode" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6oWZUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q4JPEH3sEeyivuDeOiJBMg" name="FunctionalStatusResultObservationReferenceRangeObservationRangeNoCode" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q4JPEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->excluding(null).observationRange->excluding(null)->reject(code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6oWZUl9xEey5t-mahoHmrg" name="FunctionalStatusResultObservationReferenceRangeObservationRange" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6oWZU19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q4JPEn3sEeyivuDeOiJBMg" name="FunctionalStatusResultObservationReferenceRangeObservationRange" constrainedElement="_viRU0OZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q4JPE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->excluding(null)->reject(observationRange->one(observationRange : cda::ObservationRange | not observationRange.oclIsUndefined() and observationRange.oclIsKindOf(cda::ObservationRange)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_dM_VcObxEeGINOJ_SD9_dA" general="_2J1d4BSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_ulay8l9xEey5t-mahoHmrg" name="getNonMedicinalSupplyActivity" bodyCondition="_ulay9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ulay9V9xEey5t-mahoHmrg" name="body" constrainedElement="_ulay8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ulay9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GIAtUn3sEeyivuDeOiJBMg" name="getNonMedicinalSupplyActivity" bodyCondition="_GIAtVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GIAtVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GIAtUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GIAtVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::NonMedicinalSupplyActivity))->asSequence()->any(true).oclAsType(consol::NonMedicinalSupplyActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ulay819xEey5t-mahoHmrg" type="_2HIvMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ulay9F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_GIAtU33sEeyivuDeOiJBMg" type="_2HIvMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GIAtVH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_ul6iMF9xEey5t-mahoHmrg" name="getCaregiverCharacteristics" bodyCondition="_ul6iM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ul6iM19xEey5t-mahoHmrg" name="body" constrainedElement="_ul6iMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ul6iNF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GIcyMn3sEeyivuDeOiJBMg" name="getCaregiverCharacteristics" bodyCondition="_GIcyNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GIcyNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GIcyMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GIcyNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CaregiverCharacteristics))->asSequence()->any(true).oclAsType(consol::CaregiverCharacteristics)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ul6iMV9xEey5t-mahoHmrg" type="__pNCUOY-EeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ul6iMl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_GIcyM33sEeyivuDeOiJBMg" type="__pNCUOY-EeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GIcyNH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_umXOIF9xEey5t-mahoHmrg" name="getAssessmentScaleObservation" bodyCondition="_umXOI19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_umXOI19xEey5t-mahoHmrg" name="body" constrainedElement="_umXOIF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_umXOJF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GI3B4n3sEeyivuDeOiJBMg" name="getAssessmentScaleObservation" bodyCondition="_GI3B5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GI3B5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_GI3B4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GI3B5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AssessmentScaleObservation))->asSequence()->any(true).oclAsType(consol::AssessmentScaleObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_umXOIV9xEey5t-mahoHmrg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_umXOIl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_GI3B433sEeyivuDeOiJBMg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GI3B5H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -18469,66 +18469,66 @@ An appropriate nullFlavor can be used when the organizer/code or organizer/id is
           <body>self.code.isNullFlavorDefined() or self.code.codeSystem = '2.16.840.1.113883.6.254' or self.code.codeSystem = '2.16.840.1.113883.6.96'</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZOxEV9xEey5t-mahoHmrg" name="ResultOrganizerTemplateId" constrainedElement="_zBlUUOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZOxEl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9v-EX3sEeyivuDeOiJBMg" name="ResultOrganizerTemplateId" constrainedElement="_zBlUUOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9v-En3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.66')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZP_MF9xEey5t-mahoHmrg" name="ResultOrganizerClassCode" constrainedElement="_zBlUUOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZP_MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9xzQH3sEeyivuDeOiJBMg" name="ResultOrganizerClassCode" constrainedElement="_zBlUUOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9xzQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryOrganizer::CLUSTER</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZR0YF9xEey5t-mahoHmrg" name="ResultOrganizerMoodCode" constrainedElement="_zBlUUOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZR0YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9zocH3sEeyivuDeOiJBMg" name="ResultOrganizerMoodCode" constrainedElement="_zBlUUOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9zocX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::ActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZTCgF9xEey5t-mahoHmrg" name="ResultOrganizerId" constrainedElement="_zBlUUOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZTCgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F902kH3sEeyivuDeOiJBMg" name="ResultOrganizerId" constrainedElement="_zBlUUOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F902kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (not self.id->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZUQoF9xEey5t-mahoHmrg" name="ResultOrganizerCode" constrainedElement="_zBlUUOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZUQoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F92rwH3sEeyivuDeOiJBMg" name="ResultOrganizerCode" constrainedElement="_zBlUUOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F92rwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZWs4F9xEey5t-mahoHmrg" name="ResultOrganizerStatusCodeP" constrainedElement="_zBlUUOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZWs4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F95vEH3sEeyivuDeOiJBMg" name="ResultOrganizerStatusCodeP" constrainedElement="_zBlUUOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F95vEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZVewF9xEey5t-mahoHmrg" name="ResultOrganizerStatusCode" constrainedElement="_zBlUUOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZVewV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9354H3sEeyivuDeOiJBMg" name="ResultOrganizerStatusCode" constrainedElement="_zBlUUOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9354X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_un3qAF9xEey5t-mahoHmrg" name="FunctionalStatusResultOrganizerFunctionalStatusResultObservation" constrainedElement="_zBlUUOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_un3qAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GKEi0H3sEeyivuDeOiJBMg" name="FunctionalStatusResultOrganizerFunctionalStatusResultObservation" constrainedElement="_zBlUUOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GKEi0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->exists(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::FunctionalStatusResultObservation))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_8KA8YObzEeGINOJ_SD9_dA" general="_2JxzgBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_un3qAl9xEey5t-mahoHmrg" name="getFunctionalStatusResultObservations" bodyCondition="_un3qBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_un3qBV9xEey5t-mahoHmrg" name="body" constrainedElement="_un3qAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_un3qBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GKEi0n3sEeyivuDeOiJBMg" name="getFunctionalStatusResultObservations" bodyCondition="_GKEi1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GKEi1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_GKEi0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GKEi1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::FunctionalStatusResultObservation)).oclAsType(consol::FunctionalStatusResultObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_un3qA19xEey5t-mahoHmrg" type="_viRU0OZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_un3qBF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GKEi033sEeyivuDeOiJBMg" type="_viRU0OZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GKEi1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -18536,46 +18536,46 @@ value.code = 'completed')</body>
       <ownedComment xmi:id="_lI9UMOb2EeGINOJ_SD9_dA">
         <body>This observation contains a description of the wound tissue of the most severe or highest staged pressure ulcer observed on a patient.</body>
       </ownedComment>
-      <ownedRule xmi:id="_uZX7AF9xEey5t-mahoHmrg" name="HighestPressureUlcerStageTemplateId" constrainedElement="_4YgVsOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZX7AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F969MH3sEeyivuDeOiJBMg" name="HighestPressureUlcerStageTemplateId" constrainedElement="_4YgVsOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F969MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.77')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZZJIF9xEey5t-mahoHmrg" name="HighestPressureUlcerStageClassCode" constrainedElement="_4YgVsOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZZJIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F98LUH3sEeyivuDeOiJBMg" name="HighestPressureUlcerStageClassCode" constrainedElement="_4YgVsOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F98LUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZaXQF9xEey5t-mahoHmrg" name="HighestPressureUlcerStageMoodCode" constrainedElement="_4YgVsOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZaXQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F99ZcH3sEeyivuDeOiJBMg" name="HighestPressureUlcerStageMoodCode" constrainedElement="_4YgVsOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F99ZcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZcMcF9xEey5t-mahoHmrg" name="HighestPressureUlcerStageId" constrainedElement="_4YgVsOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZcMcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9-nkH3sEeyivuDeOiJBMg" name="HighestPressureUlcerStageId" constrainedElement="_4YgVsOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9-nkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZeBoF9xEey5t-mahoHmrg" name="HighestPressureUlcerStageCodeP" constrainedElement="_4YgVsOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZeBoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F-BD0H3sEeyivuDeOiJBMg" name="HighestPressureUlcerStageCodeP" constrainedElement="_4YgVsOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F-BD0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZczgF9xEey5t-mahoHmrg" name="HighestPressureUlcerStageCode" constrainedElement="_4YgVsOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZczgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F9_1sH3sEeyivuDeOiJBMg" name="HighestPressureUlcerStageCode" constrainedElement="_4YgVsOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F9_1sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '420905001' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZfPwF9xEey5t-mahoHmrg" name="HighestPressureUlcerStageValue" constrainedElement="_4YgVsOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZfPwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F-CR8H3sEeyivuDeOiJBMg" name="HighestPressureUlcerStageValue" constrainedElement="_4YgVsOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F-CR8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1)</body>
         </specification>
@@ -18588,116 +18588,116 @@ value.code = '420905001' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
       <ownedComment xmi:id="_z95uMOcBEeGINOJ_SD9_dA">
         <body>This clinical statement enumerates the number of pressure ulcers observed in a particular stage.</body>
       </ownedComment>
-      <ownedRule xmi:id="_uZf20F9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationTemplateId" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZf20V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F-C5AH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationTemplateId" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F-DgEH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.76')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZhE8F9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationClassCode" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZhE8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F-EHIH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationClassCode" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F-EHIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZi6IF9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationMoodCode" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZi6IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F-F8UH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationMoodCode" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F-F8UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZkIQF9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationId" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZkIQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F-HxgH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationId" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F-HxgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZl9cF9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationCodeP" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZl9cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F-JmsH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationCodeP" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F-JmsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZkvUF9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationCode" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZkvUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F-IYkH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationCode" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F-IYkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '2264892003' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZnLkF9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationStatusCode" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZnLkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F-KNwH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationStatusCode" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F-KNwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZoZsF9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationStatusCodeP" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZoZsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F-Lb4H3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationStatusCodeP" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F-Lb4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZpn0F9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationEffectiveTime" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZpn0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F-MqAH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationEffectiveTime" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F-MqAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uZq18F9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationValue" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uZq18V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F-OfMH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationValue" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F-OfMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::INT)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uoUV8F9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationAuthor" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uoUV8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GKeygH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationAuthor" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GKeygX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->one(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(rim::Participation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uoxo8F9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationEntryRelationship" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uoxo8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GK6QUH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationEntryRelationship" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GK6QUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->select(entryRelationship : cda::EntryRelationship | not entryRelationship.oclIsUndefined() and entryRelationship.oclIsKindOf(cda::EntryRelationship))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6pXF8F9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationEntryRelationshipObservationClassCode" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6pXF8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q5pq8H3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationEntryRelationshipObservationClassCode" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q5pq8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject(classCode=vocab::ActClassObservation::OBS)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6pXtAF9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationEntryRelationshipObservationMoodCode" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6pXtAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q5qSAH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationEntryRelationshipObservationMoodCode" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q5qSAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject(moodCode=vocab::x_ActMoodDocumentObservation::EVN)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6pXtAl9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationEntryRelationshipObservationValue" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6pXtA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q5qSAn3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationEntryRelationshipObservationValue" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q5qSA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject((value->isEmpty() or value->exists(element | element.isNullFlavorUndefined())) implies (value->size() = 1 and value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '421076008' or value.code = '420324007' or value.code = '421927004' or value.code = '420597008' or value.code = '421594008'))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6pYUEF9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationEntryRelationshipObservationValueP" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6pYUEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q5q5EH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationEntryRelationshipObservationValueP" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q5q5EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject((value->isEmpty() or value->exists(element | element.isNullFlavorUndefined())) implies (value->size() =  1 and value->forAll(element | element.oclIsTypeOf(datatypes::CD))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6pYUEl9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationEntryRelationshipTypeCode" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6pYUE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q5q5En3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationEntryRelationshipTypeCode" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q5q5E33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->reject(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6pYUFF9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationEntryRelationshipObservation" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6pYUFV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q5rgIH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationEntryRelationshipObservation" constrainedElement="_7c4ssOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q5rgIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->reject(observation->one(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(cda::Observation)))</body>
         </specification>
@@ -18764,244 +18764,244 @@ value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '421076008' or val
           <body>self.targetSiteCode.qualifier->forAll((value.isNullFlavorDefined()) or (value->size() = 1 and not value.code.oclIsUndefined() and value.codeSystem = '2.16.840.1.113883.6.96'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uavM8F9xEey5t-mahoHmrg" name="PressureUlcerObservationTemplateId" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uavM8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F_KTUH3sEeyivuDeOiJBMg" name="PressureUlcerObservationTemplateId" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F_KTUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.70')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uayQQF9xEey5t-mahoHmrg" name="PressureUlcerObservationClassCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uayQQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F_NWoH3sEeyivuDeOiJBMg" name="PressureUlcerObservationClassCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F_NWoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ua0FcF9xEey5t-mahoHmrg" name="PressureUlcerObservationMoodCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ua0FcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F_OkwH3sEeyivuDeOiJBMg" name="PressureUlcerObservationMoodCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F_OkwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ua1TkF9xEey5t-mahoHmrg" name="PressureUlcerObservationNegationInd" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ua1TkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F_Py4H3sEeyivuDeOiJBMg" name="PressureUlcerObservationNegationInd" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F_Py4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.negationInd.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ua3IwF9xEey5t-mahoHmrg" name="PressureUlcerObservationId" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ua3IwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F_RBAH3sEeyivuDeOiJBMg" name="PressureUlcerObservationId" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F_RBAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ua498F9xEey5t-mahoHmrg" name="PressureUlcerObservationCodeP" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ua498V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F_S2MH3sEeyivuDeOiJBMg" name="PressureUlcerObservationCodeP" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F_S2MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ua3v0F9xEey5t-mahoHmrg" name="PressureUlcerObservationCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ua3v0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F_RoEH3sEeyivuDeOiJBMg" name="PressureUlcerObservationCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F_SPIH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ua7aMF9xEey5t-mahoHmrg" name="PressureUlcerObservationText" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ua7aMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F_UEUH3sEeyivuDeOiJBMg" name="PressureUlcerObservationText" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F_UEUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ua8oUF9xEey5t-mahoHmrg" name="PressureUlcerObservationStatusCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ua8oUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F_UrYH3sEeyivuDeOiJBMg" name="PressureUlcerObservationStatusCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F_UrYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ua-dgF9xEey5t-mahoHmrg" name="PressureUlcerObservationEffectiveTime" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ua-dgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F_WgkH3sEeyivuDeOiJBMg" name="PressureUlcerObservationEffectiveTime" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F_WgkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ua_roF9xEey5t-mahoHmrg" name="PressureUlcerObservationValue" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ua_roV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F_XHoH3sEeyivuDeOiJBMg" name="PressureUlcerObservationValue" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F_XHoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '421076008' or value.code = '420324007' or value.code = '421927004' or value.code = '420597008' or value.code = '421594008')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ubgB8F9xEey5t-mahoHmrg" name="PressureUlcerObservationValueP" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ubgB8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_F_wJMH3sEeyivuDeOiJBMg" name="PressureUlcerObservationValueP" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_F_wJMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ucgHgF9xEey5t-mahoHmrg" name="PressureUlcerObservationTargetSiteCodeP" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ucgHgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GAo6AH3sEeyivuDeOiJBMg" name="PressureUlcerObservationTargetSiteCodeP" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GAo6AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (not self.targetSiteCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ucA_UF9xEey5t-mahoHmrg" name="PressureUlcerObservationTargetSiteCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ucA_UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GAM1IH3sEeyivuDeOiJBMg" name="PressureUlcerObservationTargetSiteCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GAM1IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (self.targetSiteCode->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '79951008' or value.code = '23747009' or value.code = '76552005' or value.code = '45980000' or value.code = '74757004' or value.code = '51027004' or value.code = '304037003' or value.code = '286591006' or value.code = '49812005' or value.code = '29850006' or value.code = '22180002')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_upurMF9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_upurMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GLxzAH3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GLxzAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->select(entryRelationship : cda::EntryRelationship | not entryRelationship.oclIsUndefined() and entryRelationship.oclIsKindOf(cda::EntryRelationship))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401238003')->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uqOacF9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship2" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uqOacV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GMNQ0H3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship2" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GMNQ0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->select(entryRelationship : cda::EntryRelationship | not entryRelationship.oclIsUndefined() and entryRelationship.oclIsKindOf(cda::EntryRelationship))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401239006')->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_uqrtcF9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship3" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uqrtcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GMm5cH3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship3" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GMm5cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->select(entryRelationship : cda::EntryRelationship | not entryRelationship.oclIsUndefined() and entryRelationship.oclIsKindOf(cda::EntryRelationship))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='425094009')->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6qZnwF9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship1Observation1ClassCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6qZnwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q7HDgH3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship1Observation1ClassCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q7HDgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401238003').observation->excluding(null)->reject(classCode=vocab::ActClassObservation::OBS)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6qZnwl9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship1Observation1MoodCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6qZnw19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q7HDgn3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship1Observation1MoodCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q7HDg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401238003').observation->excluding(null)->reject(moodCode=vocab::x_ActMoodDocumentObservation::EVN)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6qaO0F9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship1Observation1CodeP" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6qaO0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q7HqkH3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship1Observation1CodeP" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q7HqkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401238003').observation->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6qaO0l9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship1Observation1Code" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6qaO019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q7Hqkn3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship1Observation1Code" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q7Hqk33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401238003').observation->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = code.oclAsType(datatypes::CD) in 
 value.code = '401238003' and value.codeSystem = '2.16.840.1.113883.6.96'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6qaO1F9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship1Observation1Value" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6qaO1V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q7HqlH3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship1Observation1Value" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q7HqlX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401238003').observation->excluding(null)->reject((value->isEmpty() or value->exists(element | element.isNullFlavorUndefined())) implies (value->size() =  1 and value->forAll(element | element.oclIsTypeOf(datatypes::PQ))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6qa14F9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship1TypeCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6qa14V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q7IRoH3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship1TypeCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q7IRoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401238003')->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401238003')->reject(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6qa14l9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship1Observation1" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6qa1419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q7IRon3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship1Observation1" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q7IRo33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401238003')->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401238003')->reject(observation->one(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(cda::Observation)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6rjeUF9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship2Observation2ClassCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6rjeUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q8F68H3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship2Observation2ClassCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q8F68X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401239006').observation->excluding(null)->reject(classCode=vocab::ActClassObservation::OBS)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6rjeUl9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship2Observation2MoodCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6rjeU19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q8GiAH3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship2Observation2MoodCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q8GiAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401239006').observation->excluding(null)->reject(moodCode=vocab::x_ActMoodDocumentObservation::EVN)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6rkFYF9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship2Observation2CodeP" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6rkFYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q8GiAn3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship2Observation2CodeP" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q8GiA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401239006').observation->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6rkFYl9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship2Observation2Code" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6rkFY19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q8HJEH3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship2Observation2Code" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q8HJEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401239006').observation->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = code.oclAsType(datatypes::CD) in 
 value.code = '401239006' and value.codeSystem = '2.16.840.1.113883.6.96'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6rkFZF9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship2Observation2Value" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6rkFZV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q8HJEn3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship2Observation2Value" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q8HJE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401239006').observation->excluding(null)->reject((value->isEmpty() or value->exists(element | element.isNullFlavorUndefined())) implies (value->size() =  1 and value->forAll(element | element.oclIsTypeOf(datatypes::PQ))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6rkscF9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship2TypeCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6rkscV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q8HJFH3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship2TypeCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q8HJFX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401239006')->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401239006')->reject(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6rkscl9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship2Observation2" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6rksc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q8HwIH3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship2Observation2" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q8HwIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401239006')->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='401239006')->reject(observation->one(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(cda::Observation)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6smAIF9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship3Observation3ClassCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6smAIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q9EyYH3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship3Observation3ClassCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q9EyYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='425094009').observation->excluding(null)->reject(classCode=vocab::ActClassObservation::OBS)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6smAIl9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship3Observation3MoodCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6smAI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q9EyYn3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship3Observation3MoodCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q9EyY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='425094009').observation->excluding(null)->reject(moodCode=vocab::x_ActMoodDocumentObservation::EVN)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6smAJF9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship3Observation3CodeP" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6smAJV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q9FZcH3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship3Observation3CodeP" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q9FZcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='425094009').observation->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6smnMF9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship3Observation3Code" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6smnMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q9FZcn3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship3Observation3Code" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q9FZc33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='425094009').observation->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = code.oclAsType(datatypes::CD) in 
 value.code = '425094009' and value.codeSystem = '2.16.840.1.113883.6.96'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6smnMl9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship3Observation3Value" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6smnM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q9FZdH3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship3Observation3Value" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q9FZdX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='425094009').observation->excluding(null)->reject((value->isEmpty() or value->exists(element | element.isNullFlavorUndefined())) implies (value->size() =  1 and value->forAll(element | element.oclIsTypeOf(datatypes::PQ))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6snOQF9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship3TypeCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6snOQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q9GAgH3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship3TypeCode" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q9GAgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='425094009')->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='425094009')->reject(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6snOQl9xEey5t-mahoHmrg" name="PressureUlcerObservationEntryRelationship3Observation3" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6snOQ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q9GAgn3sEeyivuDeOiJBMg" name="PressureUlcerObservationEntryRelationship3Observation3" constrainedElement="_9rQowOZbEeGINOJ_SD9_dA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q9GAg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='425094009')->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP and observation.code.code='425094009')->reject(observation->one(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(cda::Observation)))</body>
         </specification>
@@ -19014,22 +19014,22 @@ value.code = '425094009' and value.codeSystem = '2.16.840.1.113883.6.96'))</body
       <ownedComment xmi:id="_ZaFIIPKwEeGFUPBL8qS7yQ">
         <body>For reports on mothers and their fetus(es), information on a mother is mapped to recordTarget, PatientRole, and Patient. Information on the fetus is mapped to subject, relatedSubject, and SubjectPerson at the CDA section level. Both context information on the mother and fetus must be included in the document if observations on fetus(es) are contained in the document.</body>
       </ownedComment>
-      <ownedRule xmi:id="_u6z0J19xEey5t-mahoHmrg" name="FetusSubjectContextTemplateId" constrainedElement="_TkyvwPKwEeGFUPBL8qS7yQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_u6z0KF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GaDflX3sEeyivuDeOiJBMg" name="FetusSubjectContextTemplateId" constrainedElement="_TkyvwPKwEeGFUPBL8qS7yQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GaDfln3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.6.2.3')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_u61CQF9xEey5t-mahoHmrg" name="FetusSubjectContextCode" constrainedElement="_TkyvwPKwEeGFUPBL8qS7yQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_u61CQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GaEGoH3sEeyivuDeOiJBMg" name="FetusSubjectContextCode" constrainedElement="_TkyvwPKwEeGFUPBL8qS7yQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GaEGoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '121026' and value.codeSystem = '1.2.840.10008.2.16.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_u7UKcF9xEey5t-mahoHmrg" name="FetusSubjectContextSubject" constrainedElement="_TkyvwPKwEeGFUPBL8qS7yQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_u7UKcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GafkcH3sEeyivuDeOiJBMg" name="FetusSubjectContextSubject" constrainedElement="_TkyvwPKwEeGFUPBL8qS7yQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GafkcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.subject->one(subject : cda::SubjectPerson | not subject.oclIsUndefined() and subject.oclIsKindOf(cda::SubjectPerson))</body>
         </specification>
@@ -19039,14 +19039,14 @@ value.code = '121026' and value.codeSystem = '1.2.840.10008.2.16.4')</body>
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_XIE-YPKyEeGFUPBL8qS7yQ" name="ObserverContext">
-      <ownedRule xmi:id="_u7UKcl9xEey5t-mahoHmrg" name="ObserverContextTemplateId" constrainedElement="_XIE-YPKyEeGFUPBL8qS7yQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_u7UKc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gafkcn3sEeyivuDeOiJBMg" name="ObserverContextTemplateId" constrainedElement="_XIE-YPKyEeGFUPBL8qS7yQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gafkc33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.6.2.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_u71H0F9xEey5t-mahoHmrg" name="ObserverContextAssignedAuthor" constrainedElement="_XIE-YPKyEeGFUPBL8qS7yQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_u71H0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ga_TsH3sEeyivuDeOiJBMg" name="ObserverContextAssignedAuthor" constrainedElement="_XIE-YPKyEeGFUPBL8qS7yQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ga_TsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->one(assignedAuthor : cda::AssignedAuthor | not assignedAuthor.oclIsUndefined() and assignedAuthor.oclIsKindOf(cda::AssignedAuthor))</body>
         </specification>
@@ -19064,66 +19064,66 @@ This template represents the act of referencing another entry in the same CDA do
 The id is required and must be the same id as the entry/id it is referencing. The id cannot be a null value. Act/Code is set to nullFlavor=&quot;NP&quot; (Not Present). This means the value is not present in the message (in act/Code).&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_vDZIYF9xEey5t-mahoHmrg" name="EntryReferenceTemplateId" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vDZIYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GhNQcn3sEeyivuDeOiJBMg" name="EntryReferenceTemplateId" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GhNQc33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.122')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vDaWgF9xEey5t-mahoHmrg" name="EntryReferenceClassCode" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vDaWgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GhOekH3sEeyivuDeOiJBMg" name="EntryReferenceClassCode" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GhOekX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vDcLsF9xEey5t-mahoHmrg" name="EntryReferenceMoodCode" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vDcLsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GhQTwH3sEeyivuDeOiJBMg" name="EntryReferenceMoodCode" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GhQTwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vDdZ0F9xEey5t-mahoHmrg" name="EntryReferenceId" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vDdZ0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GhQ60H3sEeyivuDeOiJBMg" name="EntryReferenceId" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GhQ60X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vDfPAF9xEey5t-mahoHmrg" name="EntryReferenceCode" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vDfPAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GhSI8H3sEeyivuDeOiJBMg" name="EntryReferenceCode" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GhSI8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vDf2EF9xEey5t-mahoHmrg" name="EntryReferenceStatusCode" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vDf2EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GhTXEH3sEeyivuDeOiJBMg" name="EntryReferenceStatusCode" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GhTXEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 not value.codeSystem.oclIsUndefined() or not value.codeSystemName.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vDhrQF9xEey5t-mahoHmrg" name="EntryReferenceStatusCodeP" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vDhrQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GhUlMH3sEeyivuDeOiJBMg" name="EntryReferenceStatusCodeP" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GhUlMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6socYF9xEey5t-mahoHmrg" name="EntryReferenceIINullFlavor" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6socYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q9HOoH3sEeyivuDeOiJBMg" name="EntryReferenceIINullFlavor" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q9HOoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.id->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (nullFlavor.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6spDcF9xEey5t-mahoHmrg" name="EntryReferenceCDNullFlavor" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6spDcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q9H1sH3sEeyivuDeOiJBMg" name="EntryReferenceCDNullFlavor" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q9H1sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not nullFlavor.oclIsUndefined() and nullFlavor.oclIsKindOf(vocab::NullFlavor) and 
 let value : vocab::NullFlavor = nullFlavor.oclAsType(vocab::NullFlavor) in 
 value = vocab::NullFlavor::NP )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6spqgF9xEey5t-mahoHmrg" name="EntryReferenceCDNullFlavorP" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6spqgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q9IcwH3sEeyivuDeOiJBMg" name="EntryReferenceCDNullFlavorP" constrainedElement="_u_keoIkOEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q9IcwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (isDefined('nullFlavor') )))</body>
         </specification>
@@ -19136,66 +19136,66 @@ value = vocab::NullFlavor::NP )))</body>
       <ownedComment xmi:id="_eflRwIlIEeOJGtGyq_dBbA">
         <body>This clinical statement groups a set of advance directive observations.</body>
       </ownedComment>
-      <ownedRule xmi:id="_vDlVoV9xEey5t-mahoHmrg" name="AdvanceDirectiveOrganizerTemplateId" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vDlVol9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GhXogX3sEeyivuDeOiJBMg" name="AdvanceDirectiveOrganizerTemplateId" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GhXogn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.108' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vDmjwF9xEey5t-mahoHmrg" name="AdvanceDirectiveOrganizerClassCode" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vDmjwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GhY2oH3sEeyivuDeOiJBMg" name="AdvanceDirectiveOrganizerClassCode" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GhY2oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryOrganizer::CLUSTER</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vDoY8F9xEey5t-mahoHmrg" name="AdvanceDirectiveOrganizerMoodCode" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vDoY8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ghar0H3sEeyivuDeOiJBMg" name="AdvanceDirectiveOrganizerMoodCode" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ghar0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::ActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vDpnEF9xEey5t-mahoHmrg" name="AdvanceDirectiveOrganizerId" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vDpnEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ghb58H3sEeyivuDeOiJBMg" name="AdvanceDirectiveOrganizerId" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ghb58X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vDq1MF9xEey5t-mahoHmrg" name="AdvanceDirectiveOrganizerCode" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vDq1MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GhchAH3sEeyivuDeOiJBMg" name="AdvanceDirectiveOrganizerCode" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GhchAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '45473-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vDsDUF9xEey5t-mahoHmrg" name="AdvanceDirectiveOrganizerCodeP" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vDsDUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GhdvIH3sEeyivuDeOiJBMg" name="AdvanceDirectiveOrganizerCodeP" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GhdvIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vDufkF9xEey5t-mahoHmrg" name="AdvanceDirectiveOrganizerStatusCodeP" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vDufkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GhfkUH3sEeyivuDeOiJBMg" name="AdvanceDirectiveOrganizerStatusCodeP" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GhfkUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vDtRcF9xEey5t-mahoHmrg" name="AdvanceDirectiveOrganizerStatusCode" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vDtRcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ghe9QH3sEeyivuDeOiJBMg" name="AdvanceDirectiveOrganizerStatusCode" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ghe9QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vEVjkF9xEey5t-mahoHmrg" name="AdvanceDirectiveOrganizerAdvanceDirectiveObservation2" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vEVjkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gh7CIH3sEeyivuDeOiJBMg" name="AdvanceDirectiveOrganizerAdvanceDirectiveObservation2" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gh7CIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->exists(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::AdvanceDirectiveObservation2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4OcisF9xEey5t-mahoHmrg" name="AdvanceDirectiveOrganizerAuthorParticipation" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4OcisV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Oi1kkH3sEeyivuDeOiJBMg" name="AdvanceDirectiveOrganizerAuthorParticipation" constrainedElement="_Z8VQYIlFEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Oi1kkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
@@ -19203,15 +19203,15 @@ value.code = 'completed')</body>
       <generalization xmi:id="_Z8VQYYlFEeOJGtGyq_dBbA">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_B6aX4EbvEd6besF9iFIJkQ"/>
       </generalization>
-      <ownedOperation xmi:id="_vEVjkl9xEey5t-mahoHmrg" name="getAdvanceDirectiveObservation2s" bodyCondition="_vEWKoF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vEWKoF9xEey5t-mahoHmrg" name="body" constrainedElement="_vEVjkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vEWKoV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Gh7CIn3sEeyivuDeOiJBMg" name="getAdvanceDirectiveObservation2s" bodyCondition="_Gh7CJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Gh7CJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Gh7CIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gh7CJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AdvanceDirectiveObservation2)).oclAsType(consol::AdvanceDirectiveObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vEVjk19xEey5t-mahoHmrg" type="_GnllUK-9EeO8duI_7f6kZw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vEVjlF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Gh7CI33sEeyivuDeOiJBMg" type="_GnllUK-9EeO8duI_7f6kZw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Gh7CJH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -19219,68 +19219,68 @@ value.code = 'completed')</body>
       <ownedComment xmi:id="_opipQInVEeOJGtGyq_dBbA">
         <body>This template represents the patient's home environment including, but not limited to, type of residence (trailer, single family home, assisted living), living arrangement (e.g., alone, with parents), and housing status (e.g., evicted, homeless, home owner).</body>
       </ownedComment>
-      <ownedRule xmi:id="_vEWKol9xEey5t-mahoHmrg" name="CharacteristicsOfHomeEnvironmentTemplateId" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vEWKo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gh7pMH3sEeyivuDeOiJBMg" name="CharacteristicsOfHomeEnvironmentTemplateId" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gh7pMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.109')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vEYm4F9xEey5t-mahoHmrg" name="CharacteristicsOfHomeEnvironmentClassCode" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vEYm4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gh8QQH3sEeyivuDeOiJBMg" name="CharacteristicsOfHomeEnvironmentClassCode" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gh8QQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vEbDIF9xEey5t-mahoHmrg" name="CharacteristicsOfHomeEnvironmentMoodCode" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vEbDIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gh-FcH3sEeyivuDeOiJBMg" name="CharacteristicsOfHomeEnvironmentMoodCode" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gh-FcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vEdfYF9xEey5t-mahoHmrg" name="CharacteristicsOfHomeEnvironmentId" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vEdfYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gh_TkH3sEeyivuDeOiJBMg" name="CharacteristicsOfHomeEnvironmentId" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gh_TkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vEgisF9xEey5t-mahoHmrg" name="CharacteristicsOfHomeEnvironmentCodeP" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vEhJwF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GiBIwH3sEeyivuDeOiJBMg" name="CharacteristicsOfHomeEnvironmentCodeP" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GiBIwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vEetgF9xEey5t-mahoHmrg" name="CharacteristicsOfHomeEnvironmentCode" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vEetgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gh_6oH3sEeyivuDeOiJBMg" name="CharacteristicsOfHomeEnvironmentCode" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gh_6oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '75274-1' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vEiX4F9xEey5t-mahoHmrg" name="CharacteristicsOfHomeEnvironmentStatusCode" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vEiX4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GiCW4H3sEeyivuDeOiJBMg" name="CharacteristicsOfHomeEnvironmentStatusCode" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GiCW4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vEk0IF9xEey5t-mahoHmrg" name="CharacteristicsOfHomeEnvironmentStatusCodeP" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vEk0IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GiDlAH3sEeyivuDeOiJBMg" name="CharacteristicsOfHomeEnvironmentStatusCodeP" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GiDlAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vEmCQF9xEey5t-mahoHmrg" name="CharacteristicsOfHomeEnvironmentValue" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vEmCQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GiEMEH3sEeyivuDeOiJBMg" name="CharacteristicsOfHomeEnvironmentValue" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GiEMEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vFJb4F9xEey5t-mahoHmrg" name="CharacteristicsOfHomeEnvironmentValueP" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vFJb4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GifC0H3sEeyivuDeOiJBMg" name="CharacteristicsOfHomeEnvironmentValueP" constrainedElement="_O-O-IInUEeOJGtGyq_dBbA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GifC0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
@@ -19296,92 +19296,92 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
       <ownedComment xmi:id="_bOntkPm-EeSGHoih4Jm09A">
         <body>REMOVED</body>
       </ownedComment>
-      <ownedRule xmi:id="_vF1_cF9xEey5t-mahoHmrg" name="CognitiveAbilitiesObservationTemplateId" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vF1_cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gi9j8H3sEeyivuDeOiJBMg" name="CognitiveAbilitiesObservationTemplateId" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gi9j8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.126')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vF30oF9xEey5t-mahoHmrg" name="CognitiveAbilitiesObservationClassCode" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vF30oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gi-yEH3sEeyivuDeOiJBMg" name="CognitiveAbilitiesObservationClassCode" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gi-yEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vF638F9xEey5t-mahoHmrg" name="CognitiveAbilitiesObservationMoodCode" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vF638V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GjAAMH3sEeyivuDeOiJBMg" name="CognitiveAbilitiesObservationMoodCode" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GjAAMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vF8tIF9xEey5t-mahoHmrg" name="CognitiveAbilitiesObservationId" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vF8tIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GjBOUH3sEeyivuDeOiJBMg" name="CognitiveAbilitiesObservationId" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GjBOUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vGv-YF9xEey5t-mahoHmrg" name="CognitiveAbilitiesObservationCodeP" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vGv-YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GjdTMH3sEeyivuDeOiJBMg" name="CognitiveAbilitiesObservationCodeP" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GjdTMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vF97QF9xEey5t-mahoHmrg" name="CognitiveAbilitiesObservationCode" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vF97QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GjB1YH3sEeyivuDeOiJBMg" name="CognitiveAbilitiesObservationCode" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GjB1YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '61254005' or value.code = '395659009' or value.code = '286574007' or value.code = '307082005' or value.code = '304641000' or value.code = '363878000' or value.code = '418907009' or value.code = '304645009' or value.code = '311465003'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vHb64F9xEey5t-mahoHmrg" name="CognitiveAbilitiesObservationText" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vHb64V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gj3i4H3sEeyivuDeOiJBMg" name="CognitiveAbilitiesObservationText" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gj3i4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vHdwEF9xEey5t-mahoHmrg" name="CognitiveAbilitiesObservationStatusCode" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vHdwEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gj4J8H3sEeyivuDeOiJBMg" name="CognitiveAbilitiesObservationStatusCode" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gj4J8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vHflQF9xEey5t-mahoHmrg" name="CognitiveAbilitiesObservationStatusCodeP" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vHflQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gj5YEH3sEeyivuDeOiJBMg" name="CognitiveAbilitiesObservationStatusCodeP" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gj5YEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vHhacF9xEey5t-mahoHmrg" name="CognitiveAbilitiesObservationEffectiveTime" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vHhacV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gj6mMH3sEeyivuDeOiJBMg" name="CognitiveAbilitiesObservationEffectiveTime" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gj6mMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vHjPoF9xEey5t-mahoHmrg" name="CognitiveAbilitiesObservationValue" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vHjPoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gj70UH3sEeyivuDeOiJBMg" name="CognitiveAbilitiesObservationValue" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gj70UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vIK6sF9xEey5t-mahoHmrg" name="CognitiveAbilitiesObservationValueP" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vIK6sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GkU14H3sEeyivuDeOiJBMg" name="CognitiveAbilitiesObservationValueP" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GkU14X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vJV_YF9xEey5t-mahoHmrg" name="CognitiveAbilitiesObservationAssessmentScaleObservation" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vJWmcF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GlIHIH3sEeyivuDeOiJBMg" name="CognitiveAbilitiesObservationAssessmentScaleObservation" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlIuMH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AssessmentScaleObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xA7MEF9xEey5t-mahoHmrg" name="CognitiveAbilitiesObservationAuthorParticipation" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xA7MEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IPeJEH3sEeyivuDeOiJBMg" name="CognitiveAbilitiesObservationAuthorParticipation" constrainedElement="_Y_oGkIoAEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IPeJEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
@@ -19389,15 +19389,15 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
       <generalization xmi:id="_Y_otoIoAEeOoMZgUoTghIg">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_vJWmcV9xEey5t-mahoHmrg" name="getAssessmentScaleObservations" bodyCondition="_vJWmdF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vJWmdF9xEey5t-mahoHmrg" name="body" constrainedElement="_vJWmcV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vJWmdV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GlIuMX3sEeyivuDeOiJBMg" name="getAssessmentScaleObservations" bodyCondition="_GlIuNH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GlIuNH3sEeyivuDeOiJBMg" name="body" constrainedElement="_GlIuMX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlIuNX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AssessmentScaleObservation)).oclAsType(consol::AssessmentScaleObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vJWmcl9xEey5t-mahoHmrg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vJWmc19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GlIuMn3sEeyivuDeOiJBMg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GlIuM33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -19411,60 +19411,60 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
           <body>self.value->forAll(val | val.oclIsTypeOf(datatypes::CD) implies (val.isNullFlavorDefined() or val.oclAsType(datatypes::CD).codeSystem = '2.16.840.1.113883.6.96'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vJXNgF9xEey5t-mahoHmrg" name="CulturalAndReligiousObservationTemplateId" constrainedElement="_H2EzIIqZEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vJXNgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GlIuNn3sEeyivuDeOiJBMg" name="CulturalAndReligiousObservationTemplateId" constrainedElement="_H2EzIIqZEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlIuN33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.111')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vJZpwF9xEey5t-mahoHmrg" name="CulturalAndReligiousObservationClassCode" constrainedElement="_H2EzIIqZEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vJZpwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GlKjYH3sEeyivuDeOiJBMg" name="CulturalAndReligiousObservationClassCode" constrainedElement="_H2EzIIqZEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlKjYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vJcGAF9xEey5t-mahoHmrg" name="CulturalAndReligiousObservationMoodCode" constrainedElement="_H2EzIIqZEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vJcGAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GlLxgH3sEeyivuDeOiJBMg" name="CulturalAndReligiousObservationMoodCode" constrainedElement="_H2EzIIqZEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlLxgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vJd7MF9xEey5t-mahoHmrg" name="CulturalAndReligiousObservationId" constrainedElement="_H2EzIIqZEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vJd7MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GlM_oH3sEeyivuDeOiJBMg" name="CulturalAndReligiousObservationId" constrainedElement="_H2EzIIqZEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlM_oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vJhlkF9xEey5t-mahoHmrg" name="CulturalAndReligiousObservationCodeP" constrainedElement="_H2EzIIqZEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vJhlkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GlO00H3sEeyivuDeOiJBMg" name="CulturalAndReligiousObservationCodeP" constrainedElement="_H2EzIIqZEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlO00X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vJfwYF9xEey5t-mahoHmrg" name="CulturalAndReligiousObservationCode" constrainedElement="_H2EzIIqZEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vJfwYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GlNmsH3sEeyivuDeOiJBMg" name="CulturalAndReligiousObservationCode" constrainedElement="_H2EzIIqZEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlNmsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '75281-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vJjawF9xEey5t-mahoHmrg" name="CulturalAndReligiousObservationStatusCode" constrainedElement="_H2EzIIqZEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vJjawV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GlPb4H3sEeyivuDeOiJBMg" name="CulturalAndReligiousObservationStatusCode" constrainedElement="_H2EzIIqZEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlPb4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vJlP8F9xEey5t-mahoHmrg" name="CulturalAndReligiousObservationStatusCodeP" constrainedElement="_H2EzIIqZEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vJlP8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GlQqAH3sEeyivuDeOiJBMg" name="CulturalAndReligiousObservationStatusCodeP" constrainedElement="_H2EzIIqZEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlQqAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vJnFIF9xEey5t-mahoHmrg" name="CulturalAndReligiousObservationValue" constrainedElement="_H2EzIIqZEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vJnFIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GlR4IH3sEeyivuDeOiJBMg" name="CulturalAndReligiousObservationValue" constrainedElement="_H2EzIIqZEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlR4IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1)</body>
         </specification>
@@ -19482,114 +19482,114 @@ This template represents the act of monitoring the patient's medication and incl
 For example, a cardiologist may prescribe a patient Warfarin. The patient's primary care provider may monitor the patient's INR and adjust the dosing of the Warfarin based on these lab results. Here the person designated to monitor the drug is the primary care provider.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_vJoTQF9xEey5t-mahoHmrg" name="DrugMonitoringActTemplateId" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vJoTQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GlTGQH3sEeyivuDeOiJBMg" name="DrugMonitoringActTemplateId" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlTGQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.123')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vJqIcF9xEey5t-mahoHmrg" name="DrugMonitoringActClassCode" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vJqIcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GlUUYH3sEeyivuDeOiJBMg" name="DrugMonitoringActClassCode" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlUUYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vJr9oF9xEey5t-mahoHmrg" name="DrugMonitoringActMoodCode" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vJr9oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GlVigH3sEeyivuDeOiJBMg" name="DrugMonitoringActMoodCode" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlVigX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::INT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vJtLwF9xEey5t-mahoHmrg" name="DrugMonitoringActId" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vJtLwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GlWwoH3sEeyivuDeOiJBMg" name="DrugMonitoringActId" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlWwoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vJwPEF9xEey5t-mahoHmrg" name="DrugMonitoringActCodeP" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vJwPEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GlYl0H3sEeyivuDeOiJBMg" name="DrugMonitoringActCodeP" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlYl0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vJuZ4F9xEey5t-mahoHmrg" name="DrugMonitoringActCode" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vJuZ4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GlXXsH3sEeyivuDeOiJBMg" name="DrugMonitoringActCode" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlXXsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '395170001' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vJxdMF9xEey5t-mahoHmrg" name="DrugMonitoringActStatusCode" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vJxdMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GlZM4H3sEeyivuDeOiJBMg" name="DrugMonitoringActStatusCode" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlZM4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'normal' or value.code = 'aborted' or value.code = 'active' or value.code = 'cancelled' or value.code = 'completed' or value.code = 'held' or value.code = 'new' or value.code = 'suspended' or value.code = 'nullified' or value.code = 'obsolete')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vKWE8F9xEey5t-mahoHmrg" name="DrugMonitoringActStatusCodeP" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vKWE8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GlzckH3sEeyivuDeOiJBMg" name="DrugMonitoringActStatusCodeP" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GlzckX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vK4QcF9xEey5t-mahoHmrg" name="DrugMonitoringActEffectiveTime" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vK4QcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GmQIgH3sEeyivuDeOiJBMg" name="DrugMonitoringActEffectiveTime" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GmQIgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vLk0AF9xEey5t-mahoHmrg" name="DrugMonitoringActParticipant" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vLk0AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gmxs8H3sEeyivuDeOiJBMg" name="DrugMonitoringActParticipant" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gmxs8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6uKtcF9xEey5t-mahoHmrg" name="DrugMonitoringActParticipantParticipantRolePlayingEntityGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6uKtcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q-lOQH3sEeyivuDeOiJBMg" name="DrugMonitoringActParticipantParticipantRolePlayingEntityGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q-lOQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject((getText(true)&lt;>'' and ( family->isEmpty() and given->isEmpty() and suffix->isEmpty() and prefix->isEmpty()   )   ) xor (getText(true)='' and (not family->isEmpty() and not given->isEmpty()  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6uLUgF9xEey5t-mahoHmrg" name="DrugMonitoringActParticipantParticipantRolePlayingEntityClassCode" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6uLUgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q-lOQn3sEeyivuDeOiJBMg" name="DrugMonitoringActParticipantParticipantRolePlayingEntityClassCode" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q-lOQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(isDefined('classCode') and classCode=vocab::EntityClassRoot::PSN)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6uLUgl9xEey5t-mahoHmrg" name="DrugMonitoringActParticipantParticipantRolePlayingEntityName" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6uLUg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q-l1UH3sEeyivuDeOiJBMg" name="DrugMonitoringActParticipantParticipantRolePlayingEntityName" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q-l1UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (name->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6uLUhF9xEey5t-mahoHmrg" name="DrugMonitoringActParticipantParticipantRoleClassCode" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6uLUhV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q-l1Un3sEeyivuDeOiJBMg" name="DrugMonitoringActParticipantParticipantRoleClassCode" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q-l1U33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null)->reject(isDefined('classCode') and classCode=vocab::RoleClassRoot::ASSIGNED)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6uL7kF9xEey5t-mahoHmrg" name="DrugMonitoringActParticipantParticipantRoleId" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6uL7kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q-l1VH3sEeyivuDeOiJBMg" name="DrugMonitoringActParticipantParticipantRoleId" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q-l1VX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6uL7kl9xEey5t-mahoHmrg" name="DrugMonitoringActParticipantParticipantRolePlayingEntity" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6uL7k19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q-mcYH3sEeyivuDeOiJBMg" name="DrugMonitoringActParticipantParticipantRolePlayingEntity" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q-mcYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null)->reject(playingEntity->one(playingEntity : cda::PlayingEntity | not playingEntity.oclIsUndefined() and playingEntity.oclIsKindOf(cda::PlayingEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6uL7lF9xEey5t-mahoHmrg" name="DrugMonitoringActParticipantTypeCode" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6uL7lV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q-mcYn3sEeyivuDeOiJBMg" name="DrugMonitoringActParticipantTypeCode" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q-mcY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(typeCode=vocab::ParticipationType::RESP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6uMioF9xEey5t-mahoHmrg" name="DrugMonitoringActParticipantParticipantRole" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6uMioV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Q-mcZH3sEeyivuDeOiJBMg" name="DrugMonitoringActParticipantParticipantRole" constrainedElement="_MbKs8IqvEeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q-mcZX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(participantRole->one(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(cda::ParticipantRole)))</body>
         </specification>
@@ -19602,116 +19602,116 @@ value.code = 'normal' or value.code = 'aborted' or value.code = 'active' or valu
       <ownedComment xmi:id="_VONaQIz8EeOoMZgUoTghIg">
         <body>This template represents the sender (author) and receivers (participants) of a handoff communication in a plan of treatment. It does not convey details about the communication. The &quot;handoff&quot; process involves senders, those transmitting the patient's information and releasing the care of that patient to the next clinician, and receivers, those who accept the patient information and care of that patient.</body>
       </ownedComment>
-      <ownedRule xmi:id="_vMnV0F9xEey5t-mahoHmrg" name="HandoffCommunicationParticipantsTemplateId" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vMnV0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gns6AH3sEeyivuDeOiJBMg" name="HandoffCommunicationParticipantsTemplateId" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gns6AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.141')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vMoj8F9xEey5t-mahoHmrg" name="HandoffCommunicationParticipantsClassCode" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vMoj8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GnuIIH3sEeyivuDeOiJBMg" name="HandoffCommunicationParticipantsClassCode" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GnuIIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vMqZIF9xEey5t-mahoHmrg" name="HandoffCommunicationParticipantsMoodCode" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vMqZIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GnvWQH3sEeyivuDeOiJBMg" name="HandoffCommunicationParticipantsMoodCode" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GnvWQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vMs1YF9xEey5t-mahoHmrg" name="HandoffCommunicationParticipantsCodeP" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vMs1YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GnxygH3sEeyivuDeOiJBMg" name="HandoffCommunicationParticipantsCodeP" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GnxygX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vMrnQF9xEey5t-mahoHmrg" name="HandoffCommunicationParticipantsCode" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vMrnQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GnwkYH3sEeyivuDeOiJBMg" name="HandoffCommunicationParticipantsCode" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GnwkYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '432138007' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vMuqkF9xEey5t-mahoHmrg" name="HandoffCommunicationParticipantsStatusCode" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vMuqkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GnyZkH3sEeyivuDeOiJBMg" name="HandoffCommunicationParticipantsStatusCode" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GnyZkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vMv4sF9xEey5t-mahoHmrg" name="HandoffCommunicationParticipantsStatusCodeP" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vMv4sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GnznsH3sEeyivuDeOiJBMg" name="HandoffCommunicationParticipantsStatusCodeP" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GnznsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vMxG0F9xEey5t-mahoHmrg" name="HandoffCommunicationParticipantsEffectiveTime" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vMxG0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gn010H3sEeyivuDeOiJBMg" name="HandoffCommunicationParticipantsEffectiveTime" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gn010X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vOYQYF9xEey5t-mahoHmrg" name="HandoffCommunicationParticipantsParticipant" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vOY3cF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GpH2UH3sEeyivuDeOiJBMg" name="HandoffCommunicationParticipantsParticipant" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GpH2UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xC13oF9xEey5t-mahoHmrg" name="HandoffCommunicationParticipantsAuthorParticipation" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xC2esF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IRMAUH3sEeyivuDeOiJBMg" name="HandoffCommunicationParticipantsAuthorParticipation" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IRMAUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6vuzsF9xEey5t-mahoHmrg" name="HandoffCommunicationParticipantsParticipantParticipantRolePlayingEntityName" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6vuzsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RABYsH3sEeyivuDeOiJBMg" name="HandoffCommunicationParticipantsParticipantParticipantRolePlayingEntityName" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RABYsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6vuzsl9xEey5t-mahoHmrg" name="HandoffCommunicationParticipantsParticipantParticipantRoleId" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6vuzs19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RABYsn3sEeyivuDeOiJBMg" name="HandoffCommunicationParticipantsParticipantParticipantRoleId" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RABYs33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6vuztF9xEey5t-mahoHmrg" name="HandoffCommunicationParticipantsParticipantParticipantRoleCodeP" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6vuztV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RAB_wH3sEeyivuDeOiJBMg" name="HandoffCommunicationParticipantsParticipantParticipantRoleCodeP" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RAB_wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6vvawF9xEey5t-mahoHmrg" name="HandoffCommunicationParticipantsParticipantParticipantRoleCode" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6vvawV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RAB_wn3sEeyivuDeOiJBMg" name="HandoffCommunicationParticipantsParticipantParticipantRoleCode" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RAB_w33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6vvawl9xEey5t-mahoHmrg" name="HandoffCommunicationParticipantsParticipantParticipantRoleAddr" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6vvaw19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RAB_xH3sEeyivuDeOiJBMg" name="HandoffCommunicationParticipantsParticipantParticipantRoleAddr" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RAB_xX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (( not addr->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6vvaxF9xEey5t-mahoHmrg" name="HandoffCommunicationParticipantsParticipantParticipantRolePlayingEntity" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6vvaxV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RACm0H3sEeyivuDeOiJBMg" name="HandoffCommunicationParticipantsParticipantParticipantRolePlayingEntity" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RACm0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null)->reject(playingEntity->one(playingEntity : cda::PlayingEntity | not playingEntity.oclIsUndefined() and playingEntity.oclIsKindOf(cda::PlayingEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6vwB0F9xEey5t-mahoHmrg" name="HandoffCommunicationParticipantsParticipantTypeCode" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6vwB0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RACm0n3sEeyivuDeOiJBMg" name="HandoffCommunicationParticipantsParticipantTypeCode" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RACm033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(typeCode=vocab::ParticipationType::IRCP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6vwB0l9xEey5t-mahoHmrg" name="HandoffCommunicationParticipantsParticipantParticipantRole" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6vwB019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RACm1H3sEeyivuDeOiJBMg" name="HandoffCommunicationParticipantsParticipantParticipantRole" constrainedElement="_POfwAIz7EeOoMZgUoTghIg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RACm1X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(participantRole->one(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(cda::ParticipantRole)))</body>
         </specification>
@@ -19735,76 +19735,76 @@ Devices that are applied during a procedure (e.g., cardiac pacemaker, gastrosomy
           <body>self.component->exists(component : cda::Component4 | not component.supply.oclIsUndefined() and component.supply.oclIsKindOf(consol::NonMedicinalSupplyActivity2)) or self.component->exists(component : cda::Component4 | not component.procedure.oclIsUndefined() and component.procedure.oclIsKindOf(consol::ProcedureActivityProcedure2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vO4msl9xEey5t-mahoHmrg" name="MedicalEquipmentOrganizerTemplateId" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vO5NwF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gphe8n3sEeyivuDeOiJBMg" name="MedicalEquipmentOrganizerTemplateId" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GpiGAH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.135')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vO6b4F9xEey5t-mahoHmrg" name="MedicalEquipmentOrganizerClassCode" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vO6b4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GpitEH3sEeyivuDeOiJBMg" name="MedicalEquipmentOrganizerClassCode" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GpitEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryOrganizer::CLUSTER</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vO8REF9xEey5t-mahoHmrg" name="MedicalEquipmentOrganizerMoodCode" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vO8REV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gpj7MH3sEeyivuDeOiJBMg" name="MedicalEquipmentOrganizerMoodCode" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gpj7MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::ActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vO9fMF9xEey5t-mahoHmrg" name="MedicalEquipmentOrganizerId" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vO9fMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GplJUH3sEeyivuDeOiJBMg" name="MedicalEquipmentOrganizerId" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GplJUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vO-tUF9xEey5t-mahoHmrg" name="MedicalEquipmentOrganizerCode" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vO-tUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GpmXcH3sEeyivuDeOiJBMg" name="MedicalEquipmentOrganizerCode" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GpmXcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vPfDoF9xEey5t-mahoHmrg" name="MedicalEquipmentOrganizerStatusCodeP" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vPfDoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GqDDYH3sEeyivuDeOiJBMg" name="MedicalEquipmentOrganizerStatusCodeP" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GqDDYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vO_UYF9xEey5t-mahoHmrg" name="MedicalEquipmentOrganizerStatusCode" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vO_UYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gpm-gH3sEeyivuDeOiJBMg" name="MedicalEquipmentOrganizerStatusCode" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gpm-gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'aborted' or value.code = 'active' or value.code = 'cancelled' or value.code = 'completed' or value.code = 'held' or value.code = 'suspended')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vP89sF9xEey5t-mahoHmrg" name="MedicalEquipmentOrganizerEffectiveTime" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vP89sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gqd6IH3sEeyivuDeOiJBMg" name="MedicalEquipmentOrganizerEffectiveTime" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gqd6IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vQizkF9xEey5t-mahoHmrg" name="MedicalEquipmentOrganizerNonMedicinalSupplyActivity2" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vQizkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gq70MH3sEeyivuDeOiJBMg" name="MedicalEquipmentOrganizerNonMedicinalSupplyActivity2" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gq70MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->exists(component : cda::Component4 | not component.supply.oclIsUndefined() and component.supply.oclIsKindOf(consol::NonMedicinalSupplyActivity2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vRDw8F9xEey5t-mahoHmrg" name="MedicalEquipmentOrganizerProcedureActivityProcedure2" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vRDw8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GrXSAH3sEeyivuDeOiJBMg" name="MedicalEquipmentOrganizerProcedureActivityProcedure2" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GrXSAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->exists(component : cda::Component4 | not component.procedure.oclIsUndefined() and component.procedure.oclIsKindOf(consol::ProcedureActivityProcedure2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6vxP8F9xEey5t-mahoHmrg" name="MedicalEquipmentOrganizerIVLTSLow" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6vxP8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RAD08H3sEeyivuDeOiJBMg" name="MedicalEquipmentOrganizerIVLTSLow" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RAD08X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((low.oclIsUndefined() or low.isNullFlavorUndefined()) implies (not low.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6vxP8l9xEey5t-mahoHmrg" name="MedicalEquipmentOrganizerIVLTSHigh" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6vxP819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RAD08n3sEeyivuDeOiJBMg" name="MedicalEquipmentOrganizerIVLTSHigh" constrainedElement="_RbbCII0dEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RAD0833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((high.oclIsUndefined() or high.isNullFlavorUndefined()) implies (not high.oclIsUndefined()) )))</body>
         </specification>
@@ -19812,26 +19812,26 @@ value.code = 'aborted' or value.code = 'active' or value.code = 'cancelled' or v
       <generalization xmi:id="_RbdeYI0dEeOB0eBUISUB4Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_B6aX4EbvEd6besF9iFIJkQ"/>
       </generalization>
-      <ownedOperation xmi:id="_vQizkl9xEey5t-mahoHmrg" name="getNonMedicinalSupplyActivity2s" bodyCondition="_vQizlV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vQizlV9xEey5t-mahoHmrg" name="body" constrainedElement="_vQizkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vQizll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Gq70Mn3sEeyivuDeOiJBMg" name="getNonMedicinalSupplyActivity2s" bodyCondition="_Gq70NX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Gq70NX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Gq70Mn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gq70Nn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::NonMedicinalSupplyActivity2)).oclAsType(consol::NonMedicinalSupplyActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vQizk19xEey5t-mahoHmrg" type="_k_C20OaCEeOmzetP5oaH3A" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vQizlF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Gq70M33sEeyivuDeOiJBMg" type="_k_C20OaCEeOmzetP5oaH3A" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Gq70NH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_vRDw8l9xEey5t-mahoHmrg" name="getProcedureActivityProcedure2s" bodyCondition="_vRDw9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vRDw9V9xEey5t-mahoHmrg" name="body" constrainedElement="_vRDw8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vRDw9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GrXSAn3sEeyivuDeOiJBMg" name="getProcedureActivityProcedure2s" bodyCondition="_GrXSBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GrXSBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_GrXSAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GrX5EH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getProcedures()->select(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::ProcedureActivityProcedure2)).oclAsType(consol::ProcedureActivityProcedure2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vRDw819xEey5t-mahoHmrg" type="_fCVOQPDqEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vRDw9F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GrXSA33sEeyivuDeOiJBMg" type="_fCVOQPDqEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GrXSBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -19839,86 +19839,86 @@ value.code = 'aborted' or value.code = 'active' or value.code = 'cancelled' or v
       <ownedComment xmi:id="_WTRLwI0mEeOB0eBUISUB4Q">
         <body>This template represents observations relating intellectual and mental powers and state of mind. Mental status observations in a clinical note often have a psychological focus (e.g., level of consciousness, mood, anxiety level, reasoning ability).</body>
       </ownedComment>
-      <ownedRule xmi:id="_vREYAF9xEey5t-mahoHmrg" name="MentalStatusObservationTemplateId" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vREYAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GrX5EX3sEeyivuDeOiJBMg" name="MentalStatusObservationTemplateId" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GrX5En3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.125')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vRFmIF9xEey5t-mahoHmrg" name="MentalStatusObservationClassCode" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vRFmIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GrZHMH3sEeyivuDeOiJBMg" name="MentalStatusObservationClassCode" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GrZHMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vRG0QF9xEey5t-mahoHmrg" name="MentalStatusObservationMoodCode" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vRG0QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GraVUH3sEeyivuDeOiJBMg" name="MentalStatusObservationMoodCode" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GraVUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vRIpcF9xEey5t-mahoHmrg" name="MentalStatusObservationId" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vRIpcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GrbjcH3sEeyivuDeOiJBMg" name="MentalStatusObservationId" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GrbjcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vR6FgF9xEey5t-mahoHmrg" name="MentalStatusObservationCodeP" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vR6FgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gr2aMH3sEeyivuDeOiJBMg" name="MentalStatusObservationCodeP" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gr2aMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vRJ3kF9xEey5t-mahoHmrg" name="MentalStatusObservationCode" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vRJ3kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GrcKgH3sEeyivuDeOiJBMg" name="MentalStatusObservationCode" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GrcKgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '43173001' or value.code = '405051006' or value.code = '363871006' or value.code = '85256008' or value.code = '285231000' or value.code = '6942003'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vSc4EF9xEey5t-mahoHmrg" name="MentalStatusObservationStatusCode" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vSc4EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GsRQ8H3sEeyivuDeOiJBMg" name="MentalStatusObservationStatusCode" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GsRQ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vSeGMF9xEey5t-mahoHmrg" name="MentalStatusObservationStatusCodeP" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vSeGMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GsSfEH3sEeyivuDeOiJBMg" name="MentalStatusObservationStatusCodeP" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GsSfEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vSf7YF9xEey5t-mahoHmrg" name="MentalStatusObservationEffectiveTime" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vSf7YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GsTtMH3sEeyivuDeOiJBMg" name="MentalStatusObservationEffectiveTime" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GsTtMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vSgicF9xEey5t-mahoHmrg" name="MentalStatusObservationValue" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vSgicV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GsU7UH3sEeyivuDeOiJBMg" name="MentalStatusObservationValue" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GsU7UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vTBf0F9xEey5t-mahoHmrg" name="MentalStatusObservationValueP" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vTBf0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gsuj8H3sEeyivuDeOiJBMg" name="MentalStatusObservationValueP" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gsuj8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vUCzgF9xEey5t-mahoHmrg" name="MentalStatusObservationAssessmentScaleObservation" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vUDakF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gth1MH3sEeyivuDeOiJBMg" name="MentalStatusObservationAssessmentScaleObservation" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gth1MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AssessmentScaleObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xGV3kF9xEey5t-mahoHmrg" name="MentalStatusObservationAuthorParticipation" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xGV3kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IUKb0H3sEeyivuDeOiJBMg" name="MentalStatusObservationAuthorParticipation" constrainedElement="_-lJmEI0kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IUKb0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
@@ -19926,15 +19926,15 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
       <generalization xmi:id="_-lJmEY0kEeOB0eBUISUB4Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_vUDakV9xEey5t-mahoHmrg" name="getAssessmentScaleObservations" bodyCondition="_vUDalF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vUDalF9xEey5t-mahoHmrg" name="body" constrainedElement="_vUDakV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vUDalV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Gth1Mn3sEeyivuDeOiJBMg" name="getAssessmentScaleObservations" bodyCondition="_Gth1NX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Gth1NX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Gth1Mn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gth1Nn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AssessmentScaleObservation)).oclAsType(consol::AssessmentScaleObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vUDakl9xEey5t-mahoHmrg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vUDak19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Gth1M33sEeyivuDeOiJBMg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Gth1NH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -19948,72 +19948,72 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
           <body>self.value->forAll(val | val.oclIsTypeOf(datatypes::CD) implies (val.isNullFlavorDefined() or val.oclAsType(datatypes::CD).codeSystem = '2.16.840.1.113883.6.96'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vUDall9xEey5t-mahoHmrg" name="NutritionAssessmentTemplateId" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vUDal19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GticQH3sEeyivuDeOiJBMg" name="NutritionAssessmentTemplateId" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GticQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.138')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vUFPwF9xEey5t-mahoHmrg" name="NutritionAssessmentClassCode" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vUFPwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GtjqYH3sEeyivuDeOiJBMg" name="NutritionAssessmentClassCode" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GtjqYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vUHE8F9xEey5t-mahoHmrg" name="NutritionAssessmentMoodCode" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vUHE8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gtk4gH3sEeyivuDeOiJBMg" name="NutritionAssessmentMoodCode" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gtk4gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vUI6IF9xEey5t-mahoHmrg" name="NutritionAssessmentId" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vUI6IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GtmGoH3sEeyivuDeOiJBMg" name="NutritionAssessmentId" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GtmGoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vUL9cF9xEey5t-mahoHmrg" name="NutritionAssessmentCodeP" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vUL9cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gtn70H3sEeyivuDeOiJBMg" name="NutritionAssessmentCodeP" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gtn70X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vUKIQF9xEey5t-mahoHmrg" name="NutritionAssessmentCode" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vUKIQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GtmtsH3sEeyivuDeOiJBMg" name="NutritionAssessmentCode" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GtmtsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '75303-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vUNLkF9xEey5t-mahoHmrg" name="NutritionAssessmentStatusCode" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vUNLkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GtpJ8H3sEeyivuDeOiJBMg" name="NutritionAssessmentStatusCode" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GtpJ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vUOZsF9xEey5t-mahoHmrg" name="NutritionAssessmentStatusCodeP" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vUOZsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GtqYEH3sEeyivuDeOiJBMg" name="NutritionAssessmentStatusCodeP" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GtqYEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vUQO4F9xEey5t-mahoHmrg" name="NutritionAssessmentEffectiveTime" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vUQO4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gtq_IH3sEeyivuDeOiJBMg" name="NutritionAssessmentEffectiveTime" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gtq_IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vURdAF9xEey5t-mahoHmrg" name="NutritionAssessmentValue" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vURdAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GtsNQH3sEeyivuDeOiJBMg" name="NutritionAssessmentValue" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GtsNQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xG1m0F9xEey5t-mahoHmrg" name="NutritionAssessmentAuthorParticipation" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xG2N4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IUkrgH3sEeyivuDeOiJBMg" name="NutritionAssessmentAuthorParticipation" constrainedElement="_NP5zMI05EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IUkrgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
@@ -20026,98 +20026,98 @@ value.code = 'completed')</body>
       <ownedComment xmi:id="_YFQGgI3FEeOB0eBUISUB4Q">
         <body>This template represents nutrition regimens (e.g., fluid restrictions, calorie minimum), interventions (e.g., NPO, nutritional supplements), and procedures (e.g., G-Tube by bolus, TPN by central line). It may also depict the need for nutrition education.</body>
       </ownedComment>
-      <ownedRule xmi:id="_vUSrIF9xEey5t-mahoHmrg" name="NutritionRecommendationTemplateId" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vUSrIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gts0UH3sEeyivuDeOiJBMg" name="NutritionRecommendationTemplateId" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gts0UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.130')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vUUgUF9xEey5t-mahoHmrg" name="NutritionRecommendationClassCode" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vUUgUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GtuCcH3sEeyivuDeOiJBMg" name="NutritionRecommendationClassCode" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GtuCcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vU3S4F9xEey5t-mahoHmrg" name="NutritionRecommendationMoodCodeP" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vU3S4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GuI5MH3sEeyivuDeOiJBMg" name="NutritionRecommendationMoodCodeP" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GuI5MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('moodCode')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vUVucF9xEey5t-mahoHmrg" name="NutritionRecommendationMoodCode" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vUVucV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GtvQkH3sEeyivuDeOiJBMg" name="NutritionRecommendationMoodCode" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GtvQkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentActMood) and 
 let value : vocab::x_DocumentActMood = self.moodCode.oclAsType(vocab::x_DocumentActMood) in 
 value = vocab::x_DocumentActMood::INT or value = vocab::x_DocumentActMood::ARQ or value = vocab::x_DocumentActMood::PRMS or value = vocab::x_DocumentActMood::PRP or value = vocab::x_DocumentActMood::RQO or value = vocab::x_DocumentActMood::APT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vV-GIF9xEey5t-mahoHmrg" name="NutritionRecommendationCodeP" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vV-GIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GvBqAH3sEeyivuDeOiJBMg" name="NutritionRecommendationCodeP" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GvBqAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vVZeYF9xEey5t-mahoHmrg" name="NutritionRecommendationCode" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vVZeYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gujv8H3sEeyivuDeOiJBMg" name="NutritionRecommendationCode" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gujv8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '61310001' or value.code = '386373004' or value.code = '418995006' or value.code = '413315001' or value.code = '182922004' or value.code = '229912004' or value.code = '225372007' or value.code = '448556005'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vWm_UF9xEey5t-mahoHmrg" name="NutritionRecommendationStatusCode" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vWm_UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GvdH0H3sEeyivuDeOiJBMg" name="NutritionRecommendationStatusCode" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GvdH0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'active')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vWo0gF9xEey5t-mahoHmrg" name="NutritionRecommendationStatusCodeP" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vWo0gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GveV8H3sEeyivuDeOiJBMg" name="NutritionRecommendationStatusCodeP" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GveV8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vWqpsF9xEey5t-mahoHmrg" name="NutritionRecommendationEffectiveTime" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vWqpsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GvfkEH3sEeyivuDeOiJBMg" name="NutritionRecommendationEffectiveTime" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GvfkEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4TKqoF9xEey5t-mahoHmrg" name="NutritionRecommendationPlannedEncounter2" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4TKqoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OmlcIH3sEeyivuDeOiJBMg" name="NutritionRecommendationPlannedEncounter2" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OmlcIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.encounter.oclIsUndefined() and entryRelationship.encounter.oclIsKindOf(consol::PlannedEncounter2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4TroAF9xEey5t-mahoHmrg" name="NutritionRecommendationPlannedMedicationActivity2" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4TroAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OnD9QH3sEeyivuDeOiJBMg" name="NutritionRecommendationPlannedMedicationActivity2" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OnD9QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::PlannedMedicationActivity2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4ULXQF9xEey5t-mahoHmrg" name="NutritionRecommendationPlannedObservation2" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4ULXQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_One0AH3sEeyivuDeOiJBMg" name="NutritionRecommendationPlannedObservation2" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_One0AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PlannedObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4UrtkF9xEey5t-mahoHmrg" name="NutritionRecommendationPlannedProcedure2" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4UrtkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_On6R0H3sEeyivuDeOiJBMg" name="NutritionRecommendationPlannedProcedure2" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_On6R0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.procedure.oclIsUndefined() and entryRelationship.procedure.oclIsKindOf(consol::PlannedProcedure2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4VK1wF9xEey5t-mahoHmrg" name="NutritionRecommendationPlannedSupply2" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4VK1wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OoT6cH3sEeyivuDeOiJBMg" name="NutritionRecommendationPlannedSupply2" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OoT6cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::PlannedSupply2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4VrMEF9xEey5t-mahoHmrg" name="NutritionRecommendationPlannedAct2" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4VrMEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OouKIH3sEeyivuDeOiJBMg" name="NutritionRecommendationPlannedAct2" constrainedElement="_FhAIMI3FEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OouKIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::PlannedAct2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
@@ -20125,70 +20125,70 @@ value.code = 'active')</body>
       <generalization xmi:id="_FhAvQI3FEeOB0eBUISUB4Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_4TLRsF9xEey5t-mahoHmrg" name="getPlannedEncounter2s" bodyCondition="_4TLRs19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4TLRs19xEey5t-mahoHmrg" name="body" constrainedElement="_4TLRsF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4TLRtF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OmlcIn3sEeyivuDeOiJBMg" name="getPlannedEncounter2s" bodyCondition="_OmlcJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OmlcJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OmlcIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OmlcJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getEncounters()->select(encounter : cda::Encounter | not encounter.oclIsUndefined() and encounter.oclIsKindOf(consol::PlannedEncounter2)).oclAsType(consol::PlannedEncounter2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4TLRsV9xEey5t-mahoHmrg" type="_bDPFMOdXEeOqBOMhgDlycQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4TLRsl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OmlcI33sEeyivuDeOiJBMg" type="_bDPFMOdXEeOqBOMhgDlycQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OmlcJH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4TroAl9xEey5t-mahoHmrg" name="getPlannedMedicationActivity2s" bodyCondition="_4TroBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4TroBV9xEey5t-mahoHmrg" name="body" constrainedElement="_4TroAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4TroBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OnD9Qn3sEeyivuDeOiJBMg" name="getPlannedMedicationActivity2s" bodyCondition="_OnD9RX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OnD9RX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OnD9Qn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OnD9Rn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::PlannedMedicationActivity2)).oclAsType(consol::PlannedMedicationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4TroA19xEey5t-mahoHmrg" type="_Yj45YOgREeO-iJTuAv7BKQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4TroBF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OnD9Q33sEeyivuDeOiJBMg" type="_Yj45YOgREeO-iJTuAv7BKQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OnD9RH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4UL-UF9xEey5t-mahoHmrg" name="getPlannedObservation2s" bodyCondition="_4UL-U19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4UL-U19xEey5t-mahoHmrg" name="body" constrainedElement="_4UL-UF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4UL-VF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_One0An3sEeyivuDeOiJBMg" name="getPlannedObservation2s" bodyCondition="_One0BX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_One0BX3sEeyivuDeOiJBMg" name="body" constrainedElement="_One0An3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_One0Bn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PlannedObservation2)).oclAsType(consol::PlannedObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4UL-UV9xEey5t-mahoHmrg" type="_jKZssOdvEeOqBOMhgDlycQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4UL-Ul9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_One0A33sEeyivuDeOiJBMg" type="_jKZssOdvEeOqBOMhgDlycQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_One0BH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4UsUoF9xEey5t-mahoHmrg" name="getPlannedProcedure2s" bodyCondition="_4UsUo19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4UsUo19xEey5t-mahoHmrg" name="body" constrainedElement="_4UsUoF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4UsUpF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_On6R0n3sEeyivuDeOiJBMg" name="getPlannedProcedure2s" bodyCondition="_On6R1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_On6R1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_On6R0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_On6R1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getProcedures()->select(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::PlannedProcedure2)).oclAsType(consol::PlannedProcedure2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4UsUoV9xEey5t-mahoHmrg" type="_cs0YsOeEEeOqBOMhgDlycQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4UsUol9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_On6R033sEeyivuDeOiJBMg" type="_cs0YsOeEEeOqBOMhgDlycQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_On6R1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4VLc0F9xEey5t-mahoHmrg" name="getPlannedSupply2s" bodyCondition="_4VLc019xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4VLc019xEey5t-mahoHmrg" name="body" constrainedElement="_4VLc0F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4VLc1F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OoUhgH3sEeyivuDeOiJBMg" name="getPlannedSupply2s" bodyCondition="_OoUhg33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OoUhg33sEeyivuDeOiJBMg" name="body" constrainedElement="_OoUhgH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OoUhhH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::PlannedSupply2)).oclAsType(consol::PlannedSupply2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4VLc0V9xEey5t-mahoHmrg" type="_vEd1cOg0EeO-iJTuAv7BKQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4VLc0l9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OoUhgX3sEeyivuDeOiJBMg" type="_vEd1cOg0EeO-iJTuAv7BKQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OoUhgn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4VrzIF9xEey5t-mahoHmrg" name="getPlannedAct2s" bodyCondition="_4VrzI19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4VrzI19xEey5t-mahoHmrg" name="body" constrainedElement="_4VrzIF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4VrzJF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OouKIn3sEeyivuDeOiJBMg" name="getPlannedAct2s" bodyCondition="_OouKJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OouKJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OouKIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OouKJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PlannedAct2)).oclAsType(consol::PlannedAct2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4VrzIV9xEey5t-mahoHmrg" type="_lLnRMOaYEeOmzetP5oaH3A" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4VrzIl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OouKI33sEeyivuDeOiJBMg" type="_lLnRMOaYEeOmzetP5oaH3A" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OouKJH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -20196,80 +20196,80 @@ value.code = 'active')</body>
       <ownedComment xmi:id="_C93YEI38EeOB0eBUISUB4Q">
         <body>This template describes the overall nutritional status of the patient including findings related to nutritional status.</body>
       </ownedComment>
-      <ownedRule xmi:id="_vWr30F9xEey5t-mahoHmrg" name="NutritionalStatusObservationTemplateId" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vWr30V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GvgyMH3sEeyivuDeOiJBMg" name="NutritionalStatusObservationTemplateId" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GvgyMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.124')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vWttAF9xEey5t-mahoHmrg" name="NutritionalStatusObservationClassCode" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vWttAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GviAUH3sEeyivuDeOiJBMg" name="NutritionalStatusObservationClassCode" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GviAUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vWviMF9xEey5t-mahoHmrg" name="NutritionalStatusObservationMoodCode" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vWviMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GvjOcH3sEeyivuDeOiJBMg" name="NutritionalStatusObservationMoodCode" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GvjOcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vWx-cF9xEey5t-mahoHmrg" name="NutritionalStatusObservationId" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vWx-cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GvkckH3sEeyivuDeOiJBMg" name="NutritionalStatusObservationId" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GvkckX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vW1BwF9xEey5t-mahoHmrg" name="NutritionalStatusObservationCodeP" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vW1BwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gvm40H3sEeyivuDeOiJBMg" name="NutritionalStatusObservationCodeP" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gvm40X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vWzMkF9xEey5t-mahoHmrg" name="NutritionalStatusObservationCode" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vWzMkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GvlqsH3sEeyivuDeOiJBMg" name="NutritionalStatusObservationCode" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GvlqsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '75305-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vW2P4F9xEey5t-mahoHmrg" name="NutritionalStatusObservationStatusCode" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vW2P4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GvoG8H3sEeyivuDeOiJBMg" name="NutritionalStatusObservationStatusCode" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GvoG8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vW4sIF9xEey5t-mahoHmrg" name="NutritionalStatusObservationStatusCodeP" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vW4sIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GvpVEH3sEeyivuDeOiJBMg" name="NutritionalStatusObservationStatusCodeP" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GvpVEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vW7IYF9xEey5t-mahoHmrg" name="NutritionalStatusObservationEffectiveTime" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vW7IYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GvqjMH3sEeyivuDeOiJBMg" name="NutritionalStatusObservationEffectiveTime" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GvqjMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vW89kF9xEey5t-mahoHmrg" name="NutritionalStatusObservationValue" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vW89kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GvrKQH3sEeyivuDeOiJBMg" name="NutritionalStatusObservationValue" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GvrKQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vXnE4F9xEey5t-mahoHmrg" name="NutritionalStatusObservationValueP" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vXnE4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GwFZ8H3sEeyivuDeOiJBMg" name="NutritionalStatusObservationValueP" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GwFZ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vYrb4F9xEey5t-mahoHmrg" name="NutritionalStatusObservationNutritionAssessment" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vYrb4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gw5SQH3sEeyivuDeOiJBMg" name="NutritionalStatusObservationNutritionAssessment" constrainedElement="_T1dcwI37EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gw5SQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::NutritionAssessment) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
@@ -20277,15 +20277,15 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
       <generalization xmi:id="_T1eD0I37EeOB0eBUISUB4Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_vYrb4l9xEey5t-mahoHmrg" name="getNutritionAssessments" bodyCondition="_vYsC8l9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vYsC8l9xEey5t-mahoHmrg" name="body" constrainedElement="_vYrb4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vYsC819xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Gw5SQn3sEeyivuDeOiJBMg" name="getNutritionAssessments" bodyCondition="_Gw5SRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Gw5SRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Gw5SQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gw5SRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::NutritionAssessment)).oclAsType(consol::NutritionAssessment)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vYsC8F9xEey5t-mahoHmrg" type="_NP5zMI05EeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vYsC8V9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Gw5SQ33sEeyivuDeOiJBMg" type="_NP5zMI05EeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Gw5SRH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -20304,94 +20304,94 @@ Often thought of as an &quot;actual outcome&quot;, the Outcome Observation may b
           <body>self.entryRelationship->select(er : cda::EntryRelationship | er.observation.oclIsTypeOf(consol::ProgressTowardGoalObservation))->forAll(ent : cda::EntryRelationship | ent.inversionInd=true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vYsC9F9xEey5t-mahoHmrg" name="OutcomeObservationTemplateId" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vYsC9V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gw55UH3sEeyivuDeOiJBMg" name="OutcomeObservationTemplateId" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gw55UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.144')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vYt4IF9xEey5t-mahoHmrg" name="OutcomeObservationClassCode" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vYt4IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gw7ugH3sEeyivuDeOiJBMg" name="OutcomeObservationClassCode" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gw7ugX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vYwUYF9xEey5t-mahoHmrg" name="OutcomeObservationMoodCode" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vYwUYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gw88oH3sEeyivuDeOiJBMg" name="OutcomeObservationMoodCode" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gw88oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vYxigF9xEey5t-mahoHmrg" name="OutcomeObservationId" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vYxigV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gw-KwH3sEeyivuDeOiJBMg" name="OutcomeObservationId" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gw-KwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vY0l0F9xEey5t-mahoHmrg" name="OutcomeObservationCodeP" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vY0l0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GxAnAH3sEeyivuDeOiJBMg" name="OutcomeObservationCodeP" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GxAnAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vYzXsF9xEey5t-mahoHmrg" name="OutcomeObservationCode" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vYzXsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gw_Y4H3sEeyivuDeOiJBMg" name="OutcomeObservationCode" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gw_Y4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vY2bAF9xEey5t-mahoHmrg" name="OutcomeObservationValue" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vY2bAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GxB1IH3sEeyivuDeOiJBMg" name="OutcomeObservationValue" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GxB1IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (( not self.value->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vZYmgF9xEey5t-mahoHmrg" name="OutcomeObservationEntryReferenceGoalObs" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vZZNkF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gxcr4H3sEeyivuDeOiJBMg" name="OutcomeObservationEntryReferenceGoalObs" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gxcr4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EntryReference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::GEVL)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vZ480F9xEey5t-mahoHmrg" name="OutcomeObservationEntryReferenceInterventionAct" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vZ480V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gx3ioH3sEeyivuDeOiJBMg" name="OutcomeObservationEntryReferenceInterventionAct" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gx3ioX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EntryReference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xHSSwF9xEey5t-mahoHmrg" name="OutcomeObservationAuthorParticipation" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xHSSwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IVAJUH3sEeyivuDeOiJBMg" name="OutcomeObservationAuthorParticipation" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IVAJUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xHxa8F9xEey5t-mahoHmrg" name="OutcomeObservationProgressTowardGoalObservation" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xHxa8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IVbAEH3sEeyivuDeOiJBMg" name="OutcomeObservationProgressTowardGoalObservation" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IVbAEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProgressTowardGoalObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SPRT)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4WK7UF9xEey5t-mahoHmrg" name="OutcomeObservationReference" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4WK7UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OpJA4H3sEeyivuDeOiJBMg" name="OutcomeObservationReference" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OpJA4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->exists(reference : cda::Reference | not reference.oclIsUndefined() and reference.oclIsKindOf(cda::Reference))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4WqqkF9xEey5t-mahoHmrg" name="OutcomeObservationEntryRelationship" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4WqqkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OplFwn3sEeyivuDeOiJBMg" name="OutcomeObservationEntryRelationship" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OplFw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.oclIsUndefined() and entryRelationship.oclIsKindOf(rim::ActRelationship))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6wS0YF9xEey5t-mahoHmrg" name="OutcomeObservationReferenceTypeCode" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6wS0YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RAiWEH3sEeyivuDeOiJBMg" name="OutcomeObservationReferenceTypeCode" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RAiWEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null)->reject(typeCode=vocab::x_ActRelationshipExternalReference::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6wS0Yl9xEey5t-mahoHmrg" name="OutcomeObservationReferenceExternalDocumentReference" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6wS0Y19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RAi9IH3sEeyivuDeOiJBMg" name="OutcomeObservationReferenceExternalDocumentReference" constrainedElement="_ihaWkI55EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RAi9IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null)->reject(externalDocument->one(externalDocument : cda::ExternalDocument | not externalDocument.oclIsUndefined() and externalDocument.oclIsKindOf(consol::ExternalDocumentReference)))</body>
         </specification>
@@ -20399,37 +20399,37 @@ value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_ihaWkY55EeOB0eBUISUB4Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_vZZNkV9xEey5t-mahoHmrg" name="getEntryReferenceGoalObss" bodyCondition="_vZZNlF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vZZNlF9xEey5t-mahoHmrg" name="body" constrainedElement="_vZZNkV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vZZNlV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_GxdS8H3sEeyivuDeOiJBMg" name="getEntryReferenceGoalObss" bodyCondition="_GxdS833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_GxdS833sEeyivuDeOiJBMg" name="body" constrainedElement="_GxdS8H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_GxdS9H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::EntryReference)).oclAsType(consol::EntryReference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vZZNkl9xEey5t-mahoHmrg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vZZNk19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_GxdS8X3sEeyivuDeOiJBMg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GxdS8n3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_vZ480l9xEey5t-mahoHmrg" name="getEntryReferenceInterventionActs" bodyCondition="_vZ5j4F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vZ5j4F9xEey5t-mahoHmrg" name="body" constrainedElement="_vZ480l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vZ5j4V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Gx3ion3sEeyivuDeOiJBMg" name="getEntryReferenceInterventionActs" bodyCondition="_Gx3ipX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Gx3ipX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Gx3ion3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gx3ipn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::EntryReference)).oclAsType(consol::EntryReference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vZ48019xEey5t-mahoHmrg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vZ481F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Gx3io33sEeyivuDeOiJBMg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Gx3ipH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_xHyCAF9xEey5t-mahoHmrg" name="getProgressTowardGoalObservation" bodyCondition="_xHyCA19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xHyCA19xEey5t-mahoHmrg" name="body" constrainedElement="_xHyCAF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xHyCBF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_IVbAEn3sEeyivuDeOiJBMg" name="getProgressTowardGoalObservation" bodyCondition="_IVbAFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_IVbAFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_IVbAEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_IVbAFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProgressTowardGoalObservation))->asSequence()->any(true).oclAsType(consol::ProgressTowardGoalObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xHyCAV9xEey5t-mahoHmrg" type="_0NewYJmVEeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xHyCAl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_IVbAE33sEeyivuDeOiJBMg" type="_0NewYJmVEeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IVbAFH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -20437,204 +20437,204 @@ value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_HHU20I63EeOB0eBUISUB4Q">
         <body>This template represents the type of referral (e.g., for dental care, to a specialist, for aging problems) and represents whether the referral is for full care or shared care. It may contain a reference to another act in the document instance representing the clinical reason for the referral (e.g., problem, concern, procedure).</body>
       </ownedComment>
-      <ownedRule xmi:id="_vZ5j4l9xEey5t-mahoHmrg" name="PatientReferralActTemplateId" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vZ5j419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gx4JsH3sEeyivuDeOiJBMg" name="PatientReferralActTemplateId" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gx4JsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.140')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vZ6yAF9xEey5t-mahoHmrg" name="PatientReferralActClassCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vZ6yAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gx4wwH3sEeyivuDeOiJBMg" name="PatientReferralActClassCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gx4wwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::PCPR</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vac9gF9xEey5t-mahoHmrg" name="PatientReferralActMoodCodeP" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vac9gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GyU1oH3sEeyivuDeOiJBMg" name="PatientReferralActMoodCodeP" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GyU1oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('moodCode')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vZ8AIF9xEey5t-mahoHmrg" name="PatientReferralActMoodCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vZ8AIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gx5-4H3sEeyivuDeOiJBMg" name="PatientReferralActMoodCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gx5-4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentActMood) and 
 let value : vocab::x_DocumentActMood = self.moodCode.oclAsType(vocab::x_DocumentActMood) in 
 value = vocab::x_DocumentActMood::INT or value = vocab::x_DocumentActMood::RQO</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_va7eoF9xEey5t-mahoHmrg" name="PatientReferralActId" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_va7eoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GyvsYH3sEeyivuDeOiJBMg" name="PatientReferralActId" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GyvsYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vbeRMF9xEey5t-mahoHmrg" name="PatientReferralActCodeP" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vbeRMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GzONgH3sEeyivuDeOiJBMg" name="PatientReferralActCodeP" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GzONgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_va8swF9xEey5t-mahoHmrg" name="PatientReferralActCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_va8swV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GywTcH3sEeyivuDeOiJBMg" name="PatientReferralActCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GywTcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vb9ZYF9xEey5t-mahoHmrg" name="PatientReferralActStatusCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vb9ZYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GzrggH3sEeyivuDeOiJBMg" name="PatientReferralActStatusCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GzrggX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'active')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vb_1oF9xEey5t-mahoHmrg" name="PatientReferralActStatusCodeP" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vcAcsF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GzsuoH3sEeyivuDeOiJBMg" name="PatientReferralActStatusCodeP" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GzsuoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vcBq0F9xEey5t-mahoHmrg" name="PatientReferralActEffectiveTime" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vcBq0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Gzt8wH3sEeyivuDeOiJBMg" name="PatientReferralActEffectiveTime" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Gzt8wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vcC48F9xEey5t-mahoHmrg" name="PatientReferralActPriorityCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vcDgAF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_GzvK4H3sEeyivuDeOiJBMg" name="PatientReferralActPriorityCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_GzvK4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.priorityCode.oclIsUndefined() or self.priorityCode.isNullFlavorUndefined()) implies (not self.priorityCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vfqNoF9xEey5t-mahoHmrg" name="PatientReferralActEntryRelationship" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vfqNoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G20UEH3sEeyivuDeOiJBMg" name="PatientReferralActEntryRelationship" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G20UEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->select(entryRelationship : cda::EntryRelationship | not entryRelationship.oclIsUndefined() and entryRelationship.oclIsKindOf(cda::EntryRelationship))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xIOt8F9xEey5t-mahoHmrg" name="PatientReferralActAuthorParticipation" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xIOt8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IV0BoH3sEeyivuDeOiJBMg" name="PatientReferralActAuthorParticipation" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IV0BoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4XJLsF9xEey5t-mahoHmrg" name="PatientReferralActIndication2" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4XJywF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Op_VcH3sEeyivuDeOiJBMg" name="PatientReferralActIndication2" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Op_VcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4XqJEF9xEey5t-mahoHmrg" name="PatientReferralActParticipant" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4XqJEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OqcBYH3sEeyivuDeOiJBMg" name="PatientReferralActParticipant" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OqcBYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6xUvIF9xEey5t-mahoHmrg" name="PatientReferralActEntryRelationshipObservationClassCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6xUvIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RBc8EH3sEeyivuDeOiJBMg" name="PatientReferralActEntryRelationshipObservationClassCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RBc8EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject(classCode=vocab::ActClassObservation::OBS)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6xUvIl9xEey5t-mahoHmrg" name="PatientReferralActEntryRelationshipObservationMoodCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6xUvI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RBc8En3sEeyivuDeOiJBMg" name="PatientReferralActEntryRelationshipObservationMoodCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RBc8E33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject(moodCode=vocab::x_ActMoodDocumentObservation::RQO)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6xVWMF9xEey5t-mahoHmrg" name="PatientReferralActEntryRelationshipObservationCodeP" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6xVWMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RBc8FH3sEeyivuDeOiJBMg" name="PatientReferralActEntryRelationshipObservationCodeP" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RBdjIH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6xVWMl9xEey5t-mahoHmrg" name="PatientReferralActEntryRelationshipObservationCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6xVWM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RBdjIX3sEeyivuDeOiJBMg" name="PatientReferralActEntryRelationshipObservationCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RBdjIn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = code.oclAsType(datatypes::CD) in 
 value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6xVWNF9xEey5t-mahoHmrg" name="PatientReferralActEntryRelationshipObservationStatusCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6xV9QF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RBdjI33sEeyivuDeOiJBMg" name="PatientReferralActEntryRelationshipObservationStatusCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RBdjJH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject((statusCode.oclIsUndefined() or statusCode.isNullFlavorUndefined()) implies (not statusCode.oclIsUndefined() and statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6xV9QV9xEey5t-mahoHmrg" name="PatientReferralActEntryRelationshipObservationStatusCodeP" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6xV9Ql9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RBdjJX3sEeyivuDeOiJBMg" name="PatientReferralActEntryRelationshipObservationStatusCodeP" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RBdjJn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject((statusCode.oclIsUndefined() or statusCode.isNullFlavorUndefined()) implies (not statusCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6xV9Q19xEey5t-mahoHmrg" name="PatientReferralActEntryRelationshipObservationPriorityCodeP" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6xV9RF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RBeKMH3sEeyivuDeOiJBMg" name="PatientReferralActEntryRelationshipObservationPriorityCodeP" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RBeKMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject((priorityCode.oclIsUndefined() or priorityCode.isNullFlavorUndefined()) implies (not priorityCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6xWkUF9xEey5t-mahoHmrg" name="PatientReferralActEntryRelationshipObservationPriorityCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6xWkUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RBeKMn3sEeyivuDeOiJBMg" name="PatientReferralActEntryRelationshipObservationPriorityCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RBeKM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject((priorityCode.oclIsUndefined() or priorityCode.isNullFlavorUndefined()) implies (not priorityCode.oclIsUndefined() and priorityCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = priorityCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.7' and (value.code = 'A' or value.code = 'CR' or value.code = 'CS' or value.code = 'CSP' or value.code = 'CSR' or value.code = 'EL' or value.code = 'EM' or value.code = 'P' or value.code = 'PRN' or value.code = 'R' or value.code = 'RR' or value.code = 'S' or value.code = 'T' or value.code = 'UD' or value.code = 'UR')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6xWkUl9xEey5t-mahoHmrg" name="PatientReferralActEntryRelationshipObservationValue" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6xWkU19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RBeKNH3sEeyivuDeOiJBMg" name="PatientReferralActEntryRelationshipObservationValue" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RBeKNX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject((value->isEmpty() or value->exists(element | element.isNullFlavorUndefined())) implies (value->size() = 1 and value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '370985002' or value.code = '170941001' or value.code = '170935008' or value.code = '268528005' or value.code = '170939002' or value.code = '268529002' or value.code = '170936009' or value.code = '170937000' or value.code = '170940000'))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6xWkVF9xEey5t-mahoHmrg" name="PatientReferralActEntryRelationshipObservationValueP" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6xWkVV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RBexQH3sEeyivuDeOiJBMg" name="PatientReferralActEntryRelationshipObservationValueP" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RBexQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject((value->isEmpty() or value->exists(element | element.isNullFlavorUndefined())) implies (value->size() =  1 and value->forAll(element | element.oclIsTypeOf(datatypes::CD))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6xXLYF9xEey5t-mahoHmrg" name="PatientReferralActEntryRelationshipTypeCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6xXLYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RBexQn3sEeyivuDeOiJBMg" name="PatientReferralActEntryRelationshipTypeCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RBexQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->reject(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6xXLYl9xEey5t-mahoHmrg" name="PatientReferralActEntryRelationshipObservation" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6xXLY19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RBexRH3sEeyivuDeOiJBMg" name="PatientReferralActEntryRelationshipObservation" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RBexRX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->reject(observation->one(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(cda::Observation)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6yX4AF9xEey5t-mahoHmrg" name="PatientReferralActParticipantParticipantRoleCodeP" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6yX4AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RCbMcH3sEeyivuDeOiJBMg" name="PatientReferralActParticipantParticipantRoleCodeP" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RCbMcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6yYfEF9xEey5t-mahoHmrg" name="PatientReferralActParticipantParticipantRoleCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6yYfEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RCbzgH3sEeyivuDeOiJBMg" name="PatientReferralActParticipantParticipantRoleCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RCbzgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6yYfEl9xEey5t-mahoHmrg" name="PatientReferralActParticipantTypeCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6yYfE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RCbzgn3sEeyivuDeOiJBMg" name="PatientReferralActParticipantTypeCode" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RCbzg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(typeCode=vocab::ParticipationType::REFT)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6yZGIF9xEey5t-mahoHmrg" name="PatientReferralActParticipantParticipantRole" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6yZGIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RCbzhH3sEeyivuDeOiJBMg" name="PatientReferralActParticipantParticipantRole" constrainedElement="_50a2UI62EeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RCbzhX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(participantRole->one(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(cda::ParticipantRole)))</body>
         </specification>
@@ -20642,15 +20642,15 @@ value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()
       <generalization xmi:id="_50a2UY62EeOB0eBUISUB4Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_4XJywV9xEey5t-mahoHmrg" name="getIndication2s" bodyCondition="_4XJyxF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4XJyxF9xEey5t-mahoHmrg" name="body" constrainedElement="_4XJywV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4XJyxV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Op_Vcn3sEeyivuDeOiJBMg" name="getIndication2s" bodyCondition="_Op_VdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Op_VdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Op_Vcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Op_Vdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication2)).oclAsType(consol::Indication2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4XJywl9xEey5t-mahoHmrg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4XJyw19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Op_Vc33sEeyivuDeOiJBMg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Op_VdH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -20658,124 +20658,124 @@ value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()
       <ownedComment xmi:id="_olcGwI9DEeOB0eBUISUB4Q">
         <body>This template represents the insurance coverage intended to cover an act or procedure.</body>
       </ownedComment>
-      <ownedRule xmi:id="_vgKj8F9xEey5t-mahoHmrg" name="PlannedCoverageTemplateId" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vgKj8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G3SOIH3sEeyivuDeOiJBMg" name="PlannedCoverageTemplateId" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G3SOIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.129')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vgLyEF9xEey5t-mahoHmrg" name="PlannedCoverageClassCode" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vgLyEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G3S1MH3sEeyivuDeOiJBMg" name="PlannedCoverageClassCode" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G3S1MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vgMZIF9xEey5t-mahoHmrg" name="PlannedCoverageMoodCode" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vgMZIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G3UDUH3sEeyivuDeOiJBMg" name="PlannedCoverageMoodCode" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G3UDUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::INT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vgNnQF9xEey5t-mahoHmrg" name="PlannedCoverageId" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vgNnQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G3UqYH3sEeyivuDeOiJBMg" name="PlannedCoverageId" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G3UqYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vgPccF9xEey5t-mahoHmrg" name="PlannedCoverageCodeP" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vgPccV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G3XGoH3sEeyivuDeOiJBMg" name="PlannedCoverageCodeP" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G3XGoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vgOOUF9xEey5t-mahoHmrg" name="PlannedCoverageCode" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vgOOUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G3V4gH3sEeyivuDeOiJBMg" name="PlannedCoverageCode" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G3V4gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '48768-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vgQqkF9xEey5t-mahoHmrg" name="PlannedCoverageStatusCode" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vgQqkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G3XtsH3sEeyivuDeOiJBMg" name="PlannedCoverageStatusCode" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G3XtsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'active')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vgR4sF9xEey5t-mahoHmrg" name="PlannedCoverageStatusCodeP" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vgR4sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G3Y70H3sEeyivuDeOiJBMg" name="PlannedCoverageStatusCodeP" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G3Y70X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vh1-8F9xEey5t-mahoHmrg" name="PlannedCoverageEntryRelationship" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vh1-8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G4u_oH3sEeyivuDeOiJBMg" name="PlannedCoverageEntryRelationship" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G4u_oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.oclIsUndefined() and entryRelationship.oclIsKindOf(cda::EntryRelationship))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4YpAgF9xEey5t-mahoHmrg" name="PlannedCoverageAuthorParticipation" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4YpAgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OrRu4H3sEeyivuDeOiJBMg" name="PlannedCoverageAuthorParticipation" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OrRu4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6zZywF9xEey5t-mahoHmrg" name="PlannedCoverageEntryRelationshipActClassCode" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6zZywV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RDaq8H3sEeyivuDeOiJBMg" name="PlannedCoverageEntryRelationshipActClassCode" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RDaq8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null).act->excluding(null)->reject(classCode=vocab::x_ActClassDocumentEntryAct::ACT)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6zZywl9xEey5t-mahoHmrg" name="PlannedCoverageEntryRelationshipActMoodCode" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6zZyw19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RDaq8n3sEeyivuDeOiJBMg" name="PlannedCoverageEntryRelationshipActMoodCode" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RDaq833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null).act->excluding(null)->reject(moodCode=vocab::x_DocumentActMood::INT)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6zZyxF9xEey5t-mahoHmrg" name="PlannedCoverageEntryRelationshipActId" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6zZyxV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RDaq9H3sEeyivuDeOiJBMg" name="PlannedCoverageEntryRelationshipActId" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RDaq9X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null).act->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6zaZ0F9xEey5t-mahoHmrg" name="PlannedCoverageEntryRelationshipActCodeP" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6zaZ0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RDbSAH3sEeyivuDeOiJBMg" name="PlannedCoverageEntryRelationshipActCodeP" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RDbSAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null).act->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6zaZ0l9xEey5t-mahoHmrg" name="PlannedCoverageEntryRelationshipActCode" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6zaZ019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RDbSAn3sEeyivuDeOiJBMg" name="PlannedCoverageEntryRelationshipActCode" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RDbSA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null).act->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.3.221.5' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6zaZ1F9xEey5t-mahoHmrg" name="PlannedCoverageEntryRelationshipActStatusCode" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6zbA4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RDbSBH3sEeyivuDeOiJBMg" name="PlannedCoverageEntryRelationshipActStatusCode" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RDbSBX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null).act->excluding(null)->reject((statusCode.oclIsUndefined() or statusCode.isNullFlavorUndefined()) implies (not statusCode.oclIsUndefined() and statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = statusCode.oclAsType(datatypes::CS) in 
 value.code = 'active'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6zbA4V9xEey5t-mahoHmrg" name="PlannedCoverageEntryRelationshipActStatusCodeP" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6zbA4l9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RDb5EH3sEeyivuDeOiJBMg" name="PlannedCoverageEntryRelationshipActStatusCodeP" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RDb5EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null).act->excluding(null)->reject((statusCode.oclIsUndefined() or statusCode.isNullFlavorUndefined()) implies (not statusCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6zbA419xEey5t-mahoHmrg" name="PlannedCoverageEntryRelationshipTypeCode" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6zbA5F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RDb5En3sEeyivuDeOiJBMg" name="PlannedCoverageEntryRelationshipTypeCode" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RDb5E33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->reject(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6zbn8F9xEey5t-mahoHmrg" name="PlannedCoverageEntryRelationshipAct" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6zbn8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RDb5FH3sEeyivuDeOiJBMg" name="PlannedCoverageEntryRelationshipAct" constrainedElement="_O2I3AI9DEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RDb5FX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->reject(act->one(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(cda::Act)))</body>
         </specification>
@@ -20799,120 +20799,120 @@ A goal usually has a related health concern and/or risk.&#xD;
 A goal may have components consisting of other goals (milestones). These milestones are related to the overall goal through entryRelationships.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_viW8UF9xEey5t-mahoHmrg" name="GoalObservationTemplateId" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_viW8UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G5JPUn3sEeyivuDeOiJBMg" name="GoalObservationTemplateId" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G5J2YH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.121')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_viYKcF9xEey5t-mahoHmrg" name="GoalObservationClassCode" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_viYKcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G5LEgH3sEeyivuDeOiJBMg" name="GoalObservationClassCode" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G5LEgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_viZ_oF9xEey5t-mahoHmrg" name="GoalObservationMoodCode" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_viZ_oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G5MSoH3sEeyivuDeOiJBMg" name="GoalObservationMoodCode" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G5MSoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::GOL</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vib00F9xEey5t-mahoHmrg" name="GoalObservationId" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vib00V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G5NgwH3sEeyivuDeOiJBMg" name="GoalObservationId" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G5NgwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vieREF9xEey5t-mahoHmrg" name="GoalObservationCodeP" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vieREV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G5PV8H3sEeyivuDeOiJBMg" name="GoalObservationCodeP" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G5PV8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vidC8F9xEey5t-mahoHmrg" name="GoalObservationCode" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vidC8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G5OH0H3sEeyivuDeOiJBMg" name="GoalObservationCode" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G5OH0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vigGQF9xEey5t-mahoHmrg" name="GoalObservationStatusCode" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vigGQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G5QkEH3sEeyivuDeOiJBMg" name="GoalObservationStatusCode" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G5QkEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'active')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vihUYF9xEey5t-mahoHmrg" name="GoalObservationStatusCodeP" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vihUYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G5RyMH3sEeyivuDeOiJBMg" name="GoalObservationStatusCodeP" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G5RyMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_viiigF9xEey5t-mahoHmrg" name="GoalObservationEffectiveTime" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_viiigV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G5TAUH3sEeyivuDeOiJBMg" name="GoalObservationEffectiveTime" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G5TAUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vijwoF9xEey5t-mahoHmrg" name="GoalObservationValue" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vijwoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G5TnYH3sEeyivuDeOiJBMg" name="GoalObservationValue" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G5TnYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (( not self.value->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vjEuAF9xEey5t-mahoHmrg" name="GoalObservationGoalObservation" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vjEuAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G5vFMH3sEeyivuDeOiJBMg" name="GoalObservationGoalObservation" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G5vFMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::GoalObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vjp80F9xEey5t-mahoHmrg" name="GoalObservationActReferenceER" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vjp80V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G6It0H3sEeyivuDeOiJBMg" name="GoalObservationActReferenceER" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G6It0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EntryReference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xBaUQF9xEey5t-mahoHmrg" name="GoalObservationAuthorParticipation" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xBaUQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IP4YwH3sEeyivuDeOiJBMg" name="GoalObservationAuthorParticipation" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IP4YwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xB5ccF9xEey5t-mahoHmrg" name="GoalObservationHealthConcernActER" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xB5ccV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IQW54H3sEeyivuDeOiJBMg" name="GoalObservationHealthConcernActER" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IQW54X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EntryReference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xCWvcF9xEey5t-mahoHmrg" name="GoalObservationPriorityPreference" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xCWvcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IQxwoH3sEeyivuDeOiJBMg" name="GoalObservationPriorityPreference" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IQxwoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PriorityPreference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2NuoIF9xEey5t-mahoHmrg" name="GoalObservationPlannedERs" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2NuoIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M0biAH3sEeyivuDeOiJBMg" name="GoalObservationPlannedERs" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M0biAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EntryReference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4O9gEF9xEey5t-mahoHmrg" name="GoalObservationReference" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4O9gEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OjUswH3sEeyivuDeOiJBMg" name="GoalObservationReference" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OjUswX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->exists(reference : cda::Reference | not reference.oclIsUndefined() and reference.oclIsKindOf(cda::Reference))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6z7-QF9xEey5t-mahoHmrg" name="GoalObservationReferenceTypeCode" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6z7-QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RD7BQH3sEeyivuDeOiJBMg" name="GoalObservationReferenceTypeCode" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RD7BQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null)->reject(typeCode=vocab::x_ActRelationshipExternalReference::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6z7-Ql9xEey5t-mahoHmrg" name="GoalObservationReferenceExternalDocumentReference" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6z7-Q19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RD7BQn3sEeyivuDeOiJBMg" name="GoalObservationReferenceExternalDocumentReference" constrainedElement="_-miMII9TEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RD7BQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null)->reject(externalDocument->one(externalDocument : cda::ExternalDocument | not externalDocument.oclIsUndefined() and externalDocument.oclIsKindOf(consol::ExternalDocumentReference)))</body>
         </specification>
@@ -20920,59 +20920,59 @@ value.code = 'active')</body>
       <generalization xmi:id="_-miMIY9TEeOB0eBUISUB4Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_vjFVEF9xEey5t-mahoHmrg" name="getGoalObservations" bodyCondition="_vjFVE19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vjFVE19xEey5t-mahoHmrg" name="body" constrainedElement="_vjFVEF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vjFVFF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_G5vFMn3sEeyivuDeOiJBMg" name="getGoalObservations" bodyCondition="_G5vFNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_G5vFNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_G5vFMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_G5vFNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::GoalObservation)).oclAsType(consol::GoalObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vjFVEV9xEey5t-mahoHmrg" type="_-miMII9TEeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vjFVEl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_G5vFM33sEeyivuDeOiJBMg" type="_-miMII9TEeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G5vFNH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_vjp80l9xEey5t-mahoHmrg" name="getActReferenceERs" bodyCondition="_vjp81V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vjp81V9xEey5t-mahoHmrg" name="body" constrainedElement="_vjp80l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vjp81l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_G6It0n3sEeyivuDeOiJBMg" name="getActReferenceERs" bodyCondition="_G6JU4H3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_G6JU4H3sEeyivuDeOiJBMg" name="body" constrainedElement="_G6It0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_G6JU4X3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::EntryReference)).oclAsType(consol::EntryReference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vjp8019xEey5t-mahoHmrg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vjp81F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_G6It033sEeyivuDeOiJBMg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G6It1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_xB6DgF9xEey5t-mahoHmrg" name="getHealthConcernActERs" bodyCondition="_xB6Dg19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xB6Dg19xEey5t-mahoHmrg" name="body" constrainedElement="_xB6DgF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xB6DhF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_IQXg8H3sEeyivuDeOiJBMg" name="getHealthConcernActERs" bodyCondition="_IQXg833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_IQXg833sEeyivuDeOiJBMg" name="body" constrainedElement="_IQXg8H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_IQXg9H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::EntryReference)).oclAsType(consol::EntryReference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xB6DgV9xEey5t-mahoHmrg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xB6Dgl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_IQXg8X3sEeyivuDeOiJBMg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IQXg8n3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_xCWvcl9xEey5t-mahoHmrg" name="getPriorityPreference" bodyCondition="_xCWvdV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xCWvdV9xEey5t-mahoHmrg" name="body" constrainedElement="_xCWvcl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xCWvdl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_IQxwon3sEeyivuDeOiJBMg" name="getPriorityPreference" bodyCondition="_IQxwpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_IQxwpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_IQxwon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_IQxwpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PriorityPreference))->asSequence()->any(true).oclAsType(consol::PriorityPreference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xCWvc19xEey5t-mahoHmrg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xCWvdF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_IQxwo33sEeyivuDeOiJBMg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IQxwpH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2NvPMF9xEey5t-mahoHmrg" name="getPlannedERss" bodyCondition="_2NvPM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2NvPM19xEey5t-mahoHmrg" name="body" constrainedElement="_2NvPMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2NvPNF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M0biAn3sEeyivuDeOiJBMg" name="getPlannedERss" bodyCondition="_M0biBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M0biBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_M0biAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M0biBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::EntryReference)).oclAsType(consol::EntryReference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2NvPMV9xEey5t-mahoHmrg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2NvPMl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M0biA33sEeyivuDeOiJBMg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M0biBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -20994,282 +20994,282 @@ When the underlying condition is of concern (i.e., as long as the condition, whe
 Health concerns require intervention(s) to increase the likelihood of achieving the goals of care for the patient and they specify the condition oriented reasons for creating the plan.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_vjqj4F9xEey5t-mahoHmrg" name="HealthConcernActTemplateId" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vjqj4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G6JU4n3sEeyivuDeOiJBMg" name="HealthConcernActTemplateId" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G6JU433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.132' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vjsZEF9xEey5t-mahoHmrg" name="HealthConcernActClassCode" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vjsZEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G6KjAH3sEeyivuDeOiJBMg" name="HealthConcernActClassCode" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G6KjAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vjuOQF9xEey5t-mahoHmrg" name="HealthConcernActMoodCode" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vjuOQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G6LxIH3sEeyivuDeOiJBMg" name="HealthConcernActMoodCode" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G6LxIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vjwDcF9xEey5t-mahoHmrg" name="HealthConcernActId" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vjwDcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G6M_QH3sEeyivuDeOiJBMg" name="HealthConcernActId" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G6M_QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vjzGwF9xEey5t-mahoHmrg" name="HealthConcernActCodeP" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vjzt0F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G6O0cH3sEeyivuDeOiJBMg" name="HealthConcernActCodeP" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G6O0cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vjx4oF9xEey5t-mahoHmrg" name="HealthConcernActCode" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vjx4oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G6NmUH3sEeyivuDeOiJBMg" name="HealthConcernActCode" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G6NmUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '75310-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vj078F9xEey5t-mahoHmrg" name="HealthConcernActStatusCode" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vj078V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G6PbgH3sEeyivuDeOiJBMg" name="HealthConcernActStatusCode" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G6PbgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'active' or value.code = 'suspended' or value.code = 'aborted' or value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vkXHcF9xEey5t-mahoHmrg" name="HealthConcernActStatusCodeP" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vkXHcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G6q5UH3sEeyivuDeOiJBMg" name="HealthConcernActStatusCodeP" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G6q5UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vk1okF9xEey5t-mahoHmrg" name="HealthConcernActEffectiveTime" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vk1okV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G7FJAH3sEeyivuDeOiJBMg" name="HealthConcernActEffectiveTime" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G7FwEH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vlbecF9xEey5t-mahoHmrg" name="HealthConcernActHealthConcernActErRefr" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vlbecV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G7n7kH3sEeyivuDeOiJBMg" name="HealthConcernActHealthConcernActErRefr" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G7n7kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EntryReference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vl70wF9xEey5t-mahoHmrg" name="HealthConcernActHealthConcernActErComp" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vl70wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G8BkMH3sEeyivuDeOiJBMg" name="HealthConcernActHealthConcernActErComp" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G8BkMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EntryReference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vma88F9xEey5t-mahoHmrg" name="HealthConcernActAssessmentScaleObservation" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vma88V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G8bM0H3sEeyivuDeOiJBMg" name="HealthConcernActAssessmentScaleObservation" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G8bz4H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AssessmentScaleObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vm7TQF9xEey5t-mahoHmrg" name="HealthConcernActFamilyHistoryOrganizer2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vm7TQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G81cgH3sEeyivuDeOiJBMg" name="HealthConcernActFamilyHistoryOrganizer2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G81cgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.organizer.oclIsUndefined() and entryRelationship.organizer.oclIsKindOf(consol::FamilyHistoryOrganizer2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vnYmQF9xEey5t-mahoHmrg" name="HealthConcernActNutritionAssessment" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vnYmQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G9Q6UH3sEeyivuDeOiJBMg" name="HealthConcernActNutritionAssessment" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G9Q6UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::NutritionAssessment) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vn3ucF9xEey5t-mahoHmrg" name="HealthConcernActPregnancyObservation" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vn3ucV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G9rKAH3sEeyivuDeOiJBMg" name="HealthConcernActPregnancyObservation" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G9rKAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PregnancyObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_voVBcF9xEey5t-mahoHmrg" name="HealthConcernActCaregiverCharacteristics" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_voVBcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G-EyoH3sEeyivuDeOiJBMg" name="HealthConcernActCaregiverCharacteristics" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G-EyoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::CaregiverCharacteristics) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vo1XwF9xEey5t-mahoHmrg" name="HealthConcernActCulturalAndReligiousObservation" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vo1XwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G-fpYH3sEeyivuDeOiJBMg" name="HealthConcernActCulturalAndReligiousObservation" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G-fpYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::CulturalAndReligiousObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vpUf8F9xEey5t-mahoHmrg" name="HealthConcernActCharacteristicsOfHomeEnvironment" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vpUf8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G-5SAH3sEeyivuDeOiJBMg" name="HealthConcernActCharacteristicsOfHomeEnvironment" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G-5SAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::CharacteristicsOfHomeEnvironment) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vp0PMF9xEey5t-mahoHmrg" name="HealthConcernActNutritionalStatusObservation" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vp02QF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G_fu8H3sEeyivuDeOiJBMg" name="HealthConcernActNutritionalStatusObservation" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G_fu8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::NutritionalStatusObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vqSJQF9xEey5t-mahoHmrg" name="HealthConcernActEntryReferenceGeneral" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vqSJQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G_-QEH3sEeyivuDeOiJBMg" name="HealthConcernActEntryReferenceGeneral" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G_-QEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EntryReference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xDSjkF9xEey5t-mahoHmrg" name="HealthConcernActAuthorParticipation" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xDSjkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IRmQAH3sEeyivuDeOiJBMg" name="HealthConcernActAuthorParticipation" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IRmQAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xDyS0F9xEey5t-mahoHmrg" name="HealthConcernActSelfCareActivities" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xDyS0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ISAfsH3sEeyivuDeOiJBMg" name="HealthConcernActSelfCareActivities" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ISAfsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SelfCareActivities) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xEQM4F9xEey5t-mahoHmrg" name="HealthConcernActSensoryStatus" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xEQM4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ISavYH3sEeyivuDeOiJBMg" name="HealthConcernActSensoryStatus" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ISavYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SensoryStatus) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xEv8IF9xEey5t-mahoHmrg" name="HealthConcernActLongitudinalCareWoundObservation" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xEv8IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IS20QH3sEeyivuDeOiJBMg" name="HealthConcernActLongitudinalCareWoundObservation" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IS20QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::LongitudinalCareWoundObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xFMoEF9xEey5t-mahoHmrg" name="HealthConcernActPriorityPreference" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xFMoEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ITRD8H3sEeyivuDeOiJBMg" name="HealthConcernActPriorityPreference" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ITRD8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PriorityPreference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2OXhUF9xEey5t-mahoHmrg" name="HealthConcernActProblemObservation2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2OXhUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M07RQH3sEeyivuDeOiJBMg" name="HealthConcernActProblemObservation2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M07RQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2O33oF9xEey5t-mahoHmrg" name="HealthConcernActAllergyObservation2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2O33oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M1YkQH3sEeyivuDeOiJBMg" name="HealthConcernActAllergyObservation2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M1YkQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AllergyObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2PW_0F9xEey5t-mahoHmrg" name="HealthConcernActMentalStatusObservation2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2PW_0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M113QH3sEeyivuDeOiJBMg" name="HealthConcernActMentalStatusObservation2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M113QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::MentalStatusObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2P1g8F9xEey5t-mahoHmrg" name="HealthConcernActSmokingStatusMeaningfulUse2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2P1g8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M2SjMH3sEeyivuDeOiJBMg" name="HealthConcernActSmokingStatusMeaningfulUse2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M2SjMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SmokingStatusMeaningfulUse2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2QRl0F9xEey5t-mahoHmrg" name="HealthConcernActEncounterDiagnosis2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2QRl0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M2vPIH3sEeyivuDeOiJBMg" name="HealthConcernActEncounterDiagnosis2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M2vPIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EncounterDiagnosis2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2QxVEF9xEey5t-mahoHmrg" name="HealthConcernActFunctionalStatusObservation2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2QxVEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M3L7EH3sEeyivuDeOiJBMg" name="HealthConcernActFunctionalStatusObservation2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M3L7EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::FunctionalStatusObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2RMy4F9xEey5t-mahoHmrg" name="HealthConcernActHospitalAdmissionDiagnosis2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2RMy4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M3ljsH3sEeyivuDeOiJBMg" name="HealthConcernActHospitalAdmissionDiagnosis2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M3ljsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::HospitalAdmissionDiagnosis2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2RsiIF9xEey5t-mahoHmrg" name="HealthConcernActPostprocedureDiagnosis2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2RsiIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M4CPoH3sEeyivuDeOiJBMg" name="HealthConcernActPostprocedureDiagnosis2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M4CPoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::PostprocedureDiagnosis2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2SLDQF9xEey5t-mahoHmrg" name="HealthConcernActPreoperativeDiagnosis2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2SLDQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M4dtcH3sEeyivuDeOiJBMg" name="HealthConcernActPreoperativeDiagnosis2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M4dtcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::PreoperativeDiagnosis2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2SqLcF9xEey5t-mahoHmrg" name="HealthConcernActReactionObservation2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2SqLcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M481oH3sEeyivuDeOiJBMg" name="HealthConcernActReactionObservation2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M481oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ReactionObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2TLv4F9xEey5t-mahoHmrg" name="HealthConcernActResultObservation2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2TLv4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M5Y6gH3sEeyivuDeOiJBMg" name="HealthConcernActResultObservation2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M5Y6gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ResultObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2TsGMF9xEey5t-mahoHmrg" name="HealthConcernActSocialHistoryObservation2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2TsGMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M5zxQH3sEeyivuDeOiJBMg" name="HealthConcernActSocialHistoryObservation2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M5zxQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SocialHistoryObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2UIyIF9xEey5t-mahoHmrg" name="HealthConcernActSubstanceOrDeviceAllergyObservation2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2UJZMF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M6OoAH3sEeyivuDeOiJBMg" name="HealthConcernActSubstanceOrDeviceAllergyObservation2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M6OoAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SubstanceOrDeviceAllergyObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2UpIcF9xEey5t-mahoHmrg" name="HealthConcernActTobaccoUse2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2UpIcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M6pewH3sEeyivuDeOiJBMg" name="HealthConcernActTobaccoUse2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M6pewX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::TobaccoUse2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2VIQoF9xEey5t-mahoHmrg" name="HealthConcernActVitalSignObservation2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2VIQoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M7DHYH3sEeyivuDeOiJBMg" name="HealthConcernActVitalSignObservation2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M7DHYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::VitalSignObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2Vom8F9xEey5t-mahoHmrg" name="HealthConcernActProblemObservation2Support" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2Vom8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M7cwAH3sEeyivuDeOiJBMg" name="HealthConcernActProblemObservation2Support" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M7cwAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SPRT)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2WI9QF9xEey5t-mahoHmrg" name="HealthConcernActResultOrganizer2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2WI9QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M73mwH3sEeyivuDeOiJBMg" name="HealthConcernActResultOrganizer2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M73mwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.organizer.oclIsUndefined() and entryRelationship.organizer.oclIsKindOf(consol::ResultOrganizer2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2WpTkF9xEey5t-mahoHmrg" name="HealthConcernActProblemConcernAct2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2WpTkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M8SdgH3sEeyivuDeOiJBMg" name="HealthConcernActProblemConcernAct2" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M8TEkH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::ProblemConcernAct2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4P9loF9xEey5t-mahoHmrg" name="HealthConcernActReference" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4P9loV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OkJMIH3sEeyivuDeOiJBMg" name="HealthConcernActReference" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OkJMIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->exists(reference : cda::Reference | not reference.oclIsUndefined() and reference.oclIsKindOf(cda::Reference))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_61dBMF9xEey5t-mahoHmrg" name="HealthConcernActReferenceTypeCode" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_61dBMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RFSTMH3sEeyivuDeOiJBMg" name="HealthConcernActReferenceTypeCode" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RFSTMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null)->reject(typeCode=vocab::x_ActRelationshipExternalReference::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_61doQF9xEey5t-mahoHmrg" name="HealthConcernActReferenceExternalDocumentReference" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_61doQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RFS6QH3sEeyivuDeOiJBMg" name="HealthConcernActReferenceExternalDocumentReference" constrainedElement="_An8P8I9kEeOB0eBUISUB4Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RFS6QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null)->reject(externalDocument->one(externalDocument : cda::ExternalDocument | not externalDocument.oclIsUndefined() and externalDocument.oclIsKindOf(consol::ExternalDocumentReference)))</body>
         </specification>
@@ -21277,345 +21277,345 @@ value.code = 'active' or value.code = 'suspended' or value.code = 'aborted' or v
       <generalization xmi:id="_An8P8Y9kEeOB0eBUISUB4Q">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_vma88l9xEey5t-mahoHmrg" name="getAssessmentScaleObservations" bodyCondition="_vma89V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vma89V9xEey5t-mahoHmrg" name="body" constrainedElement="_vma88l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vma89l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_G8bz4X3sEeyivuDeOiJBMg" name="getAssessmentScaleObservations" bodyCondition="_G8bz5H3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_G8bz5H3sEeyivuDeOiJBMg" name="body" constrainedElement="_G8bz4X3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_G8bz5X3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AssessmentScaleObservation)).oclAsType(consol::AssessmentScaleObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vma8819xEey5t-mahoHmrg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vma89F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_G8bz4n3sEeyivuDeOiJBMg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G8bz433sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_vm7TQl9xEey5t-mahoHmrg" name="getFamilyHistoryOrganizer2s" bodyCondition="_vm7TRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vm7TRV9xEey5t-mahoHmrg" name="body" constrainedElement="_vm7TQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vm7TRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_G81cgn3sEeyivuDeOiJBMg" name="getFamilyHistoryOrganizer2s" bodyCondition="_G81chX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_G81chX3sEeyivuDeOiJBMg" name="body" constrainedElement="_G81cgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_G81chn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::FamilyHistoryOrganizer2)).oclAsType(consol::FamilyHistoryOrganizer2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vm7TQ19xEey5t-mahoHmrg" type="_6whQEIbpEeSxzopshBnQuw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vm7TRF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_G81cg33sEeyivuDeOiJBMg" type="_6whQEIbpEeSxzopshBnQuw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G81chH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_vnZNUF9xEey5t-mahoHmrg" name="getNutritionAssessments" bodyCondition="_vnZNU19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vnZNU19xEey5t-mahoHmrg" name="body" constrainedElement="_vnZNUF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vnZNVF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_G9Q6Un3sEeyivuDeOiJBMg" name="getNutritionAssessments" bodyCondition="_G9RhYn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_G9RhYn3sEeyivuDeOiJBMg" name="body" constrainedElement="_G9Q6Un3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_G9RhY33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::NutritionAssessment)).oclAsType(consol::NutritionAssessment)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vnZNUV9xEey5t-mahoHmrg" type="_NP5zMI05EeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vnZNUl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_G9RhYH3sEeyivuDeOiJBMg" type="_NP5zMI05EeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G9RhYX3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_vn3ucl9xEey5t-mahoHmrg" name="getPregnancyObservations" bodyCondition="_vn3udV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vn3udV9xEey5t-mahoHmrg" name="body" constrainedElement="_vn3ucl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vn3udl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_G9rKAn3sEeyivuDeOiJBMg" name="getPregnancyObservations" bodyCondition="_G9rKBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_G9rKBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_G9rKAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_G9rKBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PregnancyObservation)).oclAsType(consol::PregnancyObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vn3uc19xEey5t-mahoHmrg" type="_2N6soBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vn3udF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_G9rKA33sEeyivuDeOiJBMg" type="_2N6soBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G9rKBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_voVogF9xEey5t-mahoHmrg" name="getCaregiverCharacteristicss" bodyCondition="_voVog19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_voVog19xEey5t-mahoHmrg" name="body" constrainedElement="_voVogF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_voVohF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_G-FZsH3sEeyivuDeOiJBMg" name="getCaregiverCharacteristicss" bodyCondition="_G-FZs33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_G-FZs33sEeyivuDeOiJBMg" name="body" constrainedElement="_G-FZsH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_G-FZtH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CaregiverCharacteristics)).oclAsType(consol::CaregiverCharacteristics)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_voVogV9xEey5t-mahoHmrg" type="__pNCUOY-EeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_voVogl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_G-FZsX3sEeyivuDeOiJBMg" type="__pNCUOY-EeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G-FZsn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_vo1Xwl9xEey5t-mahoHmrg" name="getCulturalAndReligiousObservations" bodyCondition="_vo1XxV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vo1XxV9xEey5t-mahoHmrg" name="body" constrainedElement="_vo1Xwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vo1Xxl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_G-fpYn3sEeyivuDeOiJBMg" name="getCulturalAndReligiousObservations" bodyCondition="_G-fpZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_G-fpZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_G-fpYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_G-fpZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CulturalAndReligiousObservation)).oclAsType(consol::CulturalAndReligiousObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vo1Xw19xEey5t-mahoHmrg" type="_H2EzIIqZEeOoMZgUoTghIg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vo1XxF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_G-fpY33sEeyivuDeOiJBMg" type="_H2EzIIqZEeOoMZgUoTghIg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G-fpZH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_vpUf8l9xEey5t-mahoHmrg" name="getCharacteristicsOfHomeEnvironments" bodyCondition="_vpUf9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vpUf9V9xEey5t-mahoHmrg" name="body" constrainedElement="_vpUf8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vpVHAF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_G-5SAn3sEeyivuDeOiJBMg" name="getCharacteristicsOfHomeEnvironments" bodyCondition="_G-5SBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_G-5SBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_G-5SAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_G-5SBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CharacteristicsOfHomeEnvironment)).oclAsType(consol::CharacteristicsOfHomeEnvironment)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vpUf819xEey5t-mahoHmrg" type="_O-O-IInUEeOJGtGyq_dBbA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vpUf9F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_G-5SA33sEeyivuDeOiJBMg" type="_O-O-IInUEeOJGtGyq_dBbA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G-5SBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_vp02QV9xEey5t-mahoHmrg" name="getNutritionalStatusObservations" bodyCondition="_vp02RF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vp02RF9xEey5t-mahoHmrg" name="body" constrainedElement="_vp02QV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vp02RV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_G_fu8n3sEeyivuDeOiJBMg" name="getNutritionalStatusObservations" bodyCondition="_G_fu9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_G_fu9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_G_fu8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_G_fu9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::NutritionalStatusObservation)).oclAsType(consol::NutritionalStatusObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vp02Ql9xEey5t-mahoHmrg" type="_T1dcwI37EeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vp02Q19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_G_fu833sEeyivuDeOiJBMg" type="_T1dcwI37EeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G_fu9H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_vqSJQl9xEey5t-mahoHmrg" name="getEntryReferenceGenerals" bodyCondition="_vqSJRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vqSJRV9xEey5t-mahoHmrg" name="body" constrainedElement="_vqSJQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vqSwUF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_G_-3IH3sEeyivuDeOiJBMg" name="getEntryReferenceGenerals" bodyCondition="_G_-3I33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_G_-3I33sEeyivuDeOiJBMg" name="body" constrainedElement="_G_-3IH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_G_-3JH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::EntryReference)).oclAsType(consol::EntryReference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vqSJQ19xEey5t-mahoHmrg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vqSJRF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_G_-3IX3sEeyivuDeOiJBMg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G_-3In3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_xDyS0l9xEey5t-mahoHmrg" name="getSelfCareActivitiess" bodyCondition="_xDyS1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xDyS1V9xEey5t-mahoHmrg" name="body" constrainedElement="_xDyS0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xDyS1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_ISAfsn3sEeyivuDeOiJBMg" name="getSelfCareActivitiess" bodyCondition="_ISAftX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ISAftX3sEeyivuDeOiJBMg" name="body" constrainedElement="_ISAfsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ISAftn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SelfCareActivities)).oclAsType(consol::SelfCareActivities)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xDyS019xEey5t-mahoHmrg" type="_nC0xUJmzEeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xDyS1F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_ISAfs33sEeyivuDeOiJBMg" type="_nC0xUJmzEeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ISAftH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_xEQM4l9xEey5t-mahoHmrg" name="getSensoryStatuss" bodyCondition="_xEQM5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xEQM5V9xEey5t-mahoHmrg" name="body" constrainedElement="_xEQM4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xEQM5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_ISbWcH3sEeyivuDeOiJBMg" name="getSensoryStatuss" bodyCondition="_ISbWc33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ISbWc33sEeyivuDeOiJBMg" name="body" constrainedElement="_ISbWcH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ISbWdH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SensoryStatus)).oclAsType(consol::SensoryStatus)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xEQM419xEey5t-mahoHmrg" type="_kyeGAJm4EeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xEQM5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_ISbWcX3sEeyivuDeOiJBMg" type="_kyeGAJm4EeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ISbWcn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_xEv8Il9xEey5t-mahoHmrg" name="getLongitudinalCareWoundObservations" bodyCondition="_xEv8JV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xEv8JV9xEey5t-mahoHmrg" name="body" constrainedElement="_xEv8Il9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xEv8Jl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_IS20Qn3sEeyivuDeOiJBMg" name="getLongitudinalCareWoundObservations" bodyCondition="_IS20RX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_IS20RX3sEeyivuDeOiJBMg" name="body" constrainedElement="_IS20Qn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_IS20Rn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::LongitudinalCareWoundObservation)).oclAsType(consol::LongitudinalCareWoundObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xEv8I19xEey5t-mahoHmrg" type="_09uFMJp_EeOK6dzbL4VoTA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xEv8JF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_IS20Q33sEeyivuDeOiJBMg" type="_09uFMJp_EeOK6dzbL4VoTA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IS20RH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_xFMoEl9xEey5t-mahoHmrg" name="getPriorityPreferences" bodyCondition="_xFMoFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xFMoFV9xEey5t-mahoHmrg" name="body" constrainedElement="_xFMoEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xFMoFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_ITRD8n3sEeyivuDeOiJBMg" name="getPriorityPreferences" bodyCondition="_ITRD9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ITRD9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_ITRD8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ITRD9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PriorityPreference)).oclAsType(consol::PriorityPreference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xFMoE19xEey5t-mahoHmrg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xFMoFF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_ITRD833sEeyivuDeOiJBMg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ITRD9H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2OXhUl9xEey5t-mahoHmrg" name="getProblemObservation2s" bodyCondition="_2OYIYV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2OYIYV9xEey5t-mahoHmrg" name="body" constrainedElement="_2OXhUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2OYIYl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M07RQn3sEeyivuDeOiJBMg" name="getProblemObservation2s" bodyCondition="_M07RRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M07RRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_M07RQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M07RRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation2)).oclAsType(consol::ProblemObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2OXhU19xEey5t-mahoHmrg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2OYIYF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M07RQ33sEeyivuDeOiJBMg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M07RRH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2O33ol9xEey5t-mahoHmrg" name="getAllergyObservation2s" bodyCondition="_2O33pV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2O33pV9xEey5t-mahoHmrg" name="body" constrainedElement="_2O33ol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2O33pl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M1YkQn3sEeyivuDeOiJBMg" name="getAllergyObservation2s" bodyCondition="_M1YkRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M1YkRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_M1YkQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M1YkRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AllergyObservation2)).oclAsType(consol::AllergyObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2O33o19xEey5t-mahoHmrg" type="_uVJogLj5EeODDJAC5t5vpw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2O33pF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M1YkQ33sEeyivuDeOiJBMg" type="_uVJogLj5EeODDJAC5t5vpw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M1YkRH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2PXm4F9xEey5t-mahoHmrg" name="getMentalStatusObservation2s" bodyCondition="_2PXm419xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2PXm419xEey5t-mahoHmrg" name="body" constrainedElement="_2PXm4F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2PXm5F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M113Qn3sEeyivuDeOiJBMg" name="getMentalStatusObservation2s" bodyCondition="_M113RX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M113RX3sEeyivuDeOiJBMg" name="body" constrainedElement="_M113Qn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M113Rn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::MentalStatusObservation2)).oclAsType(consol::MentalStatusObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2PXm4V9xEey5t-mahoHmrg" type="_ze150PitEeOXlK95I8tUew" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PXm4l9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M113Q33sEeyivuDeOiJBMg" type="_ze150PitEeOXlK95I8tUew" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M113RH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2P2IAF9xEey5t-mahoHmrg" name="getSmokingStatusMeaningfulUse2s" bodyCondition="_2P2IA19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2P2IA19xEey5t-mahoHmrg" name="body" constrainedElement="_2P2IAF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2P2IBF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M2SjMn3sEeyivuDeOiJBMg" name="getSmokingStatusMeaningfulUse2s" bodyCondition="_M2SjNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M2SjNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_M2SjMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M2SjNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SmokingStatusMeaningfulUse2)).oclAsType(consol::SmokingStatusMeaningfulUse2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2P2IAV9xEey5t-mahoHmrg" type="_Hl3ScLk0EeODDJAC5t5vpw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2P2IAl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M2SjM33sEeyivuDeOiJBMg" type="_Hl3ScLk0EeODDJAC5t5vpw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M2SjNH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2QRl0l9xEey5t-mahoHmrg" name="getEncounterDiagnosis2s" bodyCondition="_2QRl1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2QRl1V9xEey5t-mahoHmrg" name="body" constrainedElement="_2QRl0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2QRl1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M2v2MH3sEeyivuDeOiJBMg" name="getEncounterDiagnosis2s" bodyCondition="_M2v2M33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M2v2M33sEeyivuDeOiJBMg" name="body" constrainedElement="_M2v2MH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M2v2NH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::EncounterDiagnosis2)).oclAsType(consol::EncounterDiagnosis2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2QRl019xEey5t-mahoHmrg" type="_jH6CcMzNEeO93sHu8pHB2g" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2QRl1F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M2v2MX3sEeyivuDeOiJBMg" type="_jH6CcMzNEeO93sHu8pHB2g" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M2v2Mn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2QxVEl9xEey5t-mahoHmrg" name="getFunctionalStatusObservation2s" bodyCondition="_2QxVFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2QxVFV9xEey5t-mahoHmrg" name="body" constrainedElement="_2QxVEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2QxVFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M3MiIH3sEeyivuDeOiJBMg" name="getFunctionalStatusObservation2s" bodyCondition="_M3MiI33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M3MiI33sEeyivuDeOiJBMg" name="body" constrainedElement="_M3MiIH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M3MiJH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::FunctionalStatusObservation2)).oclAsType(consol::FunctionalStatusObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2QxVE19xEey5t-mahoHmrg" type="_3WqogMzSEeO93sHu8pHB2g" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2QxVFF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M3MiIX3sEeyivuDeOiJBMg" type="_3WqogMzSEeO93sHu8pHB2g" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M3MiIn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2RMy4l9xEey5t-mahoHmrg" name="getHospitalAdmissionDiagnosis2s" bodyCondition="_2RMy5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2RMy5V9xEey5t-mahoHmrg" name="body" constrainedElement="_2RMy4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2RMy5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M3mKwH3sEeyivuDeOiJBMg" name="getHospitalAdmissionDiagnosis2s" bodyCondition="_M3mKw33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M3mKw33sEeyivuDeOiJBMg" name="body" constrainedElement="_M3mKwH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M3mKxH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::HospitalAdmissionDiagnosis2)).oclAsType(consol::HospitalAdmissionDiagnosis2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2RMy419xEey5t-mahoHmrg" type="_GM6icOEIEeOmBMTtnrPqww" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2RMy5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M3mKwX3sEeyivuDeOiJBMg" type="_GM6icOEIEeOmBMTtnrPqww" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M3mKwn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2RtJMF9xEey5t-mahoHmrg" name="getPostprocedureDiagnosis2s" bodyCondition="_2RtJM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2RtJM19xEey5t-mahoHmrg" name="body" constrainedElement="_2RtJMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2RtJNF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M4CPon3sEeyivuDeOiJBMg" name="getPostprocedureDiagnosis2s" bodyCondition="_M4C2sX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M4C2sX3sEeyivuDeOiJBMg" name="body" constrainedElement="_M4CPon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M4C2sn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PostprocedureDiagnosis2)).oclAsType(consol::PostprocedureDiagnosis2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2RtJMV9xEey5t-mahoHmrg" type="__SgUwOwuEeOqa975IP2wug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2RtJMl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M4CPo33sEeyivuDeOiJBMg" type="__SgUwOwuEeOqa975IP2wug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M4C2sH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2SLDQl9xEey5t-mahoHmrg" name="getPreoperativeDiagnosis2s" bodyCondition="_2SLDRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2SLDRV9xEey5t-mahoHmrg" name="body" constrainedElement="_2SLDQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2SLDRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M4dtcn3sEeyivuDeOiJBMg" name="getPreoperativeDiagnosis2s" bodyCondition="_M4dtdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M4dtdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_M4dtcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M4dtdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PreoperativeDiagnosis2)).oclAsType(consol::PreoperativeDiagnosis2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2SLDQ19xEey5t-mahoHmrg" type="_5l3g0OzYEeOnE-G4kptBiw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2SLDRF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M4dtc33sEeyivuDeOiJBMg" type="_5l3g0OzYEeOnE-G4kptBiw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M4dtdH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2SqLcl9xEey5t-mahoHmrg" name="getReactionObservation2s" bodyCondition="_2SqygV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2SqygV9xEey5t-mahoHmrg" name="body" constrainedElement="_2SqLcl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2Sqygl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M481on3sEeyivuDeOiJBMg" name="getReactionObservation2s" bodyCondition="_M481pX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M481pX3sEeyivuDeOiJBMg" name="body" constrainedElement="_M481on3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M481pn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ReactionObservation2)).oclAsType(consol::ReactionObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2SqLc19xEey5t-mahoHmrg" type="_U3yosPDxEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2SqygF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M481o33sEeyivuDeOiJBMg" type="_U3yosPDxEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M481pH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2TLv4l9xEey5t-mahoHmrg" name="getResultObservation2s" bodyCondition="_2TMW8F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2TMW8F9xEey5t-mahoHmrg" name="body" constrainedElement="_2TLv4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2TMW8V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M5ZhkH3sEeyivuDeOiJBMg" name="getResultObservation2s" bodyCondition="_M5Zhk33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M5Zhk33sEeyivuDeOiJBMg" name="body" constrainedElement="_M5ZhkH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M5ZhlH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ResultObservation2)).oclAsType(consol::ResultObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2TLv419xEey5t-mahoHmrg" type="_H85E0PF7EeOmsLWmq5fnqQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2TLv5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M5ZhkX3sEeyivuDeOiJBMg" type="_H85E0PF7EeOmsLWmq5fnqQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M5Zhkn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2TsGMl9xEey5t-mahoHmrg" name="getSocialHistoryObservation2s" bodyCondition="_2TsGNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2TsGNV9xEey5t-mahoHmrg" name="body" constrainedElement="_2TsGMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2TsGNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M5zxQn3sEeyivuDeOiJBMg" name="getSocialHistoryObservation2s" bodyCondition="_M5zxRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M5zxRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_M5zxQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M5zxRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SocialHistoryObservation2)).oclAsType(consol::SocialHistoryObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2TsGM19xEey5t-mahoHmrg" type="_b_iGIPJfEeO2NaSiicarcg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2TsGNF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M5zxQ33sEeyivuDeOiJBMg" type="_b_iGIPJfEeO2NaSiicarcg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M5zxRH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2UJZMV9xEey5t-mahoHmrg" name="getSubstanceOrDeviceAllergyObservation2s" bodyCondition="_2UJZNF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2UJZNF9xEey5t-mahoHmrg" name="body" constrainedElement="_2UJZMV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2UJZNV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M6PPEH3sEeyivuDeOiJBMg" name="getSubstanceOrDeviceAllergyObservation2s" bodyCondition="_M6PPE33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M6PPE33sEeyivuDeOiJBMg" name="body" constrainedElement="_M6PPEH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M6PPFH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SubstanceOrDeviceAllergyObservation2)).oclAsType(consol::SubstanceOrDeviceAllergyObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2UJZMl9xEey5t-mahoHmrg" type="_K3M6IPKJEeOn7bMsPcStOw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2UJZM19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M6PPEX3sEeyivuDeOiJBMg" type="_K3M6IPKJEeOn7bMsPcStOw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M6PPEn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2UpvgF9xEey5t-mahoHmrg" name="getTobaccoUse2s" bodyCondition="_2Upvg19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2Upvg19xEey5t-mahoHmrg" name="body" constrainedElement="_2UpvgF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2UpvhF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M6pewn3sEeyivuDeOiJBMg" name="getTobaccoUse2s" bodyCondition="_M6pexX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M6pexX3sEeyivuDeOiJBMg" name="body" constrainedElement="_M6pewn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M6pexn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::TobaccoUse2)).oclAsType(consol::TobaccoUse2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2UpvgV9xEey5t-mahoHmrg" type="_qHUXwPMxEeOUvapeh9bVvQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Upvgl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M6pew33sEeyivuDeOiJBMg" type="_qHUXwPMxEeOUvapeh9bVvQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M6pexH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2VI3sF9xEey5t-mahoHmrg" name="getVitalSignObservation2s" bodyCondition="_2VI3s19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2VI3s19xEey5t-mahoHmrg" name="body" constrainedElement="_2VI3sF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2VI3tF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M7DHYn3sEeyivuDeOiJBMg" name="getVitalSignObservation2s" bodyCondition="_M7DHZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M7DHZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_M7DHYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M7DHZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::VitalSignObservation2)).oclAsType(consol::VitalSignObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2VI3sV9xEey5t-mahoHmrg" type="__zeTcPM3EeOUvapeh9bVvQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2VI3sl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M7DHY33sEeyivuDeOiJBMg" type="__zeTcPM3EeOUvapeh9bVvQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M7DHZH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2Vom8l9xEey5t-mahoHmrg" name="getProblemObservation2Supports" bodyCondition="_2Vom9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2Vom9V9xEey5t-mahoHmrg" name="body" constrainedElement="_2Vom8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2Vom9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M7cwAn3sEeyivuDeOiJBMg" name="getProblemObservation2Supports" bodyCondition="_M7cwBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M7cwBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_M7cwAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M7cwBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation2)).oclAsType(consol::ProblemObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2Vom819xEey5t-mahoHmrg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Vom9F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M7cwA33sEeyivuDeOiJBMg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M7cwBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2WI9Ql9xEey5t-mahoHmrg" name="getResultOrganizer2s" bodyCondition="_2WI9RV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2WI9RV9xEey5t-mahoHmrg" name="body" constrainedElement="_2WI9Ql9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2WI9Rl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M73mwn3sEeyivuDeOiJBMg" name="getResultOrganizer2s" bodyCondition="_M73mxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M73mxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_M73mwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M73mxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::ResultOrganizer2)).oclAsType(consol::ResultOrganizer2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2WI9Q19xEey5t-mahoHmrg" type="_gU40UPGEEeOmsLWmq5fnqQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2WI9RF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M73mw33sEeyivuDeOiJBMg" type="_gU40UPGEEeOmsLWmq5fnqQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M73mxH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2WpTkl9xEey5t-mahoHmrg" name="getProblemConcernAct2s" bodyCondition="_2WpTlV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2WpTlV9xEey5t-mahoHmrg" name="body" constrainedElement="_2WpTkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2WpTll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M8TEkX3sEeyivuDeOiJBMg" name="getProblemConcernAct2s" bodyCondition="_M8TElH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M8TElH3sEeyivuDeOiJBMg" name="body" constrainedElement="_M8TEkX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M8TElX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::ProblemConcernAct2)).oclAsType(consol::ProblemConcernAct2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2WpTk19xEey5t-mahoHmrg" type="_y5C8IOzbEeOnE-G4kptBiw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2WpTlF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M8TEkn3sEeyivuDeOiJBMg" type="_y5C8IOzbEeOnE-G4kptBiw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M8TEk33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -21634,174 +21634,174 @@ Intervention Acts can be related to each other, or to Planned Intervention Acts
 All interventions referenced in an Intervention Act must have a moodCode of EVN, indicating that they have occurred.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_vqSwUV9xEey5t-mahoHmrg" name="InterventionActTemplateId" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vqSwUl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_G_-3JX3sEeyivuDeOiJBMg" name="InterventionActTemplateId" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_G_-3Jn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.131' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vqUlgF9xEey5t-mahoHmrg" name="InterventionActClassCode" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vqUlgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HAAFQH3sEeyivuDeOiJBMg" name="InterventionActClassCode" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HAAFQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vqWasF9xEey5t-mahoHmrg" name="InterventionActMoodCode" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vqWasV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HAB6cH3sEeyivuDeOiJBMg" name="InterventionActMoodCode" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HAB6cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vqXo0F9xEey5t-mahoHmrg" name="InterventionActId" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vqXo0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HADIkH3sEeyivuDeOiJBMg" name="InterventionActId" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HADIkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vqZeAF9xEey5t-mahoHmrg" name="InterventionActCodeP" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vqZeAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HAE9wH3sEeyivuDeOiJBMg" name="InterventionActCodeP" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HAE9wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vqYP4F9xEey5t-mahoHmrg" name="InterventionActCode" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vqYP4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HADvoH3sEeyivuDeOiJBMg" name="InterventionActCode" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HADvoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '362956003' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vqasIF9xEey5t-mahoHmrg" name="InterventionActStatusCode" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vqasIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HAGL4H3sEeyivuDeOiJBMg" name="InterventionActStatusCode" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HAGL4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vqb6QF9xEey5t-mahoHmrg" name="InterventionActStatusCodeP" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vqb6QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HAHaAH3sEeyivuDeOiJBMg" name="InterventionActStatusCodeP" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HAHaAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vqdIYF9xEey5t-mahoHmrg" name="InterventionActEffectiveTime" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vqdIYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HAIoIH3sEeyivuDeOiJBMg" name="InterventionActEffectiveTime" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HAIoIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vq_68F9xEey5t-mahoHmrg" name="InterventionActInterventionAct" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vq_68V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HArasH3sEeyivuDeOiJBMg" name="InterventionActInterventionAct" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HArasX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::InterventionAct) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vrfqMF9xEey5t-mahoHmrg" name="InterventionActNutritionRecommendation" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vrfqMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HBR3oH3sEeyivuDeOiJBMg" name="InterventionActNutritionRecommendation" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HBR3oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::NutritionRecommendation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vr_ZcF9xEey5t-mahoHmrg" name="InterventionActInterventionEntryReference" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vr_ZcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HBw_0H3sEeyivuDeOiJBMg" name="InterventionActInterventionEntryReference" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HBw_0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EntryReference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vsfIsF9xEey5t-mahoHmrg" name="InterventionActGoalObsEntryReference" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vsfIsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HCPg8H3sEeyivuDeOiJBMg" name="InterventionActGoalObsEntryReference" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HCPg8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EntryReference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xF0TIF9xEey5t-mahoHmrg" name="InterventionActAuthorParticipation" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xF0TIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ITrToH3sEeyivuDeOiJBMg" name="InterventionActAuthorParticipation" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ITrToX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2XIbwF9xEey5t-mahoHmrg" name="InterventionActAdvanceDirectiveObservation2" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2XIbwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M8yMwH3sEeyivuDeOiJBMg" name="InterventionActAdvanceDirectiveObservation2" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M8yMwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AdvanceDirectiveObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2XoLAF9xEey5t-mahoHmrg" name="InterventionActImmunizationActivity2" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2XoLAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M9ORoH3sEeyivuDeOiJBMg" name="InterventionActImmunizationActivity2" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M9O4sH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::ImmunizationActivity2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2YIhUF9xEey5t-mahoHmrg" name="InterventionActMedicationActivity2" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2YIhUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M9pvcH3sEeyivuDeOiJBMg" name="InterventionActMedicationActivity2" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M9pvcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::MedicationActivity2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2Yo3oF9xEey5t-mahoHmrg" name="InterventionActProcedureActivityAct2" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2Yo3oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M-FNQH3sEeyivuDeOiJBMg" name="InterventionActProcedureActivityAct2" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M-FNQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::ProcedureActivityAct2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2ZFjkF9xEey5t-mahoHmrg" name="InterventionActProcedureActivityObservation2" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2ZFjkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M-e14H3sEeyivuDeOiJBMg" name="InterventionActProcedureActivityObservation2" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M-fc8H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProcedureActivityObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2ZkrwF9xEey5t-mahoHmrg" name="InterventionActProcedureActivityProcedure2" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2ZkrwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M-6TsH3sEeyivuDeOiJBMg" name="InterventionActProcedureActivityProcedure2" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M-6TsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.procedure.oclIsUndefined() and entryRelationship.procedure.oclIsKindOf(consol::ProcedureActivityProcedure2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2aBXsF9xEey5t-mahoHmrg" name="InterventionActEncounterActivity2" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2aBXsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M_T8UH3sEeyivuDeOiJBMg" name="InterventionActEncounterActivity2" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M_T8UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.encounter.oclIsUndefined() and entryRelationship.encounter.oclIsKindOf(consol::EncounterActivity2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2agf4F9xEey5t-mahoHmrg" name="InterventionActNonMedicinalSupplyActivity2" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2agf4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_M_xPUH3sEeyivuDeOiJBMg" name="InterventionActNonMedicinalSupplyActivity2" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_M_xPUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::NonMedicinalSupplyActivity2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2a9y4F9xEey5t-mahoHmrg" name="InterventionActInstruction2" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2a9y4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NANUMH3sEeyivuDeOiJBMg" name="InterventionActInstruction2" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NANUMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instruction2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4RLGkF9xEey5t-mahoHmrg" name="InterventionActHandoffCommunicationParticipants" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4RLGkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ok9EcH3sEeyivuDeOiJBMg" name="InterventionActHandoffCommunicationParticipants" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ok9EcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::HandoffCommunicationParticipants) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4Rrc4F9xEey5t-mahoHmrg" name="InterventionActPlannedInterventionAct" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4RsD8F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OlWtEH3sEeyivuDeOiJBMg" name="InterventionActPlannedInterventionAct" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OlWtEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::PlannedInterventionAct) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4SLMIF9xEey5t-mahoHmrg" name="InterventionActReference" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4SLMIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Olw8wH3sEeyivuDeOiJBMg" name="InterventionActReference" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Olw8wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->exists(reference : cda::Reference | not reference.oclIsUndefined() and reference.oclIsKindOf(cda::Reference))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_62bRkF9xEey5t-mahoHmrg" name="InterventionActReferenceTypeCode" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_62bRkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RGJO0H3sEeyivuDeOiJBMg" name="InterventionActReferenceTypeCode" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RGJO0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null)->reject(typeCode=vocab::x_ActRelationshipExternalReference::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_62bRkl9xEey5t-mahoHmrg" name="InterventionActReferenceExternalDocumentReference" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_62bRk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RGJO0n3sEeyivuDeOiJBMg" name="InterventionActReferenceExternalDocumentReference" constrainedElement="_XD5vgJA8EeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RGJO033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null)->reject(externalDocument->one(externalDocument : cda::ExternalDocument | not externalDocument.oclIsUndefined() and externalDocument.oclIsKindOf(consol::ExternalDocumentReference)))</body>
         </specification>
@@ -21809,158 +21809,158 @@ value.code = 'completed')</body>
       <generalization xmi:id="_XENRgJA8EeOZX935IVJfOg">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_vq_68l9xEey5t-mahoHmrg" name="getInterventionActs" bodyCondition="_vq_69V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vq_69V9xEey5t-mahoHmrg" name="body" constrainedElement="_vq_68l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vq_69l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_HArasn3sEeyivuDeOiJBMg" name="getInterventionActs" bodyCondition="_HAratX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_HAratX3sEeyivuDeOiJBMg" name="body" constrainedElement="_HArasn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_HAratn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::InterventionAct)).oclAsType(consol::InterventionAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vq_6819xEey5t-mahoHmrg" type="_XD5vgJA8EeOZX935IVJfOg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vq_69F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_HAras33sEeyivuDeOiJBMg" type="_XD5vgJA8EeOZX935IVJfOg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HAratH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_vrfqMl9xEey5t-mahoHmrg" name="getNutritionRecommendations" bodyCondition="_vrfqNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vrfqNV9xEey5t-mahoHmrg" name="body" constrainedElement="_vrfqMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vrfqNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_HBSesH3sEeyivuDeOiJBMg" name="getNutritionRecommendations" bodyCondition="_HBSes33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_HBSes33sEeyivuDeOiJBMg" name="body" constrainedElement="_HBSesH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_HBSetH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::NutritionRecommendation)).oclAsType(consol::NutritionRecommendation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vrfqM19xEey5t-mahoHmrg" type="_FhAIMI3FEeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vrfqNF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_HBSesX3sEeyivuDeOiJBMg" type="_FhAIMI3FEeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HBSesn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_vr_Zcl9xEey5t-mahoHmrg" name="getInterventionEntryReferences" bodyCondition="_vr_ZdV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_vr_ZdV9xEey5t-mahoHmrg" name="body" constrainedElement="_vr_Zcl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_vr_Zdl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_HBw_0n3sEeyivuDeOiJBMg" name="getInterventionEntryReferences" bodyCondition="_HBw_1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_HBw_1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_HBw_0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_HBw_1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::EntryReference)).oclAsType(consol::EntryReference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_vr_Zc19xEey5t-mahoHmrg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vr_ZdF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_HBw_033sEeyivuDeOiJBMg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HBw_1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2XIbwl9xEey5t-mahoHmrg" name="getAdvanceDirectiveObservation2s" bodyCondition="_2XIbxV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2XIbxV9xEey5t-mahoHmrg" name="body" constrainedElement="_2XIbwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2XIbxl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M8yz0H3sEeyivuDeOiJBMg" name="getAdvanceDirectiveObservation2s" bodyCondition="_M8yz033sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M8yz033sEeyivuDeOiJBMg" name="body" constrainedElement="_M8yz0H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M8yz1H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AdvanceDirectiveObservation2)).oclAsType(consol::AdvanceDirectiveObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2XIbw19xEey5t-mahoHmrg" type="_GnllUK-9EeO8duI_7f6kZw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2XIbxF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M8yz0X3sEeyivuDeOiJBMg" type="_GnllUK-9EeO8duI_7f6kZw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M8yz0n3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2XoyEF9xEey5t-mahoHmrg" name="getImmunizationActivity2s" bodyCondition="_2XoyE19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2XoyE19xEey5t-mahoHmrg" name="body" constrainedElement="_2XoyEF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2XoyFF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M9O4sX3sEeyivuDeOiJBMg" name="getImmunizationActivity2s" bodyCondition="_M9O4tH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M9O4tH3sEeyivuDeOiJBMg" name="body" constrainedElement="_M9O4sX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M9O4tX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::ImmunizationActivity2)).oclAsType(consol::ImmunizationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2XoyEV9xEey5t-mahoHmrg" type="_zI6vcOE7EeOTq9XEMvvkWw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2XoyEl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M9O4sn3sEeyivuDeOiJBMg" type="_zI6vcOE7EeOTq9XEMvvkWw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M9O4s33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2YIhUl9xEey5t-mahoHmrg" name="getMedicationActivity2s" bodyCondition="_2YIhVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2YIhVV9xEey5t-mahoHmrg" name="body" constrainedElement="_2YIhUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2YIhVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M9pvcn3sEeyivuDeOiJBMg" name="getMedicationActivity2s" bodyCondition="_M9pvdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M9pvdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_M9pvcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M9pvdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity2)).oclAsType(consol::MedicationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2YIhU19xEey5t-mahoHmrg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2YIhVF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M9pvc33sEeyivuDeOiJBMg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M9pvdH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2Yo3ol9xEey5t-mahoHmrg" name="getProcedureActivityAct2s" bodyCondition="_2Yo3pV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2Yo3pV9xEey5t-mahoHmrg" name="body" constrainedElement="_2Yo3ol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2Yo3pl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M-FNQn3sEeyivuDeOiJBMg" name="getProcedureActivityAct2s" bodyCondition="_M-FNRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M-FNRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_M-FNQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M-FNRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::ProcedureActivityAct2)).oclAsType(consol::ProcedureActivityAct2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2Yo3o19xEey5t-mahoHmrg" type="_CFMuYPDbEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Yo3pF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M-FNQ33sEeyivuDeOiJBMg" type="_CFMuYPDbEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M-FNRH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2ZFjkl9xEey5t-mahoHmrg" name="getProcedureActivityObservation2s" bodyCondition="_2ZFjlV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2ZFjlV9xEey5t-mahoHmrg" name="body" constrainedElement="_2ZFjkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2ZFjll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M-fc8X3sEeyivuDeOiJBMg" name="getProcedureActivityObservation2s" bodyCondition="_M-fc9H3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M-fc9H3sEeyivuDeOiJBMg" name="body" constrainedElement="_M-fc8X3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M-fc9X3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProcedureActivityObservation2)).oclAsType(consol::ProcedureActivityObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2ZFjk19xEey5t-mahoHmrg" type="_QoLWAPDjEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2ZFjlF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M-fc8n3sEeyivuDeOiJBMg" type="_QoLWAPDjEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M-fc833sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2Zkrwl9xEey5t-mahoHmrg" name="getProcedureActivityProcedure2s" bodyCondition="_2ZlS0l9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2ZlS0l9xEey5t-mahoHmrg" name="body" constrainedElement="_2Zkrwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2ZlS019xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M-6Tsn3sEeyivuDeOiJBMg" name="getProcedureActivityProcedure2s" bodyCondition="_M-6TtX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M-6TtX3sEeyivuDeOiJBMg" name="body" constrainedElement="_M-6Tsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M-6Ttn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getProcedures()->select(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::ProcedureActivityProcedure2)).oclAsType(consol::ProcedureActivityProcedure2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2ZlS0F9xEey5t-mahoHmrg" type="_fCVOQPDqEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2ZlS0V9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M-6Ts33sEeyivuDeOiJBMg" type="_fCVOQPDqEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M-6TtH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2aBXsl9xEey5t-mahoHmrg" name="getEncounterActivity2s" bodyCondition="_2aB-wV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2aB-wV9xEey5t-mahoHmrg" name="body" constrainedElement="_2aBXsl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2aB-wl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M_T8Un3sEeyivuDeOiJBMg" name="getEncounterActivity2s" bodyCondition="_M_T8VX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M_T8VX3sEeyivuDeOiJBMg" name="body" constrainedElement="_M_T8Un3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M_T8Vn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getEncounters()->select(encounter : cda::Encounter | not encounter.oclIsUndefined() and encounter.oclIsKindOf(consol::EncounterActivity2)).oclAsType(consol::EncounterActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2aBXs19xEey5t-mahoHmrg" type="_RGU34MzDEeO93sHu8pHB2g" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2aB-wF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M_T8U33sEeyivuDeOiJBMg" type="_RGU34MzDEeO93sHu8pHB2g" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M_T8VH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2agf4l9xEey5t-mahoHmrg" name="getNonMedicinalSupplyActivity2s" bodyCondition="_2agf5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2agf5V9xEey5t-mahoHmrg" name="body" constrainedElement="_2agf4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2agf5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_M_x2YH3sEeyivuDeOiJBMg" name="getNonMedicinalSupplyActivity2s" bodyCondition="_M_x2Y33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_M_x2Y33sEeyivuDeOiJBMg" name="body" constrainedElement="_M_x2YH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_M_x2ZH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::NonMedicinalSupplyActivity2)).oclAsType(consol::NonMedicinalSupplyActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2agf419xEey5t-mahoHmrg" type="_k_C20OaCEeOmzetP5oaH3A" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2agf5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_M_x2YX3sEeyivuDeOiJBMg" type="_k_C20OaCEeOmzetP5oaH3A" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M_x2Yn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2a9y4l9xEey5t-mahoHmrg" name="getInstruction2s" bodyCondition="_2a9y5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2a9y5V9xEey5t-mahoHmrg" name="body" constrainedElement="_2a9y4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2a9y5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NANUMn3sEeyivuDeOiJBMg" name="getInstruction2s" bodyCondition="_NANUNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NANUNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NANUMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NANUNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instruction2)).oclAsType(consol::Instruction2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2a9y419xEey5t-mahoHmrg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2a9y5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_NANUM33sEeyivuDeOiJBMg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NANUNH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4RLtoF9xEey5t-mahoHmrg" name="getHandoffCommunicationParticipantss" bodyCondition="_4RLto19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4RLto19xEey5t-mahoHmrg" name="body" constrainedElement="_4RLtoF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4RLtpF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ok9Ecn3sEeyivuDeOiJBMg" name="getHandoffCommunicationParticipantss" bodyCondition="_Ok9EdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ok9EdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ok9Ecn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ok9Edn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::HandoffCommunicationParticipants)).oclAsType(consol::HandoffCommunicationParticipants)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4RLtoV9xEey5t-mahoHmrg" type="_POfwAIz7EeOoMZgUoTghIg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4RLtol9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Ok9Ec33sEeyivuDeOiJBMg" type="_POfwAIz7EeOoMZgUoTghIg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ok9EdH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4RsD8V9xEey5t-mahoHmrg" name="getPlannedInterventionActs" bodyCondition="_4RsD9F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4RsD9F9xEey5t-mahoHmrg" name="body" constrainedElement="_4RsD8V9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4RsD9V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OlXUIH3sEeyivuDeOiJBMg" name="getPlannedInterventionActs" bodyCondition="_OlXUI33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OlXUI33sEeyivuDeOiJBMg" name="body" constrainedElement="_OlXUIH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OlXUJH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PlannedInterventionAct)).oclAsType(consol::PlannedInterventionAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4RsD8l9xEey5t-mahoHmrg" type="_dGARYOLSEeS505YV9ux2XA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4RsD819xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OlXUIX3sEeyivuDeOiJBMg" type="_dGARYOLSEeS505YV9ux2XA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OlXUIn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -21968,44 +21968,44 @@ value.code = 'completed')</body>
       <ownedComment xmi:id="_v3YrsJBGEeOZX935IVJfOg">
         <body>Where it is necessary to reference an external clinical document, the External Document Reference template can be used to reference this external document. However, if the containing document is replacing or appending to another document in the same set, that relationship is set in the header, using ClinicalDocument/relatedDocument.</body>
       </ownedComment>
-      <ownedRule xmi:id="_vsfIsl9xEey5t-mahoHmrg" name="ExternalDocumentReferenceTemplateId" constrainedElement="_QcUL8JBGEeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vsfvwF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HCPg8n3sEeyivuDeOiJBMg" name="ExternalDocumentReferenceTemplateId" constrainedElement="_QcUL8JBGEeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HCPg833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.115')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vsg94F9xEey5t-mahoHmrg" name="ExternalDocumentReferenceClassCode" constrainedElement="_QcUL8JBGEeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vsg94V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HCQvEH3sEeyivuDeOiJBMg" name="ExternalDocumentReferenceClassCode" constrainedElement="_QcUL8JBGEeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HCRWIH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('classCode') and self.classCode=vocab::ActClassDocument::DOCCLIN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vsiMAF9xEey5t-mahoHmrg" name="ExternalDocumentReferenceMoodCode" constrainedElement="_QcUL8JBGEeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vsiMAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HCSkQH3sEeyivuDeOiJBMg" name="ExternalDocumentReferenceMoodCode" constrainedElement="_QcUL8JBGEeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HCSkQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('moodCode') and self.moodCode=vocab::ActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vsjaIF9xEey5t-mahoHmrg" name="ExternalDocumentReferenceId" constrainedElement="_QcUL8JBGEeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vsjaIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HCTLUH3sEeyivuDeOiJBMg" name="ExternalDocumentReferenceId" constrainedElement="_QcUL8JBGEeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HCTLUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (self.id->size() =  1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vskoQF9xEey5t-mahoHmrg" name="ExternalDocumentReferenceCode" constrainedElement="_QcUL8JBGEeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vskoQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HCUZcH3sEeyivuDeOiJBMg" name="ExternalDocumentReferenceCode" constrainedElement="_QcUL8JBGEeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HCUZcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vsl2YF9xEey5t-mahoHmrg" name="ExternalDocumentReferenceSetId" constrainedElement="_QcUL8JBGEeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vsl2YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HCVnkH3sEeyivuDeOiJBMg" name="ExternalDocumentReferenceSetId" constrainedElement="_QcUL8JBGEeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HCVnkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.setId.oclIsUndefined() or self.setId.isNullFlavorUndefined()) implies (not self.setId.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vsnEgF9xEey5t-mahoHmrg" name="ExternalDocumentReferenceVersionNumber" constrainedElement="_QcUL8JBGEeOZX935IVJfOg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vsnEgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HCW1sH3sEeyivuDeOiJBMg" name="ExternalDocumentReferenceVersionNumber" constrainedElement="_QcUL8JBGEeOZX935IVJfOg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HCXcwH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.versionNumber.oclIsUndefined() or self.versionNumber.isNullFlavorUndefined()) implies (not self.versionNumber.oclIsUndefined())</body>
         </specification>
@@ -22023,174 +22023,174 @@ This template represents planned immunizations. Planned Immunization Activity is
 The priority of the immunization activity to the patient and provider is communicated through Priority Preference. The effectiveTime indicates the time when the immunization activity is intended to take place and authorTime indicates when the documentation of the plan occurred.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_vsnrkF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityTemplateId" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vsnrkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HCYD0H3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityTemplateId" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HCYD0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.120')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vso5sF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityClassCode" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vso5sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HCZR8H3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityClassCode" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HCZR8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClass::SBADM</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vtIo8F9xEey5t-mahoHmrg" name="PlannedImmunizationActivityMoodCodeP" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vtIo8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HC2k8H3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityMoodCodeP" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HC2k8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('moodCode')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vsqH0F9xEey5t-mahoHmrg" name="PlannedImmunizationActivityMoodCode" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vsqH0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HCagEH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityMoodCode" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HCagEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentSubstanceMood) and 
 let value : vocab::x_DocumentSubstanceMood = self.moodCode.oclAsType(vocab::x_DocumentSubstanceMood) in 
 value = vocab::x_DocumentSubstanceMood::INT or value = vocab::x_DocumentSubstanceMood::PRMS or value = vocab::x_DocumentSubstanceMood::PRP or value = vocab::x_DocumentSubstanceMood::RQO</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vtmjAF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityId" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vtmjAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HDTQ4H3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityId" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HDTQ4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vtnKEF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityStatusCode" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vtnKEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HDT38H3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityStatusCode" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HDT38X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'active')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vto_QF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityStatusCodeP" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vto_QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HDVGEH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityStatusCodeP" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HDVGEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vtqNYF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityEffectiveTime" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vtqNYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HDWUMH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityEffectiveTime" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HDWUMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime->isEmpty() or self.effectiveTime->exists(element | element.isNullFlavorUndefined())) implies (self.effectiveTime->size() =  1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vtrbgF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityRepeatNumber" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vtsCkF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HDXiUH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityRepeatNumber" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HDXiUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.repeatNumber.oclIsUndefined() or self.repeatNumber.isNullFlavorUndefined()) implies (not self.repeatNumber.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vuMY4F9xEey5t-mahoHmrg" name="PlannedImmunizationActivityRouteCodeP" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vuMY4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HD1cYH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityRouteCodeP" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HD1cYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.routeCode.oclIsUndefined() or self.routeCode.isNullFlavorUndefined()) implies (not self.routeCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vtspoF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityRouteCode" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vtspoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HDYJYH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityRouteCode" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HDYJYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.routeCode.oclIsUndefined() or self.routeCode.isNullFlavorUndefined()) implies (not self.routeCode.oclIsUndefined() and self.routeCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.routeCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.3.26.1.1' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vvNFgF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityApproachSiteCodeP" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vvNFgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HEuNMH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityApproachSiteCodeP" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HEuNMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.approachSiteCode->isEmpty() or self.approachSiteCode->exists(element | element.isNullFlavorUndefined())) implies (not self.approachSiteCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vuqS8F9xEey5t-mahoHmrg" name="PlannedImmunizationActivityApproachSiteCode" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vuqS8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HESIUH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityApproachSiteCode" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HESIUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.approachSiteCode->isEmpty() or self.approachSiteCode->exists(element | element.isNullFlavorUndefined())) implies (self.approachSiteCode->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vvwfIF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityDoseQuantity" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vvwfIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HFPxoH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityDoseQuantity" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HFPxoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.doseQuantity.oclIsUndefined() or self.doseQuantity.isNullFlavorUndefined()) implies (not self.doseQuantity.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vxPF0F9xEey5t-mahoHmrg" name="PlannedImmunizationActivityPerformer" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxPF0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HGsjIH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityPerformer" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HGsjIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->exists(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(rim::Participation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xIvrUF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityAuthorParticipation" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xIvrUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IWNDMH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityAuthorParticipation" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IWNDMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xJLwMF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityPriorityPreference" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xJLwMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IWohAH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityPriorityPreference" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IWohAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PriorityPreference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2bcUAF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityIndication2" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2bc7EF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NAtDcH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityIndication2" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NAtDcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2b8qUF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityInstruction2" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2b8qUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NBJIUH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityInstruction2" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NBJIUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instruction2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2cdnsF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityPrecondition" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2ceOwF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NBj_EH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityPrecondition" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NBj_EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.precondition->exists(precondition : cda::Precondition | not precondition.oclIsUndefined() and precondition.oclIsKindOf(cda::Precondition))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2dpTcF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityConsumable" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2dpTcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NCcI0H3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityConsumable" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NCcI0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.consumable->one(consumable : cda::Consumable | not consumable.oclIsUndefined() and consumable.oclIsKindOf(cda::Consumable))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_627n4F9xEey5t-mahoHmrg" name="PlannedImmunizationActivityCETranslationP" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_627n4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RGplIH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityCETranslationP" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RGplIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.routeCode->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (not translation->isEmpty()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_628O8F9xEey5t-mahoHmrg" name="PlannedImmunizationActivityCETranslation" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_628O8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RGplIn3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityCETranslation" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RGplI33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.routeCode->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_629dEF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityIVLPQUnit" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_629dEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RGqzQH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityIVLPQUnit" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RGqzQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.doseQuantity->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not unit.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_63dMUF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityConsumableImmunizationMedicationInformation2" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_63dMUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RHHfMH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityConsumableImmunizationMedicationInformation2" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RHHfMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.consumable->excluding(null)->reject(manufacturedProduct->one(manufacturedProduct : cda::ManufacturedProduct | not manufacturedProduct.oclIsUndefined() and manufacturedProduct.oclIsKindOf(consol::ImmunizationMedicationInformation2)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_63-JsF9xEey5t-mahoHmrg" name="PlannedImmunizationActivityPreconditionTypeCode" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_63-JsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RHnOcH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityPreconditionTypeCode" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RHnOcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.precondition->excluding(null)->reject(isDefined('typeCode') and typeCode=vocab::ActRelationshipType::PRCN)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_63-Jsl9xEey5t-mahoHmrg" name="PlannedImmunizationActivityPreconditionPreconditionForSubstanceAdministration2" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_63-Js19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RHn1gH3sEeyivuDeOiJBMg" name="PlannedImmunizationActivityPreconditionPreconditionForSubstanceAdministration2" constrainedElement="_KRcPwJXFEeOgXcDbh8Igkw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RHn1gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.precondition->excluding(null)->reject(criterion->one(criterion : cda::Criterion | not criterion.oclIsUndefined() and criterion.oclIsKindOf(consol::PreconditionForSubstanceAdministration2)))</body>
         </specification>
@@ -22198,37 +22198,37 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
       <generalization xmi:id="_KResAJXFEeOgXcDbh8Igkw">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_nazskEbuEd6besF9iFIJkQ"/>
       </generalization>
-      <ownedOperation xmi:id="_xJLwMl9xEey5t-mahoHmrg" name="getPriorityPreferences" bodyCondition="_xJLwNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xJLwNV9xEey5t-mahoHmrg" name="body" constrainedElement="_xJLwMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xJLwNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_IWohAn3sEeyivuDeOiJBMg" name="getPriorityPreferences" bodyCondition="_IWohBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_IWohBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_IWohAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_IWohBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PriorityPreference)).oclAsType(consol::PriorityPreference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xJLwM19xEey5t-mahoHmrg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xJLwNF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_IWohA33sEeyivuDeOiJBMg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IWohBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2bc7EV9xEey5t-mahoHmrg" name="getIndication2s" bodyCondition="_2bc7FF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2bc7FF9xEey5t-mahoHmrg" name="body" constrainedElement="_2bc7EV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2bc7FV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NAtqgH3sEeyivuDeOiJBMg" name="getIndication2s" bodyCondition="_NAtqg33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NAtqg33sEeyivuDeOiJBMg" name="body" constrainedElement="_NAtqgH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NAtqhH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication2)).oclAsType(consol::Indication2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2bc7El9xEey5t-mahoHmrg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2bc7E19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_NAtqgX3sEeyivuDeOiJBMg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NAtqgn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2b8qUl9xEey5t-mahoHmrg" name="getInstruction2s" bodyCondition="_2b8qVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2b8qVV9xEey5t-mahoHmrg" name="body" constrainedElement="_2b8qUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2b8qVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NBJvYH3sEeyivuDeOiJBMg" name="getInstruction2s" bodyCondition="_NBJvY33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NBJvY33sEeyivuDeOiJBMg" name="body" constrainedElement="_NBJvYH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NBJvZH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instruction2)).oclAsType(consol::Instruction2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2b8qU19xEey5t-mahoHmrg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2b8qVF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_NBJvYX3sEeyivuDeOiJBMg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NBJvYn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -22241,60 +22241,60 @@ This template represents the patient's prognosis, which must be associated with
 The effectiveTime represents the clinically relevant time of the observation. The observation/value is not constrained and can represent the expected life duration in PQ, an anticipated course of the disease in text, or coded term.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_vxPF0l9xEey5t-mahoHmrg" name="PrognosisObservationTemplateId" constrainedElement="_GXlxYJmLEeOeSLwbllPCyw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxPF019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HGsjIn3sEeyivuDeOiJBMg" name="PrognosisObservationTemplateId" constrainedElement="_GXlxYJmLEeOeSLwbllPCyw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HGsjI33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.113')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vxQT8F9xEey5t-mahoHmrg" name="PrognosisObservationClassCode" constrainedElement="_GXlxYJmLEeOeSLwbllPCyw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxQT8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HGtxQH3sEeyivuDeOiJBMg" name="PrognosisObservationClassCode" constrainedElement="_GXlxYJmLEeOeSLwbllPCyw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HGtxQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vxSJIF9xEey5t-mahoHmrg" name="PrognosisObservationMoodCode" constrainedElement="_GXlxYJmLEeOeSLwbllPCyw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxSJIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HGvmcH3sEeyivuDeOiJBMg" name="PrognosisObservationMoodCode" constrainedElement="_GXlxYJmLEeOeSLwbllPCyw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HGvmcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vxT-UF9xEey5t-mahoHmrg" name="PrognosisObservationCodeP" constrainedElement="_GXlxYJmLEeOeSLwbllPCyw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxT-UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HGypwH3sEeyivuDeOiJBMg" name="PrognosisObservationCodeP" constrainedElement="_GXlxYJmLEeOeSLwbllPCyw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HGypwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vxSwMF9xEey5t-mahoHmrg" name="PrognosisObservationCode" constrainedElement="_GXlxYJmLEeOeSLwbllPCyw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxSwMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HGw0kH3sEeyivuDeOiJBMg" name="PrognosisObservationCode" constrainedElement="_GXlxYJmLEeOeSLwbllPCyw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HGw0kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '75328-5' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vxVMcF9xEey5t-mahoHmrg" name="PrognosisObservationStatusCode" constrainedElement="_GXlxYJmLEeOeSLwbllPCyw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxVMcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HGz34H3sEeyivuDeOiJBMg" name="PrognosisObservationStatusCode" constrainedElement="_GXlxYJmLEeOeSLwbllPCyw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HGz34X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vxWakF9xEey5t-mahoHmrg" name="PrognosisObservationStatusCodeP" constrainedElement="_GXlxYJmLEeOeSLwbllPCyw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxWakV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HG1tEH3sEeyivuDeOiJBMg" name="PrognosisObservationStatusCodeP" constrainedElement="_GXlxYJmLEeOeSLwbllPCyw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HG1tEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vxXosF9xEey5t-mahoHmrg" name="PrognosisObservationEffectiveTime" constrainedElement="_GXlxYJmLEeOeSLwbllPCyw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxXosV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HG27MH3sEeyivuDeOiJBMg" name="PrognosisObservationEffectiveTime" constrainedElement="_GXlxYJmLEeOeSLwbllPCyw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HG27MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vxY20F9xEey5t-mahoHmrg" name="PrognosisObservationValue" constrainedElement="_GXlxYJmLEeOeSLwbllPCyw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxY20V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HG4JUH3sEeyivuDeOiJBMg" name="PrognosisObservationValue" constrainedElement="_GXlxYJmLEeOeSLwbllPCyw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HG4JUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1)</body>
         </specification>
@@ -22315,68 +22315,68 @@ In the Care Planning workflow, the judgment about how well the person is progres
 For example, an observation outcome of a blood oxygen saturation level of 95% is related to the goal of &quot;Maintain Pulse Ox greater than 92&quot; and in this case the Progress Toward Goal Observation template would record that the related goal has been achieved.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_vxZd4F9xEey5t-mahoHmrg" name="ProgressTowardGoalObservationTemplateId" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxZd4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HG5XcH3sEeyivuDeOiJBMg" name="ProgressTowardGoalObservationTemplateId" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HG5XcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.110')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vxasAF9xEey5t-mahoHmrg" name="ProgressTowardGoalObservationClassCode" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxasAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HG6lkH3sEeyivuDeOiJBMg" name="ProgressTowardGoalObservationClassCode" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HG6lkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vxb6IF9xEey5t-mahoHmrg" name="ProgressTowardGoalObservationMoodCode" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxb6IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HG7zsH3sEeyivuDeOiJBMg" name="ProgressTowardGoalObservationMoodCode" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HG8awH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vxdIQF9xEey5t-mahoHmrg" name="ProgressTowardGoalObservationId" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxdIQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HG9o4H3sEeyivuDeOiJBMg" name="ProgressTowardGoalObservationId" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HG9o4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vxe9cF9xEey5t-mahoHmrg" name="ProgressTowardGoalObservationCodeP" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxfkgF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HG_eEH3sEeyivuDeOiJBMg" name="ProgressTowardGoalObservationCodeP" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HG_eEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vxeWYF9xEey5t-mahoHmrg" name="ProgressTowardGoalObservationCode" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxeWYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HG-P8H3sEeyivuDeOiJBMg" name="ProgressTowardGoalObservationCode" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HG-P8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vxgLkF9xEey5t-mahoHmrg" name="ProgressTowardGoalObservationStatusCode" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxgLkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HHAFIH3sEeyivuDeOiJBMg" name="ProgressTowardGoalObservationStatusCode" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HHAFIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vxhZsF9xEey5t-mahoHmrg" name="ProgressTowardGoalObservationStatusCodeP" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxhZsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HHBTQH3sEeyivuDeOiJBMg" name="ProgressTowardGoalObservationStatusCodeP" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HHBTQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vxin0F9xEey5t-mahoHmrg" name="ProgressTowardGoalObservationValue" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vxin0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HHChYH3sEeyivuDeOiJBMg" name="ProgressTowardGoalObservationValue" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HHChYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '390801001' or value.code = '390802008' or value.code = '706905005' or value.code = '706906006')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vyBI8F9xEey5t-mahoHmrg" name="ProgressTowardGoalObservationValueP" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vyBI8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HHhCgH3sEeyivuDeOiJBMg" name="ProgressTowardGoalObservationValueP" constrainedElement="_0NewYJmVEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HHhCgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
@@ -22389,66 +22389,66 @@ value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '390801001' or val
       <ownedComment xmi:id="_zPCY4JmaEeOLJeQez13EkQ">
         <body>This template represents priority preferences chosen by a patient or a care provider. Priority preferences are choices made by care providers or patients or both relative to options for care or treatment (including scheduling, care experience, and meeting of personal health goals), the sharing and disclosure of health information, and the prioritization of concerns and problems.</body>
       </ownedComment>
-      <ownedRule xmi:id="_vycmwF9xEey5t-mahoHmrg" name="PriorityPreferenceTemplateId" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vycmwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HH-VgH3sEeyivuDeOiJBMg" name="PriorityPreferenceTemplateId" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HH-VgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.143')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vyd04F9xEey5t-mahoHmrg" name="PriorityPreferenceClassCode" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vyd04V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HH_joH3sEeyivuDeOiJBMg" name="PriorityPreferenceClassCode" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HH_joX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vyfDAF9xEey5t-mahoHmrg" name="PriorityPreferenceMoodCode" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vyfDAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HIBY0H3sEeyivuDeOiJBMg" name="PriorityPreferenceMoodCode" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HIBY0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vygRIF9xEey5t-mahoHmrg" name="PriorityPreferenceId" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vygRIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HICm8H3sEeyivuDeOiJBMg" name="PriorityPreferenceId" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HICm8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vyitYF9xEey5t-mahoHmrg" name="PriorityPreferenceCodeP" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vyitYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HIEcIH3sEeyivuDeOiJBMg" name="PriorityPreferenceCodeP" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HIEcIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vyhfQF9xEey5t-mahoHmrg" name="PriorityPreferenceCode" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vyhfQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HIDOAH3sEeyivuDeOiJBMg" name="PriorityPreferenceCode" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HIDOAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '225773000' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vyj7gF9xEey5t-mahoHmrg" name="PriorityPreferenceEffectiveTime" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vyj7gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HIFqQH3sEeyivuDeOiJBMg" name="PriorityPreferenceEffectiveTime" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HIFqQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vylJoF9xEey5t-mahoHmrg" name="PriorityPreferenceValue" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vylJoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HIGRUH3sEeyivuDeOiJBMg" name="PriorityPreferenceValue" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HIGRUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '394849002' or value.code = '394848005' or value.code = '441808003')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vzDqwF9xEey5t-mahoHmrg" name="PriorityPreferenceValueP" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vzDqwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HIpD4H3sEeyivuDeOiJBMg" name="PriorityPreferenceValueP" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HIpD4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xJrfcF9xEey5t-mahoHmrg" name="PriorityPreferenceAuthorParticipation" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xJrfcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IXCwsH3sEeyivuDeOiJBMg" name="PriorityPreferenceAuthorParticipation" constrainedElement="_ncafYJmaEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IXCwsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
@@ -22461,74 +22461,74 @@ value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '394849002' or val
       <ownedComment xmi:id="_LAG4AJm0EeOLJeQez13EkQ">
         <body>This template represents a patient's daily self-care ability. These activities are called Activities of Daily Living (ADL) and Instrumental Activities of Daily Living (IADL). ADLs involve caring for and moving of the body (e.g., dressing, bathing, eating). IADLs support an independent life style (e.g., cooking, managing medications, driving, shopping).</body>
       </ownedComment>
-      <ownedRule xmi:id="_vzfIkF9xEey5t-mahoHmrg" name="SelfCareActivitiesTemplateId" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vzfIkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HJNroH3sEeyivuDeOiJBMg" name="SelfCareActivitiesTemplateId" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HJOSsH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.128')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vzgWsF9xEey5t-mahoHmrg" name="SelfCareActivitiesClassCode" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vzgWsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HJQH4H3sEeyivuDeOiJBMg" name="SelfCareActivitiesClassCode" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HJQH4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vziL4F9xEey5t-mahoHmrg" name="SelfCareActivitiesMoodCode" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vziL4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HJR9EH3sEeyivuDeOiJBMg" name="SelfCareActivitiesMoodCode" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HJSkIH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v0DwUF9xEey5t-mahoHmrg" name="SelfCareActivitiesCodeP" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v0DwUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HJ0IkH3sEeyivuDeOiJBMg" name="SelfCareActivitiesCodeP" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HJ0IkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_vziy8F9xEey5t-mahoHmrg" name="SelfCareActivitiesCode" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_vziy8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HJTyQH3sEeyivuDeOiJBMg" name="SelfCareActivitiesCode" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HJTyQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '46008-9' or value.code = '28409-1' or value.code = '28408-3' or value.code = '46484-2' or value.code = '46482-6' or value.code = '28413-3'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v0t3oF9xEey5t-mahoHmrg" name="SelfCareActivitiesStatusCode" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v0t3oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HKTQwH3sEeyivuDeOiJBMg" name="SelfCareActivitiesStatusCode" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HKTQwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v0vFwF9xEey5t-mahoHmrg" name="SelfCareActivitiesStatusCodeP" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v0vFwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HKUe4H3sEeyivuDeOiJBMg" name="SelfCareActivitiesStatusCodeP" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HKUe4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v0wT4F9xEey5t-mahoHmrg" name="SelfCareActivitiesEffectiveTime" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v0wT4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HKWUEH3sEeyivuDeOiJBMg" name="SelfCareActivitiesEffectiveTime" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HKWUEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v0xiAF9xEey5t-mahoHmrg" name="SelfCareActivitiesValue" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v0xiAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HKW7IH3sEeyivuDeOiJBMg" name="SelfCareActivitiesValue" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HKXiMH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '371150009' or value.code = '371153006' or value.code = '371155004' or value.code = '371152001' or value.code = '371154000' or value.code = '371151008' or value.code = '371156003' or value.code = '371157007' or value.code = '385640009')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v1QDIF9xEey5t-mahoHmrg" name="SelfCareActivitiesValueP" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v1QDIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HK2DUH3sEeyivuDeOiJBMg" name="SelfCareActivitiesValueP" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HK2DUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4ZG6kF9xEey5t-mahoHmrg" name="SelfCareActivitiesAuthorParticipation" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4ZG6kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Orr-kH3sEeyivuDeOiJBMg" name="SelfCareActivitiesAuthorParticipation" constrainedElement="_nC0xUJmzEeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Orr-kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
@@ -22541,92 +22541,92 @@ value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '371150009' or val
       <ownedComment xmi:id="_LirAQJm5EeOLJeQez13EkQ">
         <body>This template represents a patient's sensory or speech ability. It may contain an assessment scale observations related to the sensory or speech ability.</body>
       </ownedComment>
-      <ownedRule xmi:id="_v1vyYF9xEey5t-mahoHmrg" name="SensoryStatusTemplateId" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v1vyYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HLVykH3sEeyivuDeOiJBMg" name="SensoryStatusTemplateId" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HLWZoH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.127')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v1xnkF9xEey5t-mahoHmrg" name="SensoryStatusClassCode" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v1xnkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HLXnwH3sEeyivuDeOiJBMg" name="SensoryStatusClassCode" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HLXnwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v1y1sF9xEey5t-mahoHmrg" name="SensoryStatusMoodCode" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v1y1sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HLZc8H3sEeyivuDeOiJBMg" name="SensoryStatusMoodCode" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HLZc8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v2QvwF9xEey5t-mahoHmrg" name="SensoryStatusCodeP" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v2QvwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HL8PgH3sEeyivuDeOiJBMg" name="SensoryStatusCodeP" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HL8PgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v10D0F9xEey5t-mahoHmrg" name="SensoryStatusCode" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v10D0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HLarEH3sEeyivuDeOiJBMg" name="SensoryStatusCode" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HLarEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '47078008' or value.code = '405183003' or value.code = '373713005' or value.code = '397627001' or value.code = '397686008' or value.code = '397624008' or value.code = '128542002' or value.code = '285567008'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v2wfAF9xEey5t-mahoHmrg" name="SensoryStatusStatusCode" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v2wfAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HMb-wH3sEeyivuDeOiJBMg" name="SensoryStatusStatusCode" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HMb-wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v2xtIF9xEey5t-mahoHmrg" name="SensoryStatusStatusCodeP" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v2xtIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HMebAH3sEeyivuDeOiJBMg" name="SensoryStatusStatusCodeP" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HMebAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v2y7QF9xEey5t-mahoHmrg" name="SensoryStatusEffectiveTime" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v2y7QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HMfpIH3sEeyivuDeOiJBMg" name="SensoryStatusEffectiveTime" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HMfpIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v20JYF9xEey5t-mahoHmrg" name="SensoryStatusValue" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v20JYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HMheUH3sEeyivuDeOiJBMg" name="SensoryStatusValue" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HMheUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v3SqgF9xEey5t-mahoHmrg" name="SensoryStatusValueP" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v3SqgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HNDCwH3sEeyivuDeOiJBMg" name="SensoryStatusValueP" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HNDCwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v4Rh8F9xEey5t-mahoHmrg" name="SensoryStatusAssessmentScaleObservation" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4Rh8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOE9gH3sEeyivuDeOiJBMg" name="SensoryStatusAssessmentScaleObservation" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOE9gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AssessmentScaleObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4ZmCwF9xEey5t-mahoHmrg" name="SensoryStatusAuthorParticipation" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4ZmCwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OsG1UH3sEeyivuDeOiJBMg" name="SensoryStatusAuthorParticipation" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OsG1UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_63_X0F9xEey5t-mahoHmrg" name="SensoryStatusIVLTSLow" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_63_X0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RHpDoH3sEeyivuDeOiJBMg" name="SensoryStatusIVLTSLow" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RHpDoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((low.oclIsUndefined() or low.isNullFlavorUndefined()) implies (not low.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_63_-4F9xEey5t-mahoHmrg" name="SensoryStatusIVLTSHigh" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_63_-4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RHpDon3sEeyivuDeOiJBMg" name="SensoryStatusIVLTSHigh" constrainedElement="_kyeGAJm4EeOLJeQez13EkQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RHpDo33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((high.oclIsUndefined() or high.isNullFlavorUndefined()) implies (not high.oclIsUndefined()) )))</body>
         </specification>
@@ -22634,15 +22634,15 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
       <generalization xmi:id="_kyeGAZm4EeOLJeQez13EkQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_v4Rh8l9xEey5t-mahoHmrg" name="getAssessmentScaleObservations" bodyCondition="_v4Rh9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_v4Rh9V9xEey5t-mahoHmrg" name="body" constrainedElement="_v4Rh8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4Rh9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_HOFkkH3sEeyivuDeOiJBMg" name="getAssessmentScaleObservations" bodyCondition="_HOFkk33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_HOFkk33sEeyivuDeOiJBMg" name="body" constrainedElement="_HOFkkH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOFklH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AssessmentScaleObservation)).oclAsType(consol::AssessmentScaleObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_v4Rh819xEey5t-mahoHmrg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_v4Rh9F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_HOFkkX3sEeyivuDeOiJBMg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HOFkkn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -22650,60 +22650,60 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
       <ownedComment xmi:id="_tU2HwJpdEeOK6dzbL4VoTA">
         <body>This template represents the administration course in a series. The entryRelationship/sequenceNumber in the containing template shows the order of this particular administration in that medication series.</body>
       </ownedComment>
-      <ownedRule xmi:id="_v4Rh919xEey5t-mahoHmrg" name="SubstanceAdministeredActTemplateId" constrainedElement="_KTrEAJpdEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4Rh-F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOFklX3sEeyivuDeOiJBMg" name="SubstanceAdministeredActTemplateId" constrainedElement="_KTrEAJpdEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOFkln3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.118')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v4SwEF9xEey5t-mahoHmrg" name="SubstanceAdministeredActClassCode" constrainedElement="_KTrEAJpdEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4SwEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOGysH3sEeyivuDeOiJBMg" name="SubstanceAdministeredActClassCode" constrainedElement="_KTrEAJpdEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOGysX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v4UlQF9xEey5t-mahoHmrg" name="SubstanceAdministeredActMoodCode" constrainedElement="_KTrEAJpdEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4UlQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOIn4H3sEeyivuDeOiJBMg" name="SubstanceAdministeredActMoodCode" constrainedElement="_KTrEAJpdEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOIn4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v4VzYF9xEey5t-mahoHmrg" name="SubstanceAdministeredActId" constrainedElement="_KTrEAJpdEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4VzYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOJ2AH3sEeyivuDeOiJBMg" name="SubstanceAdministeredActId" constrainedElement="_KTrEAJpdEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOKdEH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v4YPoF9xEey5t-mahoHmrg" name="SubstanceAdministeredActCodeP" constrainedElement="_KTrEAJpdEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4YPoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOMSQH3sEeyivuDeOiJBMg" name="SubstanceAdministeredActCodeP" constrainedElement="_KTrEAJpdEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOMSQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v4XBgF9xEey5t-mahoHmrg" name="SubstanceAdministeredActCode" constrainedElement="_KTrEAJpdEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4XBgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOLEIH3sEeyivuDeOiJBMg" name="SubstanceAdministeredActCode" constrainedElement="_KTrEAJpdEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOLEIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '416118004' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v4Y2sF9xEey5t-mahoHmrg" name="SubstanceAdministeredActStatusCode" constrainedElement="_KTrEAJpdEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4Y2sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOOHcH3sEeyivuDeOiJBMg" name="SubstanceAdministeredActStatusCode" constrainedElement="_KTrEAJpdEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOOHcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v4aE0F9xEey5t-mahoHmrg" name="SubstanceAdministeredActStatusCodeP" constrainedElement="_KTrEAJpdEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4aE0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOP8oH3sEeyivuDeOiJBMg" name="SubstanceAdministeredActStatusCodeP" constrainedElement="_KTrEAJpdEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOP8oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v4bS8F9xEey5t-mahoHmrg" name="SubstanceAdministeredActEffectiveTime" constrainedElement="_KTrEAJpdEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4bS8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HORx0H3sEeyivuDeOiJBMg" name="SubstanceAdministeredActEffectiveTime" constrainedElement="_KTrEAJpdEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HORx0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
@@ -22716,74 +22716,74 @@ value.code = 'completed')</body>
       <ownedComment xmi:id="_eeKb0JpnEeOK6dzbL4VoTA">
         <body>This template represents characteristics of a wound (e.g., integrity of suture line, odor, erythema).</body>
       </ownedComment>
-      <ownedRule xmi:id="_v4b6AF9xEey5t-mahoHmrg" name="WoundCharacteristicTemplateId" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4chEF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOS_8H3sEeyivuDeOiJBMg" name="WoundCharacteristicTemplateId" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOS_8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.134')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v4dIIF9xEey5t-mahoHmrg" name="WoundCharacteristicClassCode" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4dIIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOUOEH3sEeyivuDeOiJBMg" name="WoundCharacteristicClassCode" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOUOEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v4e9UF9xEey5t-mahoHmrg" name="WoundCharacteristicMoodCode" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4e9UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOWDQH3sEeyivuDeOiJBMg" name="WoundCharacteristicMoodCode" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOWDQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v4gLcF9xEey5t-mahoHmrg" name="WoundCharacteristicId" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4gLcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOXRYH3sEeyivuDeOiJBMg" name="WoundCharacteristicId" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOXRYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v4insF9xEey5t-mahoHmrg" name="WoundCharacteristicCodeP" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4insV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOZtoH3sEeyivuDeOiJBMg" name="WoundCharacteristicCodeP" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOZtoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v4hZkF9xEey5t-mahoHmrg" name="WoundCharacteristicCode" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4hZkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOYfgH3sEeyivuDeOiJBMg" name="WoundCharacteristicCode" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOYfgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v4jOwF9xEey5t-mahoHmrg" name="WoundCharacteristicStatusCode" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4jOwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOa7wH3sEeyivuDeOiJBMg" name="WoundCharacteristicStatusCode" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOa7wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v4lD8F9xEey5t-mahoHmrg" name="WoundCharacteristicStatusCodeP" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4lD8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOcw8H3sEeyivuDeOiJBMg" name="WoundCharacteristicStatusCodeP" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOcw8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v4mSEF9xEey5t-mahoHmrg" name="WoundCharacteristicEffectiveTime" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4mSEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOd_EH3sEeyivuDeOiJBMg" name="WoundCharacteristicEffectiveTime" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOd_EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v4oHQF9xEey5t-mahoHmrg" name="WoundCharacteristicValue" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v4oHQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HOfNMH3sEeyivuDeOiJBMg" name="WoundCharacteristicValue" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HOfNMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v5IdkF9xEey5t-mahoHmrg" name="WoundCharacteristicValueP" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v5IdkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HO-8cH3sEeyivuDeOiJBMg" name="WoundCharacteristicValueP" constrainedElement="_D6Lm0JpnEeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HO-8cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
@@ -22796,66 +22796,66 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
       <ownedComment xmi:id="_Ul6XwJp8EeOK6dzbL4VoTA">
         <body>This template represents the Wound Measurement Observations of wound width, depth and length.</body>
       </ownedComment>
-      <ownedRule xmi:id="_v5qpEF9xEey5t-mahoHmrg" name="WoundMeasurementObservationTemplateId" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v5qpEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HPc2gH3sEeyivuDeOiJBMg" name="WoundMeasurementObservationTemplateId" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HPddkH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.133')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v5seQF9xEey5t-mahoHmrg" name="WoundMeasurementObservationClassCode" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v5seQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HPersH3sEeyivuDeOiJBMg" name="WoundMeasurementObservationClassCode" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HPersX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v5uTcF9xEey5t-mahoHmrg" name="WoundMeasurementObservationMoodCode" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v5uTcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HPf50H3sEeyivuDeOiJBMg" name="WoundMeasurementObservationMoodCode" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HPf50X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v5vhkF9xEey5t-mahoHmrg" name="WoundMeasurementObservationId" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v5vhkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HPhvAH3sEeyivuDeOiJBMg" name="WoundMeasurementObservationId" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HPhvAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v6NboF9xEey5t-mahoHmrg" name="WoundMeasurementObservationCodeP" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v6NboV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HQA3MH3sEeyivuDeOiJBMg" name="WoundMeasurementObservationCodeP" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HQA3MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v5wIoF9xEey5t-mahoHmrg" name="WoundMeasurementObservationCode" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v5wvsF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HPiWEH3sEeyivuDeOiJBMg" name="WoundMeasurementObservationCode" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HPiWEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '39125-0' or value.code = '39127-6' or value.code = '39126-8'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v6tx8F9xEey5t-mahoHmrg" name="WoundMeasurementObservationStatusCode" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v6tx8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HQfYUH3sEeyivuDeOiJBMg" name="WoundMeasurementObservationStatusCode" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HQfYUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v6vAEF9xEey5t-mahoHmrg" name="WoundMeasurementObservationStatusCodeP" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v6vAEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HQgmcH3sEeyivuDeOiJBMg" name="WoundMeasurementObservationStatusCodeP" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HQgmcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v6wOMF9xEey5t-mahoHmrg" name="WoundMeasurementObservationEffectiveTime" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v6wOMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HQh0kH3sEeyivuDeOiJBMg" name="WoundMeasurementObservationEffectiveTime" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HQh0kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v6xcUF9xEey5t-mahoHmrg" name="WoundMeasurementObservationValue" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v6xcUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HQjCsH3sEeyivuDeOiJBMg" name="WoundMeasurementObservationValue" constrainedElement="_94MpsJp7EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HQjpwH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::PQ)))</body>
         </specification>
@@ -22868,177 +22868,177 @@ value.code = 'completed')</body>
       <ownedComment xmi:id="_bkc6YJqAEeOK6dzbL4VoTA">
         <body>This template represents acquired or surgical wounds and is not intended to encompass all wound types. The template applies to wounds such as pressure ulcers, surgical incisions, and deep tissue injury wounds. Information in this template may include information about the wound measurements characteristics.</body>
       </ownedComment>
-      <ownedRule xmi:id="_v6yqcV9xEey5t-mahoHmrg" name="ProblemObservation2TemplateId" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v6yqcl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HQkQ0X3sEeyivuDeOiJBMg" name="ProblemObservation2TemplateId" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HQk34H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.114' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v6z4kF9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationClassCode" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v6z4kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HQmGAH3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationClassCode" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HQmtEH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v61twF9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationMoodCode" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v61twV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HQoiQH3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationMoodCode" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HQoiQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v65YIF9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationCodeP" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v65YIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HQsMoH3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationCodeP" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HQszsH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v63i8F9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationCode" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v63i8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HQqXcH3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationCode" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HQqXcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v7X5QF9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationValueP" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v7X5QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HRNKAH3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationValueP" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HRNKAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (not self.value->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v67NUF9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationValue" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v67NUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HQuB0H3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationValue" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HQuB0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v75dsF9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationTargetSiteCode" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v75dsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HRs5QH3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationTargetSiteCode" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HRs5QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (self.targetSiteCode->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v8bCIF9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationTargetSiteCodeP" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v8bCIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HSPEwH3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationTargetSiteCodeP" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HSPEwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (( not self.targetSiteCode->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v9buwF9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationWoundMeasurementObservation" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v9buwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HTV4AH3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationWoundMeasurementObservation" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HTV4AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::WoundMeasurementObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v99TMF9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationWoundCharacteristics" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v99TMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HTzyEH3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationWoundCharacteristics" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HTzyEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::WoundCharacteristic) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v-amMF9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationHighestPressureUlcerStage" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v-amMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HURsIH3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationHighestPressureUlcerStage" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HURsIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::HighestPressureUlcerStage) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xKL1wF9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationAuthorParticipation" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xKL1wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IXe1kH3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationAuthorParticipation" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IXe1kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2_gqYF9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationNumberOfPressureUlcersObservation2" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2_gqYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NfMWQH3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationNumberOfPressureUlcersObservation2" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NfMWQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::NumberOfPressureUlcersObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_64iKYF9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationCDCRCDValueTerminology" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_64iKYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RIIy4H3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationCDCRCDValueTerminology" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RIIy4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined()).qualifier->excluding(null)->select(isNullFlavorUndefined()).value->excluding(null)->select(isNullFlavorUndefined())->reject(code = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_64iKYl9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationCDCRCDCode" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_64iKY19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RIIy4n3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationCDCRCDCode" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RIIy433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined()).qualifier->excluding(null)->select(isNullFlavorUndefined()).value->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not code.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_64ixcF9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationCDCRName" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_64ixcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RIJZ8H3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationCDCRName" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RIJZ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined()).qualifier->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((name.oclIsUndefined() or name.isNullFlavorUndefined()) implies (not name.oclIsUndefined() and name.oclIsKindOf(datatypes::CV) and 
 let value : datatypes::CV = name.oclAsType(datatypes::CV) in 
 value.code = '272741003') )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_64ixcl9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationCDCRNameP" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_64ixc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RIJZ8n3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationCDCRNameP" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RIJZ833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined()).qualifier->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((name.oclIsUndefined() or name.isNullFlavorUndefined()) implies (not name.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_64ixdF9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationCDCRValue" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_64ixdV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RIJZ9H3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationCDCRValue" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RIJZ9X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined()).qualifier->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((value.oclIsUndefined() or value.isNullFlavorUndefined()) implies (not value.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_64jYgF9xEey5t-mahoHmrg" name="LongitudinalCareWoundObservationCDQualifier" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_64jYgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RIKBAH3sEeyivuDeOiJBMg" name="LongitudinalCareWoundObservationCDQualifier" constrainedElement="_09uFMJp_EeOK6dzbL4VoTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RIKBAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((qualifier->isEmpty() or qualifier->exists(element | element.isNullFlavorUndefined())) implies (not qualifier->isEmpty()) )))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_09uFMZp_EeOK6dzbL4VoTA" general="_prDAkPDCEeOKPKE9au0oug"/>
-      <ownedOperation xmi:id="_v9buwl9xEey5t-mahoHmrg" name="getWoundMeasurementObservations" bodyCondition="_v9buxV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_v9buxV9xEey5t-mahoHmrg" name="body" constrainedElement="_v9buwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_v9buxl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_HTV4An3sEeyivuDeOiJBMg" name="getWoundMeasurementObservations" bodyCondition="_HTV4BX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_HTV4BX3sEeyivuDeOiJBMg" name="body" constrainedElement="_HTV4An3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_HTV4Bn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::WoundMeasurementObservation)).oclAsType(consol::WoundMeasurementObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_v9buw19xEey5t-mahoHmrg" type="_94MpsJp7EeOK6dzbL4VoTA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_v9buxF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_HTV4A33sEeyivuDeOiJBMg" type="_94MpsJp7EeOK6dzbL4VoTA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HTV4BH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_v99TMl9xEey5t-mahoHmrg" name="getWoundCharacteristicss" bodyCondition="_v99TNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_v99TNV9xEey5t-mahoHmrg" name="body" constrainedElement="_v99TMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_v99TNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_HTzyEn3sEeyivuDeOiJBMg" name="getWoundCharacteristicss" bodyCondition="_HTzyFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_HTzyFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_HTzyEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_HTzyFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::WoundCharacteristic)).oclAsType(consol::WoundCharacteristic)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_v99TM19xEey5t-mahoHmrg" type="_D6Lm0JpnEeOK6dzbL4VoTA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_v99TNF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_HTzyE33sEeyivuDeOiJBMg" type="_D6Lm0JpnEeOK6dzbL4VoTA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HTzyFH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_v-amMl9xEey5t-mahoHmrg" name="getHighestPressureUlcerStage" bodyCondition="_v-amNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_v-amNV9xEey5t-mahoHmrg" name="body" constrainedElement="_v-amMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_v-amNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_HUSTMH3sEeyivuDeOiJBMg" name="getHighestPressureUlcerStage" bodyCondition="_HUSTM33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_HUSTM33sEeyivuDeOiJBMg" name="body" constrainedElement="_HUSTMH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_HUSTNH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::HighestPressureUlcerStage))->asSequence()->any(true).oclAsType(consol::HighestPressureUlcerStage)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_v-amM19xEey5t-mahoHmrg" type="_4YgVsOZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_v-amNF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_HUSTMX3sEeyivuDeOiJBMg" type="_4YgVsOZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HUSTMn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2_gqYl9xEey5t-mahoHmrg" name="getNumberOfPressureUlcersObservation2s" bodyCondition="_2_gqZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2_gqZV9xEey5t-mahoHmrg" name="body" constrainedElement="_2_gqYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2_gqZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NfMWQn3sEeyivuDeOiJBMg" name="getNumberOfPressureUlcersObservation2s" bodyCondition="_NfMWRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NfMWRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NfMWQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NfMWRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::NumberOfPressureUlcersObservation2)).oclAsType(consol::NumberOfPressureUlcersObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2_gqY19xEey5t-mahoHmrg" type="_YYgjwIC3EeS108flGLVEBA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2_gqZF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_NfMWQ33sEeyivuDeOiJBMg" type="_YYgjwIC3EeS108flGLVEBA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NfMWRH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -23046,46 +23046,46 @@ value.code = '272741003') )))</body>
       <ownedComment xmi:id="_k_kdoJ14EeORR8_YW0n_jQ">
         <body>This template represents patient Goals. A goal is a defined outcome or condition to be achieved in the process of patient care. Goals include patient-defined over-arching goals (e.g., alleviation of health concerns, desired/intended positive outcomes from interventions, longevity, function, symptom management, comfort) and health concern-specific or intervention-specific goals to achieve desired outcomes.</body>
       </ownedComment>
-      <ownedRule xmi:id="_v-bNQF9xEey5t-mahoHmrg" name="GoalsSectionTemplateId" constrainedElement="_YPOXoJ14EeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v-bNQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HUSTNX3sEeyivuDeOiJBMg" name="GoalsSectionTemplateId" constrainedElement="_YPOXoJ14EeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HUSTNn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.60')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v-cbYF9xEey5t-mahoHmrg" name="GoalsSectionNullFlavor" constrainedElement="_YPOXoJ14EeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v-cbYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HUThUH3sEeyivuDeOiJBMg" name="GoalsSectionNullFlavor" constrainedElement="_YPOXoJ14EeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HUThUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('nullFlavor')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v-dCcF9xEey5t-mahoHmrg" name="GoalsSectionCode" constrainedElement="_YPOXoJ14EeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v-dCcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HUUvcH3sEeyivuDeOiJBMg" name="GoalsSectionCode" constrainedElement="_YPOXoJ14EeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HUUvcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '61146-7' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v-eQkF9xEey5t-mahoHmrg" name="GoalsSectionCodeP" constrainedElement="_YPOXoJ14EeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v-eQkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HUV9kH3sEeyivuDeOiJBMg" name="GoalsSectionCodeP" constrainedElement="_YPOXoJ14EeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HUV9kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v-fesF9xEey5t-mahoHmrg" name="GoalsSectionTitle" constrainedElement="_YPOXoJ14EeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v-fesV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HUXLsH3sEeyivuDeOiJBMg" name="GoalsSectionTitle" constrainedElement="_YPOXoJ14EeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HUXLsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v-gs0F9xEey5t-mahoHmrg" name="GoalsSectionText" constrainedElement="_YPOXoJ14EeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v-gs0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HUYZ0H3sEeyivuDeOiJBMg" name="GoalsSectionText" constrainedElement="_YPOXoJ14EeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HUYZ0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v-_1AF9xEey5t-mahoHmrg" name="GoalsSectionGoalObservation" constrainedElement="_YPOXoJ14EeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v-_1AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HU5XMH3sEeyivuDeOiJBMg" name="GoalsSectionGoalObservation" constrainedElement="_YPOXoJ14EeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HU5XMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::GoalObservation))</body>
         </specification>
@@ -23093,15 +23093,15 @@ value.code = '61146-7' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_YPQM0J14EeORR8_YW0n_jQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_v_AcEF9xEey5t-mahoHmrg" name="getGoalObservations" bodyCondition="_v_AcE19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_v_AcE19xEey5t-mahoHmrg" name="body" constrainedElement="_v_AcEF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_v_AcFF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_HU5XMn3sEeyivuDeOiJBMg" name="getGoalObservations" bodyCondition="_HU5XNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_HU5XNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_HU5XMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_HU5XNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::GoalObservation)).oclAsType(consol::GoalObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_v_AcEV9xEey5t-mahoHmrg" type="_-miMII9TEeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_v_AcEl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_HU5XM33sEeyivuDeOiJBMg" type="_-miMII9TEeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HU5XNH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -23114,58 +23114,58 @@ This section contains data describing an interest or worry about a health state
 Problem Concerns are a subset of Health Concerns that have risen to the level of importance that they typically would belong on a classic &quot;Problem List&quot;, such as &quot;Diabetes Mellitus&quot; or &quot;Family History of Melanoma&quot; or &quot;Tobacco abuse&quot;. These are of broad interest to multiple members of the care team. Examples of other Health Concerns that might not typically be considered a Problem Concern include &quot;Risk of Hyperkalemia&quot; for a patient taking an ACE-inhibitor medication, or &quot;Transportation difficulties&quot; for someone who doesn't drive and has trouble getting to appointments, or &quot;Under-insured&quot; for someone who doesn't have sufficient insurance to properly cover their medical needs such as medications. These are typically most important to just a limited number of care team members.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_v_AcFV9xEey5t-mahoHmrg" name="HealthConcernsSectionTemplateId" constrainedElement="_2umuYJ18EeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v_AcFl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HU5-QH3sEeyivuDeOiJBMg" name="HealthConcernsSectionTemplateId" constrainedElement="_2umuYJ18EeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HU5-QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.58' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v_BqMF9xEey5t-mahoHmrg" name="HealthConcernsSectionNullFlavor" constrainedElement="_2umuYJ18EeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v_BqMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HU7zcH3sEeyivuDeOiJBMg" name="HealthConcernsSectionNullFlavor" constrainedElement="_2umuYJ18EeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HU7zcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('nullFlavor')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v_CRQF9xEey5t-mahoHmrg" name="HealthConcernsSectionCode" constrainedElement="_2umuYJ18EeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v_CRQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HU9ooH3sEeyivuDeOiJBMg" name="HealthConcernsSectionCode" constrainedElement="_2umuYJ18EeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HU9ooX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '75310-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v_EGcF9xEey5t-mahoHmrg" name="HealthConcernsSectionCodeP" constrainedElement="_2umuYJ18EeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v_EGcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HVAE4H3sEeyivuDeOiJBMg" name="HealthConcernsSectionCodeP" constrainedElement="_2umuYJ18EeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HVAE4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v_FUkF9xEey5t-mahoHmrg" name="HealthConcernsSectionTitle" constrainedElement="_2umuYJ18EeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v_FUkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HVB6EH3sEeyivuDeOiJBMg" name="HealthConcernsSectionTitle" constrainedElement="_2umuYJ18EeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HVB6EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v_GisF9xEey5t-mahoHmrg" name="HealthConcernsSectionText" constrainedElement="_2umuYJ18EeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v_GisV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HVDvQH3sEeyivuDeOiJBMg" name="HealthConcernsSectionText" constrainedElement="_2umuYJ18EeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HVDvQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v_lq4F9xEey5t-mahoHmrg" name="HealthConcernsSectionHealthConcernAct" constrainedElement="_2umuYJ18EeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v_lq4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HVwS0H3sEeyivuDeOiJBMg" name="HealthConcernsSectionHealthConcernAct" constrainedElement="_2umuYJ18EeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HVwS0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::HealthConcernAct))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2escUF9xEey5t-mahoHmrg" name="HealthConcernsSectionHealthStatusObservation2" constrainedElement="_2umuYJ18EeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2escUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NDSdYH3sEeyivuDeOiJBMg" name="HealthConcernsSectionHealthStatusObservation2" constrainedElement="_2umuYJ18EeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NDTEcH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::HealthStatusObservation2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4M6RoF9xEey5t-mahoHmrg" name="HealthConcernsSectionRiskConcernAct" constrainedElement="_2umuYJ18EeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4M6RoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OhkZQH3sEeyivuDeOiJBMg" name="HealthConcernsSectionRiskConcernAct" constrainedElement="_2umuYJ18EeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OhkZQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::RiskConcernAct))</body>
         </specification>
@@ -23173,37 +23173,37 @@ value.code = '75310-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_2unVcJ18EeORR8_YW0n_jQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_v_lq4l9xEey5t-mahoHmrg" name="getHealthConcernActs" bodyCondition="_v_lq5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_v_lq5V9xEey5t-mahoHmrg" name="body" constrainedElement="_v_lq4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_v_lq5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_HVwS0n3sEeyivuDeOiJBMg" name="getHealthConcernActs" bodyCondition="_HVwS1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_HVwS1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_HVwS0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_HVwS1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::HealthConcernAct)).oclAsType(consol::HealthConcernAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_v_lq419xEey5t-mahoHmrg" type="_An8P8I9kEeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_v_lq5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_HVwS033sEeyivuDeOiJBMg" type="_An8P8I9kEeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HVwS1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2escUl9xEey5t-mahoHmrg" name="getHealthStatusObservation2s" bodyCondition="_2etDYF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2etDYF9xEey5t-mahoHmrg" name="body" constrainedElement="_2escUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2etDYV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NDTEcX3sEeyivuDeOiJBMg" name="getHealthStatusObservation2s" bodyCondition="_NDTEdH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NDTEdH3sEeyivuDeOiJBMg" name="body" constrainedElement="_NDTEcX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NDTEdX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::HealthStatusObservation2)).oclAsType(consol::HealthStatusObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2escU19xEey5t-mahoHmrg" type="_DMvdYOEFEeOmBMTtnrPqww" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2escVF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_NDTEcn3sEeyivuDeOiJBMg" type="_DMvdYOEFEeOmBMTtnrPqww" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NDTEc33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4M64sF9xEey5t-mahoHmrg" name="getRiskConcernActs" bodyCondition="_4M64s19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4M64s19xEey5t-mahoHmrg" name="body" constrainedElement="_4M64sF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4M64tF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OhkZQn3sEeyivuDeOiJBMg" name="getRiskConcernActs" bodyCondition="_OhkZRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OhkZRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OhkZQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OhkZRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::RiskConcernAct)).oclAsType(consol::RiskConcernAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4M64sV9xEey5t-mahoHmrg" type="_mMk3QON1EeS_XOr-dz_KWA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4M64sl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OhkZQ33sEeyivuDeOiJBMg" type="_mMk3QON1EeS_XOr-dz_KWA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OhkZRH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -23211,46 +23211,46 @@ value.code = '75310-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_1oCLEJ2AEeORR8_YW0n_jQ">
         <body>This template represents observations regarding the outcome of care from the interventions used to treat the patient. These observations represent status, at points in time, related to established care plan goals and/or interventions.</body>
       </ownedComment>
-      <ownedRule xmi:id="_v_mR8F9xEey5t-mahoHmrg" name="HealthStatusEvaluationsAndOutcomesSectionTemplateId" constrainedElement="_EHgh0J2AEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v_mR8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HVw54H3sEeyivuDeOiJBMg" name="HealthStatusEvaluationsAndOutcomesSectionTemplateId" constrainedElement="_EHgh0J2AEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HVw54X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.61')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v_ngEF9xEey5t-mahoHmrg" name="HealthStatusEvaluationsAndOutcomesSectionNullFlavor" constrainedElement="_EHgh0J2AEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v_ngEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HVyvEH3sEeyivuDeOiJBMg" name="HealthStatusEvaluationsAndOutcomesSectionNullFlavor" constrainedElement="_EHgh0J2AEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HVyvEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('nullFlavor')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v_ouMF9xEey5t-mahoHmrg" name="HealthStatusEvaluationsAndOutcomesSectionCode" constrainedElement="_EHgh0J2AEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v_ouMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HV0kQH3sEeyivuDeOiJBMg" name="HealthStatusEvaluationsAndOutcomesSectionCode" constrainedElement="_EHgh0J2AEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HV0kQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '11383-7' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v_p8UF9xEey5t-mahoHmrg" name="HealthStatusEvaluationsAndOutcomesSectionCodeP" constrainedElement="_EHgh0J2AEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v_p8UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HV2ZcH3sEeyivuDeOiJBMg" name="HealthStatusEvaluationsAndOutcomesSectionCodeP" constrainedElement="_EHgh0J2AEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HV2ZcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v_rxgF9xEey5t-mahoHmrg" name="HealthStatusEvaluationsAndOutcomesSectionTitle" constrainedElement="_EHgh0J2AEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v_rxgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HV4OoH3sEeyivuDeOiJBMg" name="HealthStatusEvaluationsAndOutcomesSectionTitle" constrainedElement="_EHgh0J2AEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HV4OoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_v_s_oF9xEey5t-mahoHmrg" name="HealthStatusEvaluationsAndOutcomesSectionText" constrainedElement="_EHgh0J2AEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_v_s_oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HV5cwH3sEeyivuDeOiJBMg" name="HealthStatusEvaluationsAndOutcomesSectionText" constrainedElement="_EHgh0J2AEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HV5cwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wAKSoF9xEey5t-mahoHmrg" name="HealthStatusEvaluationsAndOutcomesSectionOutcomeObservation" constrainedElement="_EHgh0J2AEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wAK5sF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HWggwH3sEeyivuDeOiJBMg" name="HealthStatusEvaluationsAndOutcomesSectionOutcomeObservation" constrainedElement="_EHgh0J2AEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HWggwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::OutcomeObservation))</body>
         </specification>
@@ -23258,15 +23258,15 @@ value.code = '11383-7' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_EHgh0Z2AEeORR8_YW0n_jQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_wAK5sV9xEey5t-mahoHmrg" name="getOutcomeObservations" bodyCondition="_wAK5tF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_wAK5tF9xEey5t-mahoHmrg" name="body" constrainedElement="_wAK5sV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_wAK5tV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_HWggwn3sEeyivuDeOiJBMg" name="getOutcomeObservations" bodyCondition="_HWggxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_HWggxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_HWggwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_HWggxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::OutcomeObservation)).oclAsType(consol::OutcomeObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_wAK5sl9xEey5t-mahoHmrg" type="_ihaWkI55EeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wAK5s19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_HWggw33sEeyivuDeOiJBMg" type="_ihaWkI55EeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HWggxH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -23288,52 +23288,52 @@ The Mental Status Section contains observations and evaluations related to a pat
 &lt;li>Insight and judgment (e.g., understanding of condition, decision making)&lt;/li>&#xD;
 &lt;/ul></body>
       </ownedComment>
-      <ownedRule xmi:id="_wAK5tl9xEey5t-mahoHmrg" name="MentalStatusSectionTemplateId" constrainedElement="_4tfOMJ2CEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wAK5t19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HWhH0H3sEeyivuDeOiJBMg" name="MentalStatusSectionTemplateId" constrainedElement="_4tfOMJ2CEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HWhH0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.56' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wAMH0F9xEey5t-mahoHmrg" name="MentalStatusSectionCode" constrainedElement="_4tfOMJ2CEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wAMH0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HWiV8H3sEeyivuDeOiJBMg" name="MentalStatusSectionCode" constrainedElement="_4tfOMJ2CEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HWiV8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10190-7' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wANV8F9xEey5t-mahoHmrg" name="MentalStatusSectionCodeP" constrainedElement="_4tfOMJ2CEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wANV8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HWkyMH3sEeyivuDeOiJBMg" name="MentalStatusSectionCodeP" constrainedElement="_4tfOMJ2CEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HWkyMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wAOkEF9xEey5t-mahoHmrg" name="MentalStatusSectionTitle" constrainedElement="_4tfOMJ2CEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wAOkEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HWnOcH3sEeyivuDeOiJBMg" name="MentalStatusSectionTitle" constrainedElement="_4tfOMJ2CEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HWnOcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wAPyMF9xEey5t-mahoHmrg" name="MentalStatusSectionText" constrainedElement="_4tfOMJ2CEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wAPyMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HWpDoH3sEeyivuDeOiJBMg" name="MentalStatusSectionText" constrainedElement="_4tfOMJ2CEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HWpDoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wAwvkF9xEey5t-mahoHmrg" name="MentalStatusSectionAssessmentScaleObservation" constrainedElement="_4tfOMJ2CEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wAwvkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HXL2MH3sEeyivuDeOiJBMg" name="MentalStatusSectionAssessmentScaleObservation" constrainedElement="_4tfOMJ2CEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HXL2MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::AssessmentScaleObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4NbPAF9xEey5t-mahoHmrg" name="MentalStatusSectionMentalStatusOrganizer2" constrainedElement="_4tfOMJ2CEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4NbPAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Oh_QAH3sEeyivuDeOiJBMg" name="MentalStatusSectionMentalStatusOrganizer2" constrainedElement="_4tfOMJ2CEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Oh_QAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.organizer.oclIsUndefined() and entry.organizer.oclIsKindOf(consol::MentalStatusOrganizer2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4N7lUF9xEey5t-mahoHmrg" name="MentalStatusSectionMentalStatusObservation2" constrainedElement="_4tfOMJ2CEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4N7lUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OiaGwH3sEeyivuDeOiJBMg" name="MentalStatusSectionMentalStatusObservation2" constrainedElement="_4tfOMJ2CEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OiaGwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::MentalStatusObservation2))</body>
         </specification>
@@ -23341,37 +23341,37 @@ value.code = '10190-7' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_4tf1QJ2CEeORR8_YW0n_jQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_wAxWoF9xEey5t-mahoHmrg" name="getAssessmentScaleObservations" bodyCondition="_wAxWo19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_wAxWo19xEey5t-mahoHmrg" name="body" constrainedElement="_wAxWoF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_wAxWpF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_HXL2Mn3sEeyivuDeOiJBMg" name="getAssessmentScaleObservations" bodyCondition="_HXMdQH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_HXMdQH3sEeyivuDeOiJBMg" name="body" constrainedElement="_HXL2Mn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_HXMdQX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AssessmentScaleObservation)).oclAsType(consol::AssessmentScaleObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_wAxWoV9xEey5t-mahoHmrg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wAxWol9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_HXL2M33sEeyivuDeOiJBMg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HXL2NH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4NbPAl9xEey5t-mahoHmrg" name="getMentalStatusOrganizer2s" bodyCondition="_4NbPBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4NbPBV9xEey5t-mahoHmrg" name="body" constrainedElement="_4NbPAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4NbPBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Oh_QAn3sEeyivuDeOiJBMg" name="getMentalStatusOrganizer2s" bodyCondition="_Oh_QBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Oh_QBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Oh_QAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Oh_QBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::MentalStatusOrganizer2)).oclAsType(consol::MentalStatusOrganizer2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4NbPA19xEey5t-mahoHmrg" type="_6LYrULkoEeODDJAC5t5vpw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4NbPBF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Oh_QA33sEeyivuDeOiJBMg" type="_6LYrULkoEeODDJAC5t5vpw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Oh_QBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4N8MYF9xEey5t-mahoHmrg" name="getMentalStatusObservation2s" bodyCondition="_4N8MY19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4N8MY19xEey5t-mahoHmrg" name="body" constrainedElement="_4N8MYF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4N8MZF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Oiat0H3sEeyivuDeOiJBMg" name="getMentalStatusObservation2s" bodyCondition="_Oiat033sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Oiat033sEeyivuDeOiJBMg" name="body" constrainedElement="_Oiat0H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Oiat1H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::MentalStatusObservation2)).oclAsType(consol::MentalStatusObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4N8MYV9xEey5t-mahoHmrg" type="_ze150PitEeOXlK95I8tUew" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4N8MYl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Oiat0X3sEeyivuDeOiJBMg" type="_ze150PitEeOXlK95I8tUew" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Oiat0n3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -23379,40 +23379,40 @@ value.code = '10190-7' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_bshckJ2GEeORR8_YW0n_jQ">
         <body>The Nutrition Section represents diet and nutrition information including special diet requirements and restrictions (e.g., texture modified diet, liquids only, enteral feeding). It also represents the overall nutritional status of the patient and nutrition assessment findings.</body>
       </ownedComment>
-      <ownedRule xmi:id="_wAxWpV9xEey5t-mahoHmrg" name="NutritionSectionTemplateId" constrainedElement="_MlM4IJ2GEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wAxWpl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HXMdQn3sEeyivuDeOiJBMg" name="NutritionSectionTemplateId" constrainedElement="_MlM4IJ2GEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HXMdQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.57')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wAykwF9xEey5t-mahoHmrg" name="NutritionSectionCode" constrainedElement="_MlM4IJ2GEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wAykwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HXNrYH3sEeyivuDeOiJBMg" name="NutritionSectionCode" constrainedElement="_MlM4IJ2GEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HXNrYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '61144-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wAzy4F9xEey5t-mahoHmrg" name="NutritionSectionCodeP" constrainedElement="_MlM4IJ2GEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wAzy4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HXPgkH3sEeyivuDeOiJBMg" name="NutritionSectionCodeP" constrainedElement="_MlM4IJ2GEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HXPgkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wA1BAF9xEey5t-mahoHmrg" name="NutritionSectionTitle" constrainedElement="_MlM4IJ2GEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wA1BAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HXQusH3sEeyivuDeOiJBMg" name="NutritionSectionTitle" constrainedElement="_MlM4IJ2GEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HXQusX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wA2PIF9xEey5t-mahoHmrg" name="NutritionSectionText" constrainedElement="_MlM4IJ2GEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wA2PIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HXSj4H3sEeyivuDeOiJBMg" name="NutritionSectionText" constrainedElement="_MlM4IJ2GEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HXSj4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wBUJMF9xEey5t-mahoHmrg" name="NutritionSectionNutritionalStatusObservation" constrainedElement="_MlM4IJ2GEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wBUJMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HX5n4H3sEeyivuDeOiJBMg" name="NutritionSectionNutritionalStatusObservation" constrainedElement="_MlM4IJ2GEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HX5n4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::NutritionalStatusObservation))</body>
         </specification>
@@ -23420,15 +23420,15 @@ value.code = '61144-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_MlM4IZ2GEeORR8_YW0n_jQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_wBUJMl9xEey5t-mahoHmrg" name="getNutritionalStatusObservations" bodyCondition="_wBUJNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_wBUJNV9xEey5t-mahoHmrg" name="body" constrainedElement="_wBUJMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_wBUJNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_HX6O8H3sEeyivuDeOiJBMg" name="getNutritionalStatusObservations" bodyCondition="_HX6O833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_HX6O833sEeyivuDeOiJBMg" name="body" constrainedElement="_HX6O8H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_HX6O9H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::NutritionalStatusObservation)).oclAsType(consol::NutritionalStatusObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_wBUJM19xEey5t-mahoHmrg" type="_T1dcwI37EeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wBUJNF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_HX6O8X3sEeyivuDeOiJBMg" type="_T1dcwI37EeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HX6O8n3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -23439,40 +23439,40 @@ value.code = '61144-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_k98SkPm-EeSGHoih4Jm09A">
         <body>REMOVED</body>
       </ownedComment>
-      <ownedRule xmi:id="_wBUwQF9xEey5t-mahoHmrg" name="PhysicalFindingsOfSkinSectionTemplateId" constrainedElement="_CDn9gJ2LEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wBUwQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HX6O9X3sEeyivuDeOiJBMg" name="PhysicalFindingsOfSkinSectionTemplateId" constrainedElement="_CDn9gJ2LEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HX6O9n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.62')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wBVXUF9xEey5t-mahoHmrg" name="PhysicalFindingsOfSkinSectionCode" constrainedElement="_CDn9gJ2LEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wBVXUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HX7dEH3sEeyivuDeOiJBMg" name="PhysicalFindingsOfSkinSectionCode" constrainedElement="_CDn9gJ2LEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HX7dEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10206-1' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wBXMgF9xEey5t-mahoHmrg" name="PhysicalFindingsOfSkinSectionCodeP" constrainedElement="_CDn9gJ2LEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wBXMgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HX8rMH3sEeyivuDeOiJBMg" name="PhysicalFindingsOfSkinSectionCodeP" constrainedElement="_CDn9gJ2LEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HX9SQH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wBYaoF9xEey5t-mahoHmrg" name="PhysicalFindingsOfSkinSectionTitle" constrainedElement="_CDn9gJ2LEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wBYaoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HX-gYH3sEeyivuDeOiJBMg" name="PhysicalFindingsOfSkinSectionTitle" constrainedElement="_CDn9gJ2LEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HX-gYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wBZowF9xEey5t-mahoHmrg" name="PhysicalFindingsOfSkinSectionText" constrainedElement="_CDn9gJ2LEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wBZowV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HX_ugH3sEeyivuDeOiJBMg" name="PhysicalFindingsOfSkinSectionText" constrainedElement="_CDn9gJ2LEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HX_ugX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wB5_EF9xEey5t-mahoHmrg" name="PhysicalFindingsOfSkinSectionWoundObservation" constrainedElement="_CDn9gJ2LEeORR8_YW0n_jQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wB5_EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HYePoH3sEeyivuDeOiJBMg" name="PhysicalFindingsOfSkinSectionWoundObservation" constrainedElement="_CDn9gJ2LEeORR8_YW0n_jQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HYe2sH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::LongitudinalCareWoundObservation))</body>
         </specification>
@@ -23480,15 +23480,15 @@ value.code = '10206-1' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_CDn9gZ2LEeORR8_YW0n_jQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_wB6mIF9xEey5t-mahoHmrg" name="getWoundObservations" bodyCondition="_wB6mI19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_wB6mI19xEey5t-mahoHmrg" name="body" constrainedElement="_wB6mIF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_wB6mJF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_HYe2sX3sEeyivuDeOiJBMg" name="getWoundObservations" bodyCondition="_HYe2tH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_HYe2tH3sEeyivuDeOiJBMg" name="body" constrainedElement="_HYe2sX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_HYe2tX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::LongitudinalCareWoundObservation)).oclAsType(consol::LongitudinalCareWoundObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_wB6mIV9xEey5t-mahoHmrg" type="_09uFMJp_EeOK6dzbL4VoTA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wB6mIl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_HYe2sn3sEeyivuDeOiJBMg" type="_09uFMJp_EeOK6dzbL4VoTA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HYe2s33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -23502,510 +23502,510 @@ value.code = '10206-1' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>code.codeSystem = '2.16.840.1.113883.6.1'</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wB6mJV9xEey5t-mahoHmrg" name="USRealmHeader2TemplateId" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wB6mJl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HYe2tn3sEeyivuDeOiJBMg" name="USRealmHeader2TemplateId" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HYfdwH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.1' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wB70QF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRealmCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wB70QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HYgE0H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRealmCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HYgE0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.realmCode->isEmpty() or self.realmCode->exists(element | element.isNullFlavorUndefined())) implies (self.realmCode->size() = 1 and self.realmCode->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = element.oclAsType(datatypes::CS) in 
 value.code = 'US'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wB-QgF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsTitle" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wB-QgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HYh6AH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsTitle" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HYh6AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z7p30F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTarget" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z7p30V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KyrssH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTarget" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KyrssX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->exists(recordTarget : cda::RecordTarget | not recordTarget.oclIsUndefined() and recordTarget.oclIsKindOf(cda::RecordTarget))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z-FgwF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEnterer" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z-FgwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_K0zzoH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEnterer" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_K0zzoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->one(dataEnterer : cda::DataEnterer | not dataEnterer.oclIsUndefined() and dataEnterer.oclIsKindOf(cda::DataEnterer))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z-uZ8F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthor" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z-uZ8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_K1RtsH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthor" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_K1SUwH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(cda::Author))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z_OJMF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsCustodian" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z_OJMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_K1tLgH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsCustodian" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_K1tLgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->one(custodian : cda::Custodian | not custodian.oclIsUndefined() and custodian.oclIsKindOf(cda::Custodian))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z_rcMF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformationRecipient" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z_rcMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_K2ICQH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformationRecipient" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_K2ICQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->exists(informationRecipient : cda::InformationRecipient | not informationRecipient.oclIsUndefined() and informationRecipient.oclIsKindOf(cda::InformationRecipient))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0AMZkF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsLegalAuthenticator" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0AMZkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_K2iR8H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsLegalAuthenticator" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_K2iR8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->one(legalAuthenticator : cda::LegalAuthenticator | not legalAuthenticator.oclIsUndefined() and legalAuthenticator.oclIsKindOf(cda::LegalAuthenticator))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0AqToF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthenticator" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0AqToV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_K2-W0H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthenticator" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_K2-W0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->exists(authenticator : cda::Authenticator | not authenticator.oclIsUndefined() and authenticator.oclIsKindOf(cda::Authenticator))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0BJb0F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformant" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0BJb0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_K3ZNkH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformant" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_K3ZNkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->exists(informant : cda::Informant12 | not informant.oclIsUndefined() and informant.oclIsKindOf(cda::Informant12))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0Bn88F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInFulfillmentOf" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0Bn88V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_K30rYH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInFulfillmentOf" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_K31ScH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->exists(inFulfillmentOf : cda::InFulfillmentOf | not inFulfillmentOf.oclIsUndefined() and inFulfillmentOf.oclIsKindOf(cda::InFulfillmentOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0CITQF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsComponentOf" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0CITQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_K4QJMH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsComponentOf" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_K4QwQH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->one(componentOf : cda::Component1 | not componentOf.oclIsUndefined() and componentOf.oclIsKindOf(cda::Component1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0DHKsF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsSupportParticipant" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0DHKsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_K5I6AH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsSupportParticipant" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_K5I6AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->select(participant : cda::Participant1 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant1))->select(typeCode = vocab::ParticipationType::IND)->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0DlEwF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOf" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0Dlr0F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_K5kX0H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOf" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_K5kX0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->exists(documentationOf : cda::DocumentationOf | not documentationOf.oclIsUndefined() and documentationOf.oclIsKindOf(cda::DocumentationOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0FE5kF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorization" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0FE5kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_K64mcH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorization" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_K64mcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->exists(authorization : cda::Authorization | not authorization.oclIsUndefined() and authorization.oclIsKindOf(cda::Authorization))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_66nOAF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTELUse" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_66nOAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RJ8wwH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTELUse" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RJ9X0H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null).telecom->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_66n1EF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCodeFromPersonalRelationshipOrResponsibleParty" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_66n1EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RJ9X0X3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCodeFromPersonalRelationshipOrResponsibleParty" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RJ9X0n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_66n1El9xEey5t-mahoHmrg" name="USRealmHeader2RecordTargetPatientRolePatientGuardianCodeTerminology" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_66n1E19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RJ9-4H3sEeyivuDeOiJBMg" name="USRealmHeader2RecordTargetPatientRolePatientGuardianCodeTerminology" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RJ9-4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null)->reject(not code.oclIsUndefined() and code.isNullFlavorUndefined() implies code.oclIsKindOf(datatypes::CE) and &#xD;
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in &#xD;
 value.codeSystem = '2.16.840.1.113883.5.111' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_66n1FF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_66n1FV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RJ9-4n3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RJ9-433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_66n1Fl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTelecom" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_66n1F19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RJ-l8H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTelecom" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RJ-l8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (not telecom->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_67HkUF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCodeP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_67HkUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RKcgAH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCodeP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RKdHEH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).languageCommunication->excluding(null)->reject((languageCode.oclIsUndefined() or languageCode.isNullFlavorUndefined()) implies (not languageCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_67HkUl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_67HkU19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RKdHEX3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RKdHEn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).languageCommunication->excluding(null)->reject((languageCode.oclIsUndefined() or languageCode.isNullFlavorUndefined()) implies (not languageCode.oclIsUndefined() and languageCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = languageCode.oclAsType(datatypes::CS) in 
 not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_67ILYF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationPreferenceInd" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_67ILYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RKdHE33sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationPreferenceInd" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RKdHFH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).languageCommunication->excluding(null)->reject((preferenceInd.oclIsUndefined() or preferenceInd.isNullFlavorUndefined()) implies (not preferenceInd.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_67JZgF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToYear" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_67JZgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RKeVMH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToYear" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RKeVMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).birthTime->excluding(null)->select(isNullFlavorUndefined())->reject(not value.oclIsUndefined() and value.size() >= 4)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_67KAkF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToDay" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_67KAkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RKe8QH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToDay" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RKe8QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).birthTime->excluding(null)->select(isNullFlavorUndefined())->reject(not value.oclIsUndefined() and value.size() >= 8)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_67KAkl9xEey5t-mahoHmrg" name="USRealmHeader2RecordTargetPatientRolePatientTSBirthTimePreciseToMinute" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_67KAk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RKe8Qn3sEeyivuDeOiJBMg" name="USRealmHeader2RecordTargetPatientRolePatientTSBirthTimePreciseToMinute" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RKe8Q33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).birthTime->excluding(null)->select(isNullFlavorUndefined())->reject(not value.oclIsUndefined() and value.size() >= 10)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_67KAlF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientTSValue" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_67KAlV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RKe8RH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientTSValue" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RKe8RX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).birthTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (true )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_68W6cF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlaceHasState" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_68W6cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RLZiQH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlaceHasState" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RLZiQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).birthplace->excluding(null).place->excluding(null)->reject((addr.country->exists(curCountry | not curCountry.oclIsUndefined() and curCountry.getText() = 'US')) implies (addr.state->size() = 1) and ((addr.state->exists(curState | (curState.getText() = 'AL' or curState.getText() = 'AK' or curState.getText() = 'AS' or curState.getText() = 'AZ' or curState.getText() = 'AR' or curState.getText() = 'CA' or curState.getText() = 'CO' or curState.getText() = 'CT' or curState.getText() = 'DE' or curState.getText() = 'DC' or curState.getText() = 'FL' or curState.getText() = 'FM' or curState.getText() = 'GA' or curState.getText() = 'GU' or curState.getText() = 'HI' or curState.getText() = 'ID' or curState.getText() = 'IL' or curState.getText() = 'IN' or curState.getText() = 'IA' or curState.getText() = 'KS' or curState.getText() = 'KY' or curState.getText() = 'LA' or curState.getText() = 'ME' or curState.getText() = 'MH' or curState.getText() = 'MD' or curState.getText() = 'MA' or curState.getText() = 'MI' or curState.getText() = 'MN' or curState.getText() = 'MS' or curState.getText() = 'MO' or curState.getText() = 'MT' or curState.getText() = 'NE' or curState.getText() = 'NV' or curState.getText() = 'NH' or curState.getText() = 'NJ' or curState.getText() = 'NM' or curState.getText() = 'NY' or curState.getText() = 'NC' or curState.getText() = 'ND' or curState.getText() = 'MP' or curState.getText() = 'OH' or curState.getText() = 'OK' or curState.getText() = 'OR' or curState.getText() = 'PW' or curState.getText() = 'PA' or curState.getText() = 'PR' or curState.getText() = 'RI' or curState.getText() = 'SC' or curState.getText() = 'SD' or curState.getText() = 'TN' or curState.getText() = 'TX' or curState.getText() = 'UM' or curState.getText() = 'UT' or curState.getText() = 'VT' or curState.getText() = 'VA' or curState.getText() = 'VI' or curState.getText() = 'WA' or curState.getText() = 'WV' or curState.getText() = 'WI' or curState.getText() = 'WY' ))) or (addr.state->exists(curState | curState.isNullFlavorDefined()))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_68W6cl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlace" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_68W6c19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RLZiQn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlace" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RLZiQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).birthplace->excluding(null)->reject(place->one(place : cda::Place | not place.oclIsUndefined() and place.oclIsKindOf(cda::Place)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_68XhgF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_68XhgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RLZiRH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RLZiRX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((raceCode.oclIsUndefined() or raceCode.isNullFlavorUndefined()) implies (not raceCode.oclIsUndefined() and raceCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = raceCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.238' and (value.code = '1002-5' or value.code = '2028-9' or value.code = '2054-5' or value.code = '2076-8' or value.code = '2106-3')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_68Xhgl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCodeP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_68Xhg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RLaJUH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCodeP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RLaJUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((raceCode.oclIsUndefined() or raceCode.isNullFlavorUndefined()) implies (not raceCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_68YIkF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_68YIkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RLaJUn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RLaJU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((ethnicGroupCode.oclIsUndefined() or ethnicGroupCode.isNullFlavorUndefined()) implies (not ethnicGroupCode.oclIsUndefined() and ethnicGroupCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = ethnicGroupCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.238' and (value.code = '2135-2' or value.code = '2186-5')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_68YIkl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCodeP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_68YIk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RLawYH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCodeP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RLawYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((ethnicGroupCode.oclIsUndefined() or ethnicGroupCode.isNullFlavorUndefined()) implies (not ethnicGroupCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_68YIlF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthTime" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_68YIlV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RLawYn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthTime" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RLawY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((birthTime.oclIsUndefined() or birthTime.isNullFlavorUndefined()) implies (not birthTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_68YvoF9xEey5t-mahoHmrg" name="USRealmHeader2RecordTargetPatientRolePatientSDTCEthnicGroupCodeP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_68YvoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RLawZH3sEeyivuDeOiJBMg" name="USRealmHeader2RecordTargetPatientRolePatientSDTCEthnicGroupCodeP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RLawZX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((sDTCEthnicGroupCode->isEmpty() or sDTCEthnicGroupCode->exists(element | element.isNullFlavorUndefined())) implies (not sDTCEthnicGroupCode->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_68Yvol9xEey5t-mahoHmrg" name="USRealmHeader2RecordTargetPatientRolePatientSDTCEthnicGroupCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_68Yvo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RLawZn3sEeyivuDeOiJBMg" name="USRealmHeader2RecordTargetPatientRolePatientSDTCEthnicGroupCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RLawZ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject((sDTCEthnicGroupCode->isEmpty() or sDTCEthnicGroupCode->exists(element | element.isNullFlavorUndefined())) implies (sDTCEthnicGroupCode->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = element.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.238' and not value.code.oclIsUndefined())))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_68ZWsF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardian" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_68ZWsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RLbXcH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardian" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RLbXcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject(guardian->exists(guardian : cda::Guardian | not guardian.oclIsUndefined() and guardian.oclIsKindOf(cda::Guardian)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_68ZWsl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunication" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_68ZWs19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RLbXcn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunication" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RLbXc33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject(languageCommunication->exists(languageCommunication : cda::LanguageCommunication | not languageCommunication.oclIsUndefined() and languageCommunication.oclIsKindOf(cda::LanguageCommunication)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_68Z9wF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplace" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_68Z9wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RLb-gH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplace" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RLb-gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject(birthplace->one(birthplace : cda::Birthplace | not birthplace.oclIsUndefined() and birthplace.oclIsKindOf(cda::Birthplace)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_68Z9wl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatient" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_68Z9w19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RLb-gn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRolePatient" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RLb-g33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null)->reject(patient->one(patient : cda::Patient | not patient.oclIsUndefined() and patient.oclIsKindOf(cda::Patient)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_68Z9xF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsRecordTargetPatientRole" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_68Z9xV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RLb-hH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsRecordTargetPatientRole" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RLb-hX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null)->reject(patientRole->one(patientRole : cda::PatientRole | not patientRole.oclIsUndefined() and patientRole.oclIsKindOf(cda::PatientRole)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_69aqYF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityCodeP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_69aqYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RMSTEH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityCodeP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RMSTEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_69bRcF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntityCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_69bRcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RMS6IH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntityCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RMS6IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_69bRcl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDataEntererAssignedEntity" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_69bRc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RMS6In3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDataEntererAssignedEntity" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RMS6I33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6-bXAF9xEey5t-mahoHmrg" name="USRealmHeader2AuthorAssignedAuthorIfAssignedPersonThenContainsCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6-bXAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RNLD4H3sEeyivuDeOiJBMg" name="USRealmHeader2AuthorAssignedAuthorIfAssignedPersonThenContainsCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RNLD4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject(not assignedPerson.oclIsUndefined() and (code.oclIsUndefined() or code.isNullFlavorUndefined()) implies not code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6-b-EF9xEey5t-mahoHmrg" name="USRealmHeader2AuthorAssignedAuthorCodeTerminology" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6-b-EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RNLD4n3sEeyivuDeOiJBMg" name="USRealmHeader2AuthorAssignedAuthorCodeTerminology" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RNLD433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject(not assignedPerson.oclIsUndefined() and (code.oclIsUndefined() or code.isNullFlavorUndefined()) implies not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and let value : datatypes::CE = code.oclAsType(datatypes::CE) in value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6-b-El9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorCodeP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6-b-E19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RNLD5H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorCodeP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RNLD5X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (true))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6-clIF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthorCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6-clIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RNLq8H3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthorCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RNLq8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (true))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6-clIl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsAuthorAssignedAuthor" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6-clI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RNLq8n3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsAuthorAssignedAuthor" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RNLq833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null)->reject(assignedAuthor->one(assignedAuthor : cda::AssignedAuthor | not assignedAuthor.oclIsUndefined() and assignedAuthor.oclIsKindOf(cda::AssignedAuthor)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6_7L0F9xEey5t-mahoHmrg" name="USRealmHeader2InformationRecipientIntendedRecipientId" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6_7L0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ROercH3sEeyivuDeOiJBMg" name="USRealmHeader2InformationRecipientIntendedRecipientId" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ROercX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_6_7L0l9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformationRecipientIntendedRecipient" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6_7L019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ROercn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformationRecipientIntendedRecipient" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ROerc33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null)->reject(intendedRecipient->one(intendedRecipient : cda::IntendedRecipient | not intendedRecipient.oclIsUndefined() and intendedRecipient.oclIsKindOf(cda::IntendedRecipient)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Aa7EF9xEey5t-mahoHmrg" name="USRealmHeader2LegalAuthenticatorSDTCSignatureText" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Aa7EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RO7-cH3sEeyivuDeOiJBMg" name="USRealmHeader2LegalAuthenticatorSDTCSignatureText" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RO7-cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null)->reject((sDTCSignatureText.oclIsUndefined() or sDTCSignatureText.isNullFlavorUndefined()) implies (not sDTCSignatureText.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7A74cF9xEey5t-mahoHmrg" name="USRealmHeader2AuthenticatorSDTCSignatureText" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7A74cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RPYDUH3sEeyivuDeOiJBMg" name="USRealmHeader2AuthenticatorSDTCSignatureText" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RPYDUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null)->reject((sDTCSignatureText.oclIsUndefined() or sDTCSignatureText.isNullFlavorUndefined()) implies (not sDTCSignatureText.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7B6v4F9xEey5t-mahoHmrg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7B6v4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RQQNEH3sEeyivuDeOiJBMg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RQQNEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ( streetAddressLine->size() >=1 and streetAddressLine->size() &lt;=4))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7B6v4l9xEey5t-mahoHmrg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7B6v419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RQQ0IH3sEeyivuDeOiJBMg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RQQ0IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies state->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7B7W8F9xEey5t-mahoHmrg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7B7W8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RQQ0In3sEeyivuDeOiJBMg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RQQ0I33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies postalCode->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7B7W8l9xEey5t-mahoHmrg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7B7W819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RQRbMH3sEeyivuDeOiJBMg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RQRbMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::PostalAddressUse) and 
 let value : vocab::PostalAddressUse = element.oclAsType(vocab::PostalAddressUse) in 
 value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or value = vocab::PostalAddressUse::H or value = vocab::PostalAddressUse::HP or value = vocab::PostalAddressUse::HV or value = vocab::PostalAddressUse::PHYS or value = vocab::PostalAddressUse::PST or value = vocab::PostalAddressUse::PUB or value = vocab::PostalAddressUse::TMP or value = vocab::PostalAddressUse::WP) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7B7-AF9xEey5t-mahoHmrg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7B7-AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RQRbMn3sEeyivuDeOiJBMg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RQRbM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7B8lEF9xEey5t-mahoHmrg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7B8lEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RQSCQH3sEeyivuDeOiJBMg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RQSCQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((country->isEmpty() or country->exists(element | element.isNullFlavorUndefined())) implies (( not country->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7B8lEl9xEey5t-mahoHmrg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7B8lE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RQSCQn3sEeyivuDeOiJBMg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RQSCQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((state->isEmpty() or state->exists(element | element.isNullFlavorUndefined())) implies (( not state->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7B9MIF9xEey5t-mahoHmrg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7B9MIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RQSpUH3sEeyivuDeOiJBMg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RQSpUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((city->isEmpty() or city->exists(element | element.isNullFlavorUndefined())) implies (city->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7B9MIl9xEey5t-mahoHmrg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7B9MI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RQSpUn3sEeyivuDeOiJBMg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RQSpU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((postalCode->isEmpty() or postalCode->exists(element | element.isNullFlavorUndefined())) implies (( not postalCode->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7B9zMF9xEey5t-mahoHmrg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7B9zMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RQTQYH3sEeyivuDeOiJBMg" name="USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RQTQYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((streetAddressLine->isEmpty() or streetAddressLine->exists(element | element.isNullFlavorUndefined())) implies (( not streetAddressLine->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7B9zMl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityCodeP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7B9zM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RQTQYn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityCodeP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RQTQY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7B-aQF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7B-aQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RQTQZH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RQTQZX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7B-aQl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantAssignedEntityAddr" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7B-aQ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RQT3cH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantAssignedEntityAddr" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RQT3cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).assignedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (( not addr->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7CfXoF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantRelatedEntityAddr" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7CfXoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RQv8UH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantRelatedEntityAddr" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RQv8UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).relatedEntity->excluding(null)->reject(addr->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7CfXol9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantRelatedEntityPerson" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Cf-sF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RQwjYH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantRelatedEntityPerson" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RQwjYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).relatedEntity->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Cf-sV9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsInformantHasAssignedEntityOrRelatedEntity" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Cf-sl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RQwjYn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsInformantHasAssignedEntityOrRelatedEntity" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RQwjY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null)->reject(assignedEntity.oclIsUndefined() xor relatedEntity.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Cf-s19xEey5t-mahoHmrg" name="USRealmHeader2GeneralHeaderConstraintsInformantAssignedEntity" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Cf-tF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RQxKcH3sEeyivuDeOiJBMg" name="USRealmHeader2GeneralHeaderConstraintsInformantAssignedEntity" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RQxKcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7CglwF9xEey5t-mahoHmrg" name="USRealmHeader2GeneralHeaderConstraintsInformantRelatedEntity" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7CglwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RQxKcn3sEeyivuDeOiJBMg" name="USRealmHeader2GeneralHeaderConstraintsInformantRelatedEntity" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RQxKc33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7D6T8F9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsComponentOfEncompassingEncounter" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7D6T8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RSHOQH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsComponentOfEncompassingEncounter" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RSHOQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null)->reject(encompassingEncounter->one(encompassingEncounter : cda::EncompassingEncounter | not encompassingEncounter.oclIsUndefined() and encompassingEncounter.oclIsKindOf(cda::EncompassingEncounter)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7EcfcF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsParticipantSupportAssociatedEntityHasAssociatedPersonOrScopingOrganization" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7EcfcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RSlvYH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsParticipantSupportAssociatedEntityHasAssociatedPersonOrScopingOrganization" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RSlvYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::IND)->select(typeCode = vocab::ParticipationType::IND)->reject((not associatedEntity.associatedPerson.oclIsUndefined()) or (not associatedEntity.scopingOrganization.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7GcDgF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCodeP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7GcDgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RUX4EH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCodeP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RUX4EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7GcqkF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7GcqkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RUYfIH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RUYfIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Gcqkl9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCodeP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Gcqk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RUYfIn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCodeP" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RUYfI33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->reject((functionCode.oclIsUndefined() or functionCode.isNullFlavorUndefined()) implies (not functionCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7GdRoF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7GdRoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RUYfJH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCode" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RUYfJX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->reject((functionCode.oclIsUndefined() or functionCode.isNullFlavorUndefined()) implies (not functionCode.oclIsUndefined() and functionCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = functionCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.88' and (value.code = 'ADMPHYS' or value.code = 'ANEST' or value.code = 'ANRS' or value.code = 'ATTPHYS' or value.code = 'DISPHYS' or value.code = 'FASST' or value.code = 'MDWF' or value.code = 'NASST' or value.code = 'PCP' or value.code = 'PRISURG' or value.code = 'RNDPHYS' or value.code = 'SASST' or value.code = 'SNRS' or value.code = 'TASST')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7GdRol9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntity" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7GdRo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RUZGMH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntity" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RUZGMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7GdRpF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7GdRpV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RUZGMn3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEventPerformer" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RUZGM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(performer->exists(performer : cda::Performer1 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer1)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Gd4sF9xEey5t-mahoHmrg" name="GeneralHeaderConstraintsDocumentationOfServiceEvent" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Gd4sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RUZtQH3sEeyivuDeOiJBMg" name="GeneralHeaderConstraintsDocumentationOfServiceEvent" constrainedElement="_dduXkJ5OEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RUZtQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null)->reject(serviceEvent->one(serviceEvent : cda::ServiceEvent | not serviceEvent.oclIsUndefined() and serviceEvent.oclIsKindOf(cda::ServiceEvent)))</body>
         </specification>
@@ -24053,483 +24053,483 @@ Please see Volume 1 of this guide to view a Care Plan Relationship diagram and s
           <body>not self.getAllSections()->exists(s : cda::Section | s.oclIsTypeOf(consol::PlanOfTreatmentSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wKfTUF9xEey5t-mahoHmrg" name="USRealmHeader2TemplateId" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wKfTUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HgJk8H3sEeyivuDeOiJBMg" name="USRealmHeader2TemplateId" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HgKMAH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.15' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wK-bgF9xEey5t-mahoHmrg" name="CarePlanCodeP" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wK-bgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Hgp7QH3sEeyivuDeOiJBMg" name="CarePlanCodeP" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Hgp7QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wKghcF9xEey5t-mahoHmrg" name="CarePlanCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wKghcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HgKzEH3sEeyivuDeOiJBMg" name="CarePlanCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HgKzEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '18776-5' or value.code = '52521-2' or value.code = '81957-3'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wLfY4F9xEey5t-mahoHmrg" name="CarePlanSetId" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wLfY4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HhJDcH3sEeyivuDeOiJBMg" name="CarePlanSetId" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HhJDcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.setId.oclIsUndefined() or self.setId.isNullFlavorUndefined()) implies (not self.setId.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wLh1IF9xEey5t-mahoHmrg" name="CarePlanVersionNumber" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wLh1IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HhLfsH3sEeyivuDeOiJBMg" name="CarePlanVersionNumber" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HhLfsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.versionNumber.oclIsUndefined() or self.versionNumber.isNullFlavorUndefined()) implies (not self.versionNumber.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wQkGIF9xEey5t-mahoHmrg" name="CarePlanInformationRecipient" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wQkGIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HlpwAH3sEeyivuDeOiJBMg" name="CarePlanInformationRecipient" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HlqXEH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->exists(informationRecipient : cda::InformationRecipient | not informationRecipient.oclIsUndefined() and informationRecipient.oclIsKindOf(cda::InformationRecipient))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wREccF9xEey5t-mahoHmrg" name="CarePlanAuthenticator" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wREccV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HmD_sH3sEeyivuDeOiJBMg" name="CarePlanAuthenticator" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HmD_sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->one(authenticator : cda::Authenticator | not authenticator.oclIsUndefined() and authenticator.oclIsKindOf(cda::Authenticator))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wSEiAF9xEey5t-mahoHmrg" name="CarePlanParticipantCarePlanReview" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wSEiAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Hm4fEH3sEeyivuDeOiJBMg" name="CarePlanParticipantCarePlanReview" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Hm4fEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->select(participant : cda::Participant1 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant1))->select(typeCode=vocab::ParticipationType::VRF)->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wTCyYF9xEey5t-mahoHmrg" name="CarePlanParticipantCaregiver" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wTCyYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HntlgH3sEeyivuDeOiJBMg" name="CarePlanParticipantCaregiver" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HntlgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->select(participant : cda::Participant1 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant1))->select(typeCode=vocab::ParticipationType::IND)->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wUiAIF9xEey5t-mahoHmrg" name="CarePlanDocumentationOf" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wUiAIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HpDCQH3sEeyivuDeOiJBMg" name="CarePlanDocumentationOf" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HpDpUH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->one(documentationOf : cda::DocumentationOf | not documentationOf.oclIsUndefined() and documentationOf.oclIsKindOf(cda::DocumentationOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wWpgAF9xEey5t-mahoHmrg" name="CarePlanRelatedDocument" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wWpgAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HqtPIH3sEeyivuDeOiJBMg" name="CarePlanRelatedDocument" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HqtPIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.relatedDocument->exists(relatedDocument : cda::RelatedDocument | not relatedDocument.oclIsUndefined() and relatedDocument.oclIsKindOf(cda::RelatedDocument))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wXqMoF9xEey5t-mahoHmrg" name="CarePlanComponentOf" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wXqMoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Hri8oH3sEeyivuDeOiJBMg" name="CarePlanComponentOf" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Hri8oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->one(componentOf : cda::Component1 | not componentOf.oclIsUndefined() and componentOf.oclIsKindOf(cda::Component1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wYmAwF9xEey5t-mahoHmrg" name="CarePlanHealthConcernsSection" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wYmAwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HsWN4H3sEeyivuDeOiJBMg" name="CarePlanHealthConcernsSection" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HsWN4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HealthConcernsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wZCFoF9xEey5t-mahoHmrg" name="CarePlanGoalsSection" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wZCFoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Hs2kMH3sEeyivuDeOiJBMg" name="CarePlanGoalsSection" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Hs2kMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::GoalsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wZhN0F9xEey5t-mahoHmrg" name="CarePlanHealthStatusEvaluationsOutcomesSection" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wZhN0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HtSCAH3sEeyivuDeOiJBMg" name="CarePlanHealthStatusEvaluationsOutcomesSection" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HtSCAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HealthStatusEvaluationsAndOutcomesSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2fMyoF9xEey5t-mahoHmrg" name="CarePlanInterventionsSection2" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2fMyoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NDvwYH3sEeyivuDeOiJBMg" name="CarePlanInterventionsSection2" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NDvwYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::InterventionsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7IhHIF9xEey5t-mahoHmrg" name="CarePlanInformationRecipientIntendedRecipientInformationRecipientGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7IhHIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RWNrIH3sEeyivuDeOiJBMg" name="CarePlanInformationRecipientIntendedRecipientInformationRecipientGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RWNrIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null).informationRecipient->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject((getText(true)&lt;>'' and ( family->isEmpty() and given->isEmpty() and suffix->isEmpty() and prefix->isEmpty()   )   ) xor (getText(true)='' and (not family->isEmpty() and not given->isEmpty()  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7IhHIl9xEey5t-mahoHmrg" name="CarePlanInformationRecipientIntendedRecipientInformationRecipientName" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7IhHI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RWOSMH3sEeyivuDeOiJBMg" name="CarePlanInformationRecipientIntendedRecipientInformationRecipientName" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RWOSMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null).informationRecipient->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (name->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7JBdcF9xEey5t-mahoHmrg" name="CarePlanInformationRecipientIntendedRecipientReceivedOrganizationId" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7JBdcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RWsMQH3sEeyivuDeOiJBMg" name="CarePlanInformationRecipientIntendedRecipientReceivedOrganizationId" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RWsMQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null).receivedOrganization->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7JBdcl9xEey5t-mahoHmrg" name="CarePlanInformationRecipientIntendedRecipientReceivedOrganizationName" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7JBdc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RWsMQn3sEeyivuDeOiJBMg" name="CarePlanInformationRecipientIntendedRecipientReceivedOrganizationName" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RWsMQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null).receivedOrganization->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7JCEgF9xEey5t-mahoHmrg" name="CarePlanInformationRecipientIntendedRecipientReceivedOrganizationStandardIndustryClassCodeP" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7JCEgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RWsMRH3sEeyivuDeOiJBMg" name="CarePlanInformationRecipientIntendedRecipientReceivedOrganizationStandardIndustryClassCodeP" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RWsMRX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null).receivedOrganization->excluding(null)->reject((standardIndustryClassCode.oclIsUndefined() or standardIndustryClassCode.isNullFlavorUndefined()) implies (not standardIndustryClassCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7JCEgl9xEey5t-mahoHmrg" name="CarePlanInformationRecipientIntendedRecipientReceivedOrganizationStandardIndustryClassCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7JCEg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RWszUH3sEeyivuDeOiJBMg" name="CarePlanInformationRecipientIntendedRecipientReceivedOrganizationStandardIndustryClassCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RWszUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null).receivedOrganization->excluding(null)->reject((standardIndustryClassCode.oclIsUndefined() or standardIndustryClassCode.isNullFlavorUndefined()) implies (not standardIndustryClassCode.oclIsUndefined() and standardIndustryClassCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = standardIndustryClassCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7JCEhF9xEey5t-mahoHmrg" name="CarePlanInformationRecipientIntendedRecipientId" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7JCEhV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RWszUn3sEeyivuDeOiJBMg" name="CarePlanInformationRecipientIntendedRecipientId" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RWszU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7JCrkF9xEey5t-mahoHmrg" name="CarePlanInformationRecipientIntendedRecipientAddr" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7JCrkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RWszVH3sEeyivuDeOiJBMg" name="CarePlanInformationRecipientIntendedRecipientAddr" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RWszVX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (not addr->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7JCrkl9xEey5t-mahoHmrg" name="CarePlanInformationRecipientIntendedRecipientTelecom" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7JCrk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RWtaYH3sEeyivuDeOiJBMg" name="CarePlanInformationRecipientIntendedRecipientTelecom" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RWtaYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (not telecom->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7JDSoF9xEey5t-mahoHmrg" name="CarePlanInformationRecipientIntendedRecipientInformationRecipient" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7JDSoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RWtaYn3sEeyivuDeOiJBMg" name="CarePlanInformationRecipientIntendedRecipientInformationRecipient" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RWtaY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null)->reject(informationRecipient->one(informationRecipient : cda::Person | not informationRecipient.oclIsUndefined() and informationRecipient.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7JDSol9xEey5t-mahoHmrg" name="CarePlanInformationRecipientIntendedRecipientReceivedOrganization" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7JDSo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RWtaZH3sEeyivuDeOiJBMg" name="CarePlanInformationRecipientIntendedRecipientReceivedOrganization" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RWtaZX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null)->reject(receivedOrganization->one(receivedOrganization : cda::Organization | not receivedOrganization.oclIsUndefined() and receivedOrganization.oclIsKindOf(cda::Organization)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7JDSpF9xEey5t-mahoHmrg" name="CarePlanInformationRecipientIntendedRecipient" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7JDSpV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RWuBcH3sEeyivuDeOiJBMg" name="CarePlanInformationRecipientIntendedRecipient" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RWuBcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null)->reject(intendedRecipient->one(intendedRecipient : cda::IntendedRecipient | not intendedRecipient.oclIsUndefined() and intendedRecipient.oclIsKindOf(cda::IntendedRecipient)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7KCxIF9xEey5t-mahoHmrg" name="CarePlanAuthenticatorAssignedEntityId" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7KDYMF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RXmyQH3sEeyivuDeOiJBMg" name="CarePlanAuthenticatorAssignedEntityId" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RXnZUH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7KDYMV9xEey5t-mahoHmrg" name="CarePlanAuthenticatorAssignedEntityCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7KD_QF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RXnZUX3sEeyivuDeOiJBMg" name="CarePlanAuthenticatorAssignedEntityCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RXnZUn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.code = 'ONESELF' and value.codeSystem = '2.16.840.1.113883.5.111'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7KD_QV9xEey5t-mahoHmrg" name="CarePlanAuthenticatorAssignedEntityCodeP" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7KD_Ql9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RXnZU33sEeyivuDeOiJBMg" name="CarePlanAuthenticatorAssignedEntityCodeP" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RXnZVH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7KEmUF9xEey5t-mahoHmrg" name="CarePlanAuthenticatorTime" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7KEmUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RXoAYH3sEeyivuDeOiJBMg" name="CarePlanAuthenticatorTime" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RXoAYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null)->reject((time.oclIsUndefined() or time.isNullFlavorUndefined()) implies (not time.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7KEmUl9xEey5t-mahoHmrg" name="CarePlanAuthenticatorSignatureCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7KEmU19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RXoAYn3sEeyivuDeOiJBMg" name="CarePlanAuthenticatorSignatureCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RXoAY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null)->reject((signatureCode.oclIsUndefined() or signatureCode.isNullFlavorUndefined()) implies (not signatureCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7KEmVF9xEey5t-mahoHmrg" name="CarePlanAuthenticatorSDTCSignatureText" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7KEmVV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RXoAZH3sEeyivuDeOiJBMg" name="CarePlanAuthenticatorSDTCSignatureText" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RXoAZX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null)->reject((sDTCSignatureText.oclIsUndefined() or sDTCSignatureText.isNullFlavorUndefined()) implies (not sDTCSignatureText.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7KFNYF9xEey5t-mahoHmrg" name="CarePlanAuthenticatorAssignedEntity" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7KFNYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RXoncH3sEeyivuDeOiJBMg" name="CarePlanAuthenticatorAssignedEntity" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RXoncX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7LEE0F9xEey5t-mahoHmrg" name="CarePlanParticipantCarePlanReviewAssociatedEntityClassCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7LEE0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RYhYQH3sEeyivuDeOiJBMg" name="CarePlanParticipantCarePlanReviewAssociatedEntityClassCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RYhYQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF).associatedEntity->excluding(null)->reject(isDefined('classCode'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7LEr4F9xEey5t-mahoHmrg" name="CarePlanParticipantCarePlanReviewAssociatedEntityId" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7LEr4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RYhYQn3sEeyivuDeOiJBMg" name="CarePlanParticipantCarePlanReviewAssociatedEntityId" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RYhYQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF).associatedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7LEr4l9xEey5t-mahoHmrg" name="CarePlanParticipantCarePlanReviewAssociatedEntityCodeP" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7LEr419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RYhYRH3sEeyivuDeOiJBMg" name="CarePlanParticipantCarePlanReviewAssociatedEntityCodeP" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RYhYRX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF).associatedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7LEr5F9xEey5t-mahoHmrg" name="CarePlanParticipantCarePlanReviewAssociatedEntityCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7LEr5V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RYh_UH3sEeyivuDeOiJBMg" name="CarePlanParticipantCarePlanReviewAssociatedEntityCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RYh_UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF).associatedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.111' and (value.code = 'DAUINLAW' or value.code = 'FTH' or value.code = 'DAU' or value.code = 'HPOWATT' or value.code = 'MTH' or value.code = 'SON' or value.code = 'SELF' or value.code = 'SONINLAW')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7LFS8F9xEey5t-mahoHmrg" name="CarePlanParticipantCarePlanReviewTypeCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7LFS8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RYh_Un3sEeyivuDeOiJBMg" name="CarePlanParticipantCarePlanReviewTypeCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RYh_U33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF)->select(typeCode=vocab::ParticipationType::VRF)->reject(typeCode=vocab::ParticipationType::VRF)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7LFS8l9xEey5t-mahoHmrg" name="CarePlanParticipantCarePlanReviewFunctionCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7LFS819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RYimYH3sEeyivuDeOiJBMg" name="CarePlanParticipantCarePlanReviewFunctionCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RYimYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF)->select(typeCode=vocab::ParticipationType::VRF)->reject((functionCode.oclIsUndefined() or functionCode.isNullFlavorUndefined()) implies (not functionCode.oclIsUndefined() and functionCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = functionCode.oclAsType(datatypes::CE) in 
 value.code = '425268008' and value.codeSystem = '2.16.840.1.113883.6.96'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7LFS9F9xEey5t-mahoHmrg" name="CarePlanParticipantCarePlanReviewFunctionCodeP" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7LFS9V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RYimYn3sEeyivuDeOiJBMg" name="CarePlanParticipantCarePlanReviewFunctionCodeP" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RYimY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF)->select(typeCode=vocab::ParticipationType::VRF)->reject((functionCode.oclIsUndefined() or functionCode.isNullFlavorUndefined()) implies (not functionCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7LF6AF9xEey5t-mahoHmrg" name="CarePlanParticipantCarePlanReviewTime" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7LF6AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RYjNcH3sEeyivuDeOiJBMg" name="CarePlanParticipantCarePlanReviewTime" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RYjNcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF)->select(typeCode=vocab::ParticipationType::VRF)->reject((time.oclIsUndefined() or time.isNullFlavorUndefined()) implies (not time.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7LF6Al9xEey5t-mahoHmrg" name="CarePlanParticipantCarePlanReviewAssociatedEntity" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7LF6A19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RYj0gH3sEeyivuDeOiJBMg" name="CarePlanParticipantCarePlanReviewAssociatedEntity" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RYj0gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF)->select(typeCode=vocab::ParticipationType::VRF)->reject(associatedEntity->one(associatedEntity : cda::AssociatedEntity | not associatedEntity.oclIsUndefined() and associatedEntity.oclIsKindOf(cda::AssociatedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Mu4wF9xEey5t-mahoHmrg" name="CarePlanParticipantCaregiverAssociatedEntityAssociatedPersonName" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Mu4wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RZ1m4H3sEeyivuDeOiJBMg" name="CarePlanParticipantCaregiverAssociatedEntityAssociatedPersonName" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RZ1m4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::IND).associatedEntity->excluding(null).associatedPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Mvf0F9xEey5t-mahoHmrg" name="CarePlanParticipantCaregiverAssociatedEntityClassCodeP" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Mvf0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RZ1m4n3sEeyivuDeOiJBMg" name="CarePlanParticipantCaregiverAssociatedEntityClassCodeP" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RZ1m433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::IND).associatedEntity->excluding(null)->reject(isDefined('classCode'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Mvf0l9xEey5t-mahoHmrg" name="CarePlanParticipantCaregiverAssociatedEntityClassCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Mvf019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RZ2N8H3sEeyivuDeOiJBMg" name="CarePlanParticipantCaregiverAssociatedEntityClassCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RZ2N8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::IND).associatedEntity->excluding(null)->reject(not classCode.oclIsUndefined() and classCode.oclIsKindOf(vocab::RoleClassAssociative) and 
 let value : vocab::RoleClassAssociative = classCode.oclAsType(vocab::RoleClassAssociative) in 
 value = vocab::RoleClassAssociative::PRS or value = vocab::RoleClassAssociative::NOK or value = vocab::RoleClassAssociative::CAREGIVER or value = vocab::RoleClassAssociative::AGNT or value = vocab::RoleClassAssociative::GUAR or value = vocab::RoleClassAssociative::ECON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Mvf1F9xEey5t-mahoHmrg" name="CarePlanParticipantCaregiverAssociatedEntityAssociatedPerson" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Mvf1V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RZ2N8n3sEeyivuDeOiJBMg" name="CarePlanParticipantCaregiverAssociatedEntityAssociatedPerson" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RZ2N833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::IND).associatedEntity->excluding(null)->reject(associatedPerson->one(associatedPerson : cda::Person | not associatedPerson.oclIsUndefined() and associatedPerson.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7MwG4F9xEey5t-mahoHmrg" name="CarePlanParticipantCaregiverTypeCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7MwG4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RZ2N9H3sEeyivuDeOiJBMg" name="CarePlanParticipantCaregiverTypeCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RZ2N9X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::IND)->select(typeCode=vocab::ParticipationType::IND)->reject(typeCode=vocab::ParticipationType::IND)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7MwG4l9xEey5t-mahoHmrg" name="CarePlanParticipantCaregiverAssociatedEntity" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7MwG419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RZ21AH3sEeyivuDeOiJBMg" name="CarePlanParticipantCaregiverAssociatedEntity" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RZ21AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::IND)->select(typeCode=vocab::ParticipationType::IND)->reject(associatedEntity->one(associatedEntity : cda::AssociatedEntity | not associatedEntity.oclIsUndefined() and associatedEntity.oclIsKindOf(cda::AssociatedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Nu-UF9xEey5t-mahoHmrg" name="CarePlanDocumentationOfServiceEventIVLTSLow" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Nu-UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ra594H3sEeyivuDeOiJBMg" name="CarePlanDocumentationOfServiceEventIVLTSLow" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ra594X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((low.oclIsUndefined() or low.isNullFlavorUndefined()) implies (not low.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Nu-Ul9xEey5t-mahoHmrg" name="CarePlanDocumentationOfServiceEventIVLTSHigh" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Nu-U19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ra594n3sEeyivuDeOiJBMg" name="CarePlanDocumentationOfServiceEventIVLTSHigh" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ra59433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((high.oclIsUndefined() or high.isNullFlavorUndefined()) implies (not high.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7PNlAF9xEey5t-mahoHmrg" name="CarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7PNlAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RcR24H3sEeyivuDeOiJBMg" name="CarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RcR24X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null).assignedEntity->excluding(null).assignedPerson->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject((getText(true)&lt;>'' and ( family->isEmpty() and given->isEmpty() and suffix->isEmpty() and prefix->isEmpty()   )   ) xor (getText(true)='' and (not family->isEmpty() and not given->isEmpty()  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7PNlAl9xEey5t-mahoHmrg" name="CarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonName" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7PNlA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RcSd8H3sEeyivuDeOiJBMg" name="CarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonName" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RcSd8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null).assignedEntity->excluding(null).assignedPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (name->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7POMEF9xEey5t-mahoHmrg" name="CarePlanDocumentationOfServiceEventPerformerAssignedEntityId" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7POMEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RcSd8n3sEeyivuDeOiJBMg" name="CarePlanDocumentationOfServiceEventPerformerAssignedEntityId" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RcSd833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null).assignedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7POMEl9xEey5t-mahoHmrg" name="CarePlanDocumentationOfServiceEventPerformerAssignedEntityCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7POME19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RcSd9H3sEeyivuDeOiJBMg" name="CarePlanDocumentationOfServiceEventPerformerAssignedEntityCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RcSd9X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7POMFF9xEey5t-mahoHmrg" name="CarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPerson" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7POMFV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RcTFAH3sEeyivuDeOiJBMg" name="CarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPerson" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RcTFAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null).assignedEntity->excluding(null)->reject(assignedPerson->one(assignedPerson : cda::Person | not assignedPerson.oclIsUndefined() and assignedPerson.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7POzIF9xEey5t-mahoHmrg" name="CarePlanDocumentationOfServiceEventPerformerAssignedEntity" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7POzIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RcTFAn3sEeyivuDeOiJBMg" name="CarePlanDocumentationOfServiceEventPerformerAssignedEntity" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RcTFA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7POzIl9xEey5t-mahoHmrg" name="CarePlanDocumentationOfServiceEventClassCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7POzI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RcTFBH3sEeyivuDeOiJBMg" name="CarePlanDocumentationOfServiceEventClassCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RcTFBX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(isDefined('classCode') and classCode=vocab::ActClassRoot::PCPR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7PPaMF9xEey5t-mahoHmrg" name="CarePlanDocumentationOfServiceEventEffectiveTime" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7PPaMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RcTsEH3sEeyivuDeOiJBMg" name="CarePlanDocumentationOfServiceEventEffectiveTime" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RcTsEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7PPaMl9xEey5t-mahoHmrg" name="CarePlanDocumentationOfServiceEventPerformer1" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7PPaM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RcTsEn3sEeyivuDeOiJBMg" name="CarePlanDocumentationOfServiceEventPerformer1" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RcTsE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(performer->exists(performer : cda::Performer1 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer1)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7PPaNF9xEey5t-mahoHmrg" name="CarePlanDocumentationOfServiceEvent" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7PPaNV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RcTsFH3sEeyivuDeOiJBMg" name="CarePlanDocumentationOfServiceEvent" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RcTsFX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null)->reject(serviceEvent->one(serviceEvent : cda::ServiceEvent | not serviceEvent.oclIsUndefined() and serviceEvent.oclIsKindOf(cda::ServiceEvent)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7QPfwF9xEey5t-mahoHmrg" name="CarePlanRelatedDocumentParentDocumentId" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7QPfwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RdL10H3sEeyivuDeOiJBMg" name="CarePlanRelatedDocumentParentDocumentId" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RdL10X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.relatedDocument->excluding(null).parentDocument->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7QQG0F9xEey5t-mahoHmrg" name="CarePlanRelatedDocumentParentDocumentSetId" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7QQG0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RdMc4H3sEeyivuDeOiJBMg" name="CarePlanRelatedDocumentParentDocumentSetId" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RdMc4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.relatedDocument->excluding(null).parentDocument->excluding(null)->reject((setId.oclIsUndefined() or setId.isNullFlavorUndefined()) implies (not setId.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7QQG0l9xEey5t-mahoHmrg" name="CarePlanRelatedDocumentParentDocumentVersionNumber" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7QQG019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RdMc4n3sEeyivuDeOiJBMg" name="CarePlanRelatedDocumentParentDocumentVersionNumber" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RdMc433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.relatedDocument->excluding(null).parentDocument->excluding(null)->reject((versionNumber.oclIsUndefined() or versionNumber.isNullFlavorUndefined()) implies (not versionNumber.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7QQG1F9xEey5t-mahoHmrg" name="CarePlanRelatedDocumentTypeCodeP" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7QQG1V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RdMc5H3sEeyivuDeOiJBMg" name="CarePlanRelatedDocumentTypeCodeP" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RdMc5X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.relatedDocument->excluding(null)->reject(isDefined('typeCode'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7QQt4F9xEey5t-mahoHmrg" name="CarePlanRelatedDocumentTypeCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7QQt4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RdND8H3sEeyivuDeOiJBMg" name="CarePlanRelatedDocumentTypeCode" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RdND8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.relatedDocument->excluding(null)->reject(not typeCode.oclIsUndefined() and typeCode.oclIsKindOf(vocab::x_ActRelationshipDocument) and 
 let value : vocab::x_ActRelationshipDocument = typeCode.oclAsType(vocab::x_ActRelationshipDocument) in 
 value = vocab::x_ActRelationshipDocument::APND or value = vocab::x_ActRelationshipDocument::RPLC or value = vocab::x_ActRelationshipDocument::XFRM)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7QQt4l9xEey5t-mahoHmrg" name="CarePlanRelatedDocumentParentDocument" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7QQt419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RdND8n3sEeyivuDeOiJBMg" name="CarePlanRelatedDocumentParentDocument" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RdND833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.relatedDocument->excluding(null)->reject(parentDocument->one(parentDocument : cda::ParentDocument | not parentDocument.oclIsUndefined() and parentDocument.oclIsKindOf(cda::ParentDocument)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7RSBkF9xEey5t-mahoHmrg" name="CarePlanComponentOfEncompassingEncounterEffectiveTime" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7RSBkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ReD_kH3sEeyivuDeOiJBMg" name="CarePlanComponentOfEncompassingEncounterEffectiveTime" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ReD_kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7RSooF9xEey5t-mahoHmrg" name="CarePlanComponentOfEncompassingEncounter" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7RSooV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ReEmoH3sEeyivuDeOiJBMg" name="CarePlanComponentOfEncompassingEncounter" constrainedElement="_2jWfwJ5wEeOr4eM3k36wAg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ReEmoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null)->reject(encompassingEncounter->one(encompassingEncounter : cda::EncompassingEncounter | not encompassingEncounter.oclIsUndefined() and encompassingEncounter.oclIsKindOf(cda::EncompassingEncounter)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_2jWfwZ5wEeOr4eM3k36wAg" general="_dduXkJ5OEeOr4eM3k36wAg"/>
-      <ownedOperation xmi:id="_wYmAwl9xEey5t-mahoHmrg" name="getHealthConcernsSection" bodyCondition="_wYmAxV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_wYmAxV9xEey5t-mahoHmrg" name="body" constrainedElement="_wYmAwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_wYmAxl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_HsW08H3sEeyivuDeOiJBMg" name="getHealthConcernsSection" bodyCondition="_HsW0833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_HsW0833sEeyivuDeOiJBMg" name="body" constrainedElement="_HsW08H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_HsW09H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HealthConcernsSection))->asSequence()->any(true).oclAsType(consol::HealthConcernsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_wYmAw19xEey5t-mahoHmrg" type="_2umuYJ18EeORR8_YW0n_jQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wYmAxF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_HsW08X3sEeyivuDeOiJBMg" type="_2umuYJ18EeORR8_YW0n_jQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HsW08n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_wZCFol9xEey5t-mahoHmrg" name="getGoalsSection" bodyCondition="_wZCFpV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_wZCFpV9xEey5t-mahoHmrg" name="body" constrainedElement="_wZCFol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_wZCFpl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Hs2kMn3sEeyivuDeOiJBMg" name="getGoalsSection" bodyCondition="_Hs2kNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Hs2kNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Hs2kMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Hs2kNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::GoalsSection))->asSequence()->any(true).oclAsType(consol::GoalsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_wZCFo19xEey5t-mahoHmrg" type="_YPOXoJ14EeORR8_YW0n_jQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wZCFpF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Hs2kM33sEeyivuDeOiJBMg" type="_YPOXoJ14EeORR8_YW0n_jQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Hs2kNH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_wZhN0l9xEey5t-mahoHmrg" name="getHealthStatusEvaluationsOutcomesSection" bodyCondition="_wZhN1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_wZhN1V9xEey5t-mahoHmrg" name="body" constrainedElement="_wZhN0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_wZhN1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_HtSCAn3sEeyivuDeOiJBMg" name="getHealthStatusEvaluationsOutcomesSection" bodyCondition="_HtSCBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_HtSCBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_HtSCAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_HtSCBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HealthStatusEvaluationsAndOutcomesSection))->asSequence()->any(true).oclAsType(consol::HealthStatusEvaluationsAndOutcomesSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_wZhN019xEey5t-mahoHmrg" type="_EHgh0J2AEeORR8_YW0n_jQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wZhN1F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_HtSCA33sEeyivuDeOiJBMg" type="_EHgh0J2AEeORR8_YW0n_jQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HtSCBH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2fMyol9xEey5t-mahoHmrg" name="getInterventionsSection2" bodyCondition="_2fMypV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2fMypV9xEey5t-mahoHmrg" name="body" constrainedElement="_2fMyol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2fMypl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NDvwYn3sEeyivuDeOiJBMg" name="getInterventionsSection2" bodyCondition="_NDvwZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NDvwZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NDvwYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NDvwZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::InterventionsSection2))->asSequence()->any(true).oclAsType(consol::InterventionsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2fMyo19xEey5t-mahoHmrg" type="_YCS1AP1WEeOW-qBXb0kbTA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2fMypF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NDvwY33sEeyivuDeOiJBMg" type="_YCS1AP1WEeOW-qBXb0kbTA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NDvwZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -24554,579 +24554,579 @@ Examples of referral situations are when a patient is referred from a family phy
           <body>(self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2)) or  self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))) xor self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wZh04F9xEey5t-mahoHmrg" name="USRealmHeader2TemplateId" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wZh04V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HtSpEH3sEeyivuDeOiJBMg" name="USRealmHeader2TemplateId" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HtSpEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.14' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_waEAYF9xEey5t-mahoHmrg" name="ReferralNoteCodeP" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_waEAYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Htv8EH3sEeyivuDeOiJBMg" name="ReferralNoteCodeP" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Htv8EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wZjqEF9xEey5t-mahoHmrg" name="ReferralNoteCode" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wZjqEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HtT3MH3sEeyivuDeOiJBMg" name="ReferralNoteCode" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HtT3MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wcWfYF9xEey5t-mahoHmrg" name="ReferralNoteInformationRecipient" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wcWfYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Hvx8YH3sEeyivuDeOiJBMg" name="ReferralNoteInformationRecipient" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Hvx8YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->one(informationRecipient : cda::InformationRecipient | not informationRecipient.oclIsUndefined() and informationRecipient.oclIsKindOf(cda::InformationRecipient))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wdXMAF9xEey5t-mahoHmrg" name="ReferralNoteParticipantCaregiver" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wdXMAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HwpfEH3sEeyivuDeOiJBMg" name="ReferralNoteParticipantCaregiver" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HwpfEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->select(participant : cda::Participant1 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant1))->select(typeCode=vocab::ParticipationType::IND)->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wezWcF9xEey5t-mahoHmrg" name="ReferralNoteParticipantCallbackContact" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wezWcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Hx74gH3sEeyivuDeOiJBMg" name="ReferralNoteParticipantCallbackContact" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Hx74gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->select(participant : cda::Participant1 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant1))->select(typeCode=vocab::ParticipationType::CALLBCK)->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2ftI8F9xEey5t-mahoHmrg" name="ReferralNotePlanOfTreatmentSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2ftI8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NEMcUH3sEeyivuDeOiJBMg" name="ReferralNotePlanOfTreatmentSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NENDYH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2gNfQF9xEey5t-mahoHmrg" name="ReferralNoteAdvanceDirectivesSectionEntriesOptional2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2gNfQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NEpvUH3sEeyivuDeOiJBMg" name="ReferralNoteAdvanceDirectivesSectionEntriesOptional2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NEpvUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdvanceDirectivesSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2gt1kF9xEey5t-mahoHmrg" name="ReferralNoteHistoryOfPresentIllnessSection" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2gt1kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NFFNIH3sEeyivuDeOiJBMg" name="ReferralNoteHistoryOfPresentIllnessSection" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NFFNIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2hOL4F9xEey5t-mahoHmrg" name="ReferralNoteImmunizationsSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2hOL4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NFfc0H3sEeyivuDeOiJBMg" name="ReferralNoteImmunizationsSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NFfc0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2huiMF9xEey5t-mahoHmrg" name="ReferralNoteProblemSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2huiMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NF6TkH3sEeyivuDeOiJBMg" name="ReferralNoteProblemSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NF6TkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2iORcF9xEey5t-mahoHmrg" name="ReferralNoteProceduresSectionEntriesOptional2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2iO4gF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NGUjQH3sEeyivuDeOiJBMg" name="ReferralNoteProceduresSectionEntriesOptional2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NGUjQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2iunwF9xEey5t-mahoHmrg" name="ReferralNoteResultsSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2iunwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NGuy8H3sEeyivuDeOiJBMg" name="ReferralNoteResultsSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NGuy8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2jO-EF9xEey5t-mahoHmrg" name="ReferralNoteReviewOfSystemsSection" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2jO-EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NHJCoH3sEeyivuDeOiJBMg" name="ReferralNoteReviewOfSystemsSection" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NHJCoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2jtfMF9xEey5t-mahoHmrg" name="ReferralNoteSocialHistorySection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2jtfMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NHkgcH3sEeyivuDeOiJBMg" name="ReferralNoteSocialHistorySection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NHkgcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2kKLIF9xEey5t-mahoHmrg" name="ReferralNoteVitalSignsSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2kKLIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NIBMYH3sEeyivuDeOiJBMg" name="ReferralNoteVitalSignsSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NIBMYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2krIgF9xEey5t-mahoHmrg" name="ReferralNoteFunctionalStatusSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2krIgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NIefYH3sEeyivuDeOiJBMg" name="ReferralNoteFunctionalStatusSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NIfGcH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FunctionalStatusSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2lLe0F9xEey5t-mahoHmrg" name="ReferralNotePhysicalExamSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2lLe0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NI5WIH3sEeyivuDeOiJBMg" name="ReferralNotePhysicalExamSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NI5WIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2lscMF9xEey5t-mahoHmrg" name="ReferralNoteAdvanceDirectivesSectionEntriesOptional2b" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2lscMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NJUz8H3sEeyivuDeOiJBMg" name="ReferralNoteAdvanceDirectivesSectionEntriesOptional2b" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NJUz8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdvanceDirectivesSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2mMygF9xEey5t-mahoHmrg" name="ReferralNoteNutritionSection" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2mMygV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NJvqsH3sEeyivuDeOiJBMg" name="ReferralNoteNutritionSection" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NJvqsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::NutritionSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2mtv4F9xEey5t-mahoHmrg" name="ReferralNoteMentalStatusSection" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2mtv4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NKKhcH3sEeyivuDeOiJBMg" name="ReferralNoteMentalStatusSection" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NKKhcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MentalStatusSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2nOGMF9xEey5t-mahoHmrg" name="ReferralNoteMedicalEquipmentSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2nOtQF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NKl_QH3sEeyivuDeOiJBMg" name="ReferralNoteMedicalEquipmentSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NKl_QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicalEquipmentSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2nvDkF9xEey5t-mahoHmrg" name="ReferralNoteAllergiesSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2nvDkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NK_n4H3sEeyivuDeOiJBMg" name="ReferralNoteAllergiesSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NLAO8H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2oOy0F9xEey5t-mahoHmrg" name="ReferralNoteAssessmentSection" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2oOy0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NLbFsH3sEeyivuDeOiJBMg" name="ReferralNoteAssessmentSection" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NLbFsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2ovJIF9xEey5t-mahoHmrg" name="ReferralNoteAssessmentAndPlanSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2ovJIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NL4YsH3sEeyivuDeOiJBMg" name="ReferralNoteAssessmentAndPlanSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NL4YsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2pTw4F9xEey5t-mahoHmrg" name="ReferralNoteHistoryOfPastIllnessSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2pTw4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NMWSwH3sEeyivuDeOiJBMg" name="ReferralNoteHistoryOfPastIllnessSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NMWSwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2p4YoF9xEey5t-mahoHmrg" name="ReferralNoteGeneralStatusSection" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2p4YoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NM0M0H3sEeyivuDeOiJBMg" name="ReferralNoteGeneralStatusSection" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NM0M0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::GeneralStatusSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2qe1kF9xEey5t-mahoHmrg" name="ReferralNoteMedicationsSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2qe1kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NNRf0H3sEeyivuDeOiJBMg" name="ReferralNoteMedicationsSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NNRf0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2rBoIF9xEey5t-mahoHmrg" name="ReferralNoteReasonForReferralSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2rBoIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NNsWkH3sEeyivuDeOiJBMg" name="ReferralNoteReasonForReferralSection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NNsWkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForReferralSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4KX7AF9xEey5t-mahoHmrg" name="ReferralNoteFamilyHistorySection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4KYiEF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OfgjwH3sEeyivuDeOiJBMg" name="ReferralNoteFamilyHistorySection2" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OfgjwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7SzEgF9xEey5t-mahoHmrg" name="ReferralNoteInformationRecipientIntendedRecipientPersonName" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7SzEgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rf0TEH3sEeyivuDeOiJBMg" name="ReferralNoteInformationRecipientIntendedRecipientPersonName" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rf0TEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null).informationRecipient->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7SzrkF9xEey5t-mahoHmrg" name="ReferralNoteInformationRecipientIntendedRecipientAddr" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7SzrkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rf0TEn3sEeyivuDeOiJBMg" name="ReferralNoteInformationRecipientIntendedRecipientAddr" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rf0TE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (not addr->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Szrkl9xEey5t-mahoHmrg" name="ReferralNoteInformationRecipientIntendedRecipientTelecom" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Szrk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rf06IH3sEeyivuDeOiJBMg" name="ReferralNoteInformationRecipientIntendedRecipientTelecom" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rf06IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (not telecom->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7SzrlF9xEey5t-mahoHmrg" name="ReferralNoteInformationRecipientIntendedRecipientInformationRecipient" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7SzrlV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rf06In3sEeyivuDeOiJBMg" name="ReferralNoteInformationRecipientIntendedRecipientInformationRecipient" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rf06I33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null)->reject(informationRecipient->one(informationRecipient : cda::Person | not informationRecipient.oclIsUndefined() and informationRecipient.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7S0SoF9xEey5t-mahoHmrg" name="ReferralNoteInformationRecipientIntendedRecipient" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7S0SoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rf06JH3sEeyivuDeOiJBMg" name="ReferralNoteInformationRecipientIntendedRecipient" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rf06JX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null)->reject(intendedRecipient->one(intendedRecipient : cda::IntendedRecipient | not intendedRecipient.oclIsUndefined() and intendedRecipient.oclIsKindOf(cda::IntendedRecipient)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7UUHcF9xEey5t-mahoHmrg" name="ReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7UUHcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RhZAYH3sEeyivuDeOiJBMg" name="ReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RhZncH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::IND).associatedEntity->excluding(null).associatedPerson->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject((getText(true)&lt;>'' and ( family->isEmpty() and given->isEmpty() and suffix->isEmpty() and prefix->isEmpty()   )   ) xor (getText(true)='' and (not family->isEmpty() and not given->isEmpty()  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7UUHcl9xEey5t-mahoHmrg" name="ReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonName" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7UUHc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RhZncX3sEeyivuDeOiJBMg" name="ReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonName" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RhZncn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::IND).associatedEntity->excluding(null).associatedPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7UUugF9xEey5t-mahoHmrg" name="ReferralNoteParticipantCaregiverAssociatedEntityClassCodeP" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7UUugV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RhZnc33sEeyivuDeOiJBMg" name="ReferralNoteParticipantCaregiverAssociatedEntityClassCodeP" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RhaOgH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::IND).associatedEntity->excluding(null)->reject(isDefined('classCode'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7UUugl9xEey5t-mahoHmrg" name="ReferralNoteParticipantCaregiverAssociatedEntityClassCode" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7UUug19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RhaOgX3sEeyivuDeOiJBMg" name="ReferralNoteParticipantCaregiverAssociatedEntityClassCode" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RhaOgn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::IND).associatedEntity->excluding(null)->reject(not classCode.oclIsUndefined() and classCode.oclIsKindOf(vocab::RoleClassAssociative) and 
 let value : vocab::RoleClassAssociative = classCode.oclAsType(vocab::RoleClassAssociative) in 
 value = vocab::RoleClassAssociative::PRS or value = vocab::RoleClassAssociative::NOK or value = vocab::RoleClassAssociative::CAREGIVER or value = vocab::RoleClassAssociative::AGNT or value = vocab::RoleClassAssociative::GUAR or value = vocab::RoleClassAssociative::ECON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7UUuhF9xEey5t-mahoHmrg" name="ReferralNoteParticipantCaregiverAssociatedEntityAssociatedPerson" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7UUuhV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RhaOg33sEeyivuDeOiJBMg" name="ReferralNoteParticipantCaregiverAssociatedEntityAssociatedPerson" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RhaOhH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::IND).associatedEntity->excluding(null)->reject(associatedPerson->one(associatedPerson : cda::Person | not associatedPerson.oclIsUndefined() and associatedPerson.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7UVVkF9xEey5t-mahoHmrg" name="ReferralNoteParticipantCaregiverTypeCode" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7UVVkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rha1kH3sEeyivuDeOiJBMg" name="ReferralNoteParticipantCaregiverTypeCode" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rha1kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::IND)->select(typeCode=vocab::ParticipationType::IND)->reject(typeCode=vocab::ParticipationType::IND)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7UVVkl9xEey5t-mahoHmrg" name="ReferralNoteParticipantCaregiverAssociatedEntity" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7UVVk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RhbcoH3sEeyivuDeOiJBMg" name="ReferralNoteParticipantCaregiverAssociatedEntity" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RhbcoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::IND)->select(typeCode=vocab::ParticipationType::IND)->reject(associatedEntity->one(associatedEntity : cda::AssociatedEntity | not associatedEntity.oclIsUndefined() and associatedEntity.oclIsKindOf(cda::AssociatedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7V1xcF9xEey5t-mahoHmrg" name="ReferralNoteParticipantCallbackContactAssociatedEntityAssociatedPersonName" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7V1xcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RiyukH3sEeyivuDeOiJBMg" name="ReferralNoteParticipantCallbackContactAssociatedEntityAssociatedPersonName" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RiyukX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null).associatedPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7V1xcl9xEey5t-mahoHmrg" name="ReferralNoteParticipantCallbackContactAssociatedEntityId" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7V1xc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RizVoH3sEeyivuDeOiJBMg" name="ReferralNoteParticipantCallbackContactAssociatedEntityId" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RizVoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7V2YgF9xEey5t-mahoHmrg" name="ReferralNoteParticipantCallbackContactAssociatedEntityAddr" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7V2YgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RizVon3sEeyivuDeOiJBMg" name="ReferralNoteParticipantCallbackContactAssociatedEntityAddr" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RizVo33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (not addr->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7V2Ygl9xEey5t-mahoHmrg" name="ReferralNoteParticipantCallbackContactAssociatedEntityTelecom" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7V2Yg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RizVpH3sEeyivuDeOiJBMg" name="ReferralNoteParticipantCallbackContactAssociatedEntityTelecom" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RizVpX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7V2_kF9xEey5t-mahoHmrg" name="ReferralNoteParticipantCallbackContactAssociatedEntityClassCode" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7V2_kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RizVpn3sEeyivuDeOiJBMg" name="ReferralNoteParticipantCallbackContactAssociatedEntityClassCode" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RizVp33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null)->reject(classCode=vocab::RoleClassAssociative::ASSIGNED)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7V2_kl9xEey5t-mahoHmrg" name="ReferralNoteParticipantCallbackContactAssociatedEntityAssociatedPerson" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7V2_k19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Riz8sH3sEeyivuDeOiJBMg" name="ReferralNoteParticipantCallbackContactAssociatedEntityAssociatedPerson" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Riz8sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null)->reject(associatedPerson->one(associatedPerson : cda::Person | not associatedPerson.oclIsUndefined() and associatedPerson.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7V3moF9xEey5t-mahoHmrg" name="ReferralNoteParticipantCallbackContactAssociatedEntityScopingOrganization" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7V3moV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Riz8sn3sEeyivuDeOiJBMg" name="ReferralNoteParticipantCallbackContactAssociatedEntityScopingOrganization" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Riz8s33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null)->reject(scopingOrganization->one(scopingOrganization : cda::Organization | not scopingOrganization.oclIsUndefined() and scopingOrganization.oclIsKindOf(rim::Entity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7V3mol9xEey5t-mahoHmrg" name="ReferralNoteParticipantCallbackContactTypeCode" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7V3mo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Riz8tH3sEeyivuDeOiJBMg" name="ReferralNoteParticipantCallbackContactTypeCode" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Riz8tX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CALLBCK)->select(typeCode=vocab::ParticipationType::CALLBCK)->reject(typeCode=vocab::ParticipationType::CALLBCK)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7V3mpF9xEey5t-mahoHmrg" name="ReferralNoteParticipantCallbackContactAssociatedEntity" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7V3mpV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ri0jwH3sEeyivuDeOiJBMg" name="ReferralNoteParticipantCallbackContactAssociatedEntity" constrainedElement="_itRPkKAEEeOQs7VC4HptuQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ri0jwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CALLBCK)->select(typeCode=vocab::ParticipationType::CALLBCK)->reject(associatedEntity->one(associatedEntity : cda::AssociatedEntity | not associatedEntity.oclIsUndefined() and associatedEntity.oclIsKindOf(cda::AssociatedEntity)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_itUS4KAEEeOQs7VC4HptuQ" general="_dduXkJ5OEeOr4eM3k36wAg"/>
-      <ownedOperation xmi:id="_2ftI8l9xEey5t-mahoHmrg" name="getPlanOfTreatmentSection2" bodyCondition="_2ftI9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2ftI9V9xEey5t-mahoHmrg" name="body" constrainedElement="_2ftI8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2ftI9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NENDYX3sEeyivuDeOiJBMg" name="getPlanOfTreatmentSection2" bodyCondition="_NENDZH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NENDZH3sEeyivuDeOiJBMg" name="body" constrainedElement="_NENDYX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NENDZX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2))->asSequence()->any(true).oclAsType(consol::PlanOfTreatmentSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2ftI819xEey5t-mahoHmrg" type="_bwml0P4yEeO_Yb9cO8w3bA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2ftI9F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NENDYn3sEeyivuDeOiJBMg" type="_bwml0P4yEeO_Yb9cO8w3bA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NENDY33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2gNfQl9xEey5t-mahoHmrg" name="getAdvanceDirectivesSectionEntriesOptional2" bodyCondition="_2gNfRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2gNfRV9xEey5t-mahoHmrg" name="body" constrainedElement="_2gNfQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2gNfRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NEpvUn3sEeyivuDeOiJBMg" name="getAdvanceDirectivesSectionEntriesOptional2" bodyCondition="_NEqWYn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NEqWYn3sEeyivuDeOiJBMg" name="body" constrainedElement="_NEpvUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NEqWY33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdvanceDirectivesSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::AdvanceDirectivesSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2gNfQ19xEey5t-mahoHmrg" type="_jsKhYAFXEeSLIY0bHb-fFQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2gNfRF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NEqWYH3sEeyivuDeOiJBMg" type="_jsKhYAFXEeSLIY0bHb-fFQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NEqWYX3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2gucoF9xEey5t-mahoHmrg" name="getHistoryOfPresentIllnessSection" bodyCondition="_2guco19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2guco19xEey5t-mahoHmrg" name="body" constrainedElement="_2gucoF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2gucpF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NFF0MH3sEeyivuDeOiJBMg" name="getHistoryOfPresentIllnessSection" bodyCondition="_NFF0M33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NFF0M33sEeyivuDeOiJBMg" name="body" constrainedElement="_NFF0MH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NFF0NH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))->asSequence()->any(true).oclAsType(consol::HistoryOfPresentIllnessSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2gucoV9xEey5t-mahoHmrg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2gucol9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NFF0MX3sEeyivuDeOiJBMg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NFF0Mn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2hOL4l9xEey5t-mahoHmrg" name="getImmunizationsSection2" bodyCondition="_2hOL5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2hOL5V9xEey5t-mahoHmrg" name="body" constrainedElement="_2hOL4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2hOL5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NFfc0n3sEeyivuDeOiJBMg" name="getImmunizationsSection2" bodyCondition="_NFfc1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NFfc1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_NFfc0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NFgD4H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSection2))->asSequence()->any(true).oclAsType(consol::ImmunizationsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2hOL419xEey5t-mahoHmrg" type="_14bikALNEeSIPYXg7AgJzw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2hOL5F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NFfc033sEeyivuDeOiJBMg" type="_14bikALNEeSIPYXg7AgJzw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NFfc1H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2huiMl9xEey5t-mahoHmrg" name="getProblemSection2" bodyCondition="_2huiNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2huiNV9xEey5t-mahoHmrg" name="body" constrainedElement="_2huiMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2huiNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NF6Tkn3sEeyivuDeOiJBMg" name="getProblemSection2" bodyCondition="_NF6TlX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NF6TlX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NF6Tkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NF6Tln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSection2))->asSequence()->any(true).oclAsType(consol::ProblemSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2huiM19xEey5t-mahoHmrg" type="_IXrA4ALVEeSyydFGYJajGA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2huiNF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NF6Tk33sEeyivuDeOiJBMg" type="_IXrA4ALVEeSyydFGYJajGA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NF6TlH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2iO4gV9xEey5t-mahoHmrg" name="getProceduresSectionEntriesOptional2" bodyCondition="_2iO4hF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2iO4hF9xEey5t-mahoHmrg" name="body" constrainedElement="_2iO4gV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2iO4hV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NGVKUH3sEeyivuDeOiJBMg" name="getProceduresSectionEntriesOptional2" bodyCondition="_NGVKU33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NGVKU33sEeyivuDeOiJBMg" name="body" constrainedElement="_NGVKUH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NGVKVH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::ProceduresSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2iO4gl9xEey5t-mahoHmrg" type="_80dMoAB0EeSLOb2O6vSPzg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2iO4g19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NGVKUX3sEeyivuDeOiJBMg" type="_80dMoAB0EeSLOb2O6vSPzg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NGVKUn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2ivO0F9xEey5t-mahoHmrg" name="getResultsSection2" bodyCondition="_2ivO019xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2ivO019xEey5t-mahoHmrg" name="body" constrainedElement="_2ivO0F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2ivO1F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NGvaAH3sEeyivuDeOiJBMg" name="getResultsSection2" bodyCondition="_NGvaA33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NGvaA33sEeyivuDeOiJBMg" name="body" constrainedElement="_NGvaAH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NGvaBH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSection2))->asSequence()->any(true).oclAsType(consol::ResultsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2ivO0V9xEey5t-mahoHmrg" type="_bAAhEALtEeSueJWOLw5iaQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2ivO0l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NGvaAX3sEeyivuDeOiJBMg" type="_bAAhEALtEeSueJWOLw5iaQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NGvaAn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2jO-El9xEey5t-mahoHmrg" name="getReviewOfSystemsSection" bodyCondition="_2jO-FV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2jO-FV9xEey5t-mahoHmrg" name="body" constrainedElement="_2jO-El9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2jO-Fl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NHJCon3sEeyivuDeOiJBMg" name="getReviewOfSystemsSection" bodyCondition="_NHJCpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NHJCpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NHJCon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NHJCpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))->asSequence()->any(true).oclAsType(consol::ReviewOfSystemsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2jO-E19xEey5t-mahoHmrg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2jO-FF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NHJCo33sEeyivuDeOiJBMg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NHJCpH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2jtfMl9xEey5t-mahoHmrg" name="getSocialHistorySection2" bodyCondition="_2jtfNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2jtfNV9xEey5t-mahoHmrg" name="body" constrainedElement="_2jtfMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2jtfNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NHkgcn3sEeyivuDeOiJBMg" name="getSocialHistorySection2" bodyCondition="_NHkgdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NHkgdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NHkgcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NHkgdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection2))->asSequence()->any(true).oclAsType(consol::SocialHistorySection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2jtfM19xEey5t-mahoHmrg" type="_wLWZMAFHEeSG_MJH-zNFRw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2jtfNF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NHkgc33sEeyivuDeOiJBMg" type="_wLWZMAFHEeSG_MJH-zNFRw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NHkgdH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2kKyMF9xEey5t-mahoHmrg" name="getVitalSignsSection2" bodyCondition="_2kKyM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2kKyM19xEey5t-mahoHmrg" name="body" constrainedElement="_2kKyMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2kKyNF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NIBzcH3sEeyivuDeOiJBMg" name="getVitalSignsSection2" bodyCondition="_NIBzc33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NIBzc33sEeyivuDeOiJBMg" name="body" constrainedElement="_NIBzcH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NIBzdH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSection2))->asSequence()->any(true).oclAsType(consol::VitalSignsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2kKyMV9xEey5t-mahoHmrg" type="_D3010ALzEeSM0Jd2D1FgKw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2kKyMl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NIBzcX3sEeyivuDeOiJBMg" type="_D3010ALzEeSM0Jd2D1FgKw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NIBzcn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2krIgl9xEey5t-mahoHmrg" name="getFunctionalStatusSection2" bodyCondition="_2krIhV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2krIhV9xEey5t-mahoHmrg" name="body" constrainedElement="_2krIgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2krIhl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NIfGcX3sEeyivuDeOiJBMg" name="getFunctionalStatusSection2" bodyCondition="_NIfGdH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NIfGdH3sEeyivuDeOiJBMg" name="body" constrainedElement="_NIfGcX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NIfGdX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FunctionalStatusSection2))->asSequence()->any(true).oclAsType(consol::FunctionalStatusSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2krIg19xEey5t-mahoHmrg" type="_8rMFkPyHEeOozpLKXSm5NA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2krIhF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NIfGcn3sEeyivuDeOiJBMg" type="_8rMFkPyHEeOozpLKXSm5NA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NIfGc33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2lMF4F9xEey5t-mahoHmrg" name="getPhysicalExamSection2" bodyCondition="_2lMF419xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2lMF419xEey5t-mahoHmrg" name="body" constrainedElement="_2lMF4F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2lMF5F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NI59MH3sEeyivuDeOiJBMg" name="getPhysicalExamSection2" bodyCondition="_NI59M33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NI59M33sEeyivuDeOiJBMg" name="body" constrainedElement="_NI59MH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NI59NH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection2))->asSequence()->any(true).oclAsType(consol::PhysicalExamSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2lMF4V9xEey5t-mahoHmrg" type="_-nZiYP4uEeObaveuCI77uA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2lMF4l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NI59MX3sEeyivuDeOiJBMg" type="_-nZiYP4uEeObaveuCI77uA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NI59Mn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2lscMl9xEey5t-mahoHmrg" name="getAdvanceDirectivesSectionEntriesOptional2b" bodyCondition="_2lscNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2lscNV9xEey5t-mahoHmrg" name="body" constrainedElement="_2lscMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2lscNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NJUz8n3sEeyivuDeOiJBMg" name="getAdvanceDirectivesSectionEntriesOptional2b" bodyCondition="_NJUz9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NJUz9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_NJUz8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NJUz9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdvanceDirectivesSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::AdvanceDirectivesSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2lscM19xEey5t-mahoHmrg" type="_jsKhYAFXEeSLIY0bHb-fFQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2lscNF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NJUz833sEeyivuDeOiJBMg" type="_jsKhYAFXEeSLIY0bHb-fFQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NJUz9H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2mNZkF9xEey5t-mahoHmrg" name="getNutritionSection" bodyCondition="_2mNZk19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2mNZk19xEey5t-mahoHmrg" name="body" constrainedElement="_2mNZkF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2mNZlF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NJvqsn3sEeyivuDeOiJBMg" name="getNutritionSection" bodyCondition="_NJvqtX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NJvqtX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NJvqsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NJvqtn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::NutritionSection))->asSequence()->any(true).oclAsType(consol::NutritionSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2mNZkV9xEey5t-mahoHmrg" type="_MlM4IJ2GEeORR8_YW0n_jQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2mNZkl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NJvqs33sEeyivuDeOiJBMg" type="_MlM4IJ2GEeORR8_YW0n_jQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NJvqtH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2mtv4l9xEey5t-mahoHmrg" name="getMentalStatusSection" bodyCondition="_2mtv5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2mtv5V9xEey5t-mahoHmrg" name="body" constrainedElement="_2mtv4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2mtv5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NKKhcn3sEeyivuDeOiJBMg" name="getMentalStatusSection" bodyCondition="_NKKhdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NKKhdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NKKhcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NKKhdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MentalStatusSection))->asSequence()->any(true).oclAsType(consol::MentalStatusSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2mtv419xEey5t-mahoHmrg" type="_4tfOMJ2CEeORR8_YW0n_jQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2mtv5F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NKKhc33sEeyivuDeOiJBMg" type="_4tfOMJ2CEeORR8_YW0n_jQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NKKhdH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2nOtQV9xEey5t-mahoHmrg" name="getMedicalEquipmentSection2" bodyCondition="_2nOtRF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2nOtRF9xEey5t-mahoHmrg" name="body" constrainedElement="_2nOtQV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2nOtRV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NKl_Qn3sEeyivuDeOiJBMg" name="getMedicalEquipmentSection2" bodyCondition="_NKl_RX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NKl_RX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NKl_Qn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NKl_Rn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicalEquipmentSection2))->asSequence()->any(true).oclAsType(consol::MedicalEquipmentSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2nOtQl9xEey5t-mahoHmrg" type="_5OKxwP1bEeO5Hq-yrsJSmg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2nOtQ19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NKl_Q33sEeyivuDeOiJBMg" type="_5OKxwP1bEeO5Hq-yrsJSmg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NKl_RH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2nvDkl9xEey5t-mahoHmrg" name="getAllergiesSection2" bodyCondition="_2nvDlV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2nvDlV9xEey5t-mahoHmrg" name="body" constrainedElement="_2nvDkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2nvDll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NLAO8X3sEeyivuDeOiJBMg" name="getAllergiesSection2" bodyCondition="_NLAO9H3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NLAO9H3sEeyivuDeOiJBMg" name="body" constrainedElement="_NLAO8X3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NLAO9X3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSection2))->asSequence()->any(true).oclAsType(consol::AllergiesSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2nvDk19xEey5t-mahoHmrg" type="_EONPMAInEeSr1aKUYorURA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2nvDlF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NLAO8n3sEeyivuDeOiJBMg" type="_EONPMAInEeSr1aKUYorURA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NLAO833sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2oOy0l9xEey5t-mahoHmrg" name="getAssessmentSection" bodyCondition="_2oOy1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2oOy1V9xEey5t-mahoHmrg" name="body" constrainedElement="_2oOy0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2oOy1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NLbswH3sEeyivuDeOiJBMg" name="getAssessmentSection" bodyCondition="_NLbsw33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NLbsw33sEeyivuDeOiJBMg" name="body" constrainedElement="_NLbswH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NLbsxH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))->asSequence()->any(true).oclAsType(consol::AssessmentSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2oOy019xEey5t-mahoHmrg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2oOy1F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NLbswX3sEeyivuDeOiJBMg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NLbswn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2ovJIl9xEey5t-mahoHmrg" name="getAssessmentAndPlanSection2" bodyCondition="_2ovJJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2ovJJV9xEey5t-mahoHmrg" name="body" constrainedElement="_2ovJIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2ovJJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NL4_wH3sEeyivuDeOiJBMg" name="getAssessmentAndPlanSection2" bodyCondition="_NL4_w33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NL4_w33sEeyivuDeOiJBMg" name="body" constrainedElement="_NL4_wH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NL4_xH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection2))->asSequence()->any(true).oclAsType(consol::AssessmentAndPlanSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2ovJI19xEey5t-mahoHmrg" type="_q_8twPvVEeOvZJBdQKQrqQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2ovJJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NL4_wX3sEeyivuDeOiJBMg" type="_q_8twPvVEeOvZJBdQKQrqQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NL4_wn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2pUX8F9xEey5t-mahoHmrg" name="getHistoryOfPastIllnessSection2" bodyCondition="_2pUX819xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2pUX819xEey5t-mahoHmrg" name="body" constrainedElement="_2pUX8F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2pUX9F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NMWSwn3sEeyivuDeOiJBMg" name="getHistoryOfPastIllnessSection2" bodyCondition="_NMWSxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NMWSxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NMWSwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NMWSxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection2))->asSequence()->any(true).oclAsType(consol::HistoryOfPastIllnessSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2pUX8V9xEey5t-mahoHmrg" type="_sZlggPyhEeOC19UEcu7MOw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2pUX8l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NMWSw33sEeyivuDeOiJBMg" type="_sZlggPyhEeOC19UEcu7MOw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NMWSxH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2p4Yol9xEey5t-mahoHmrg" name="getGeneralStatusSection" bodyCondition="_2p4YpV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2p4YpV9xEey5t-mahoHmrg" name="body" constrainedElement="_2p4Yol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2p4Ypl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NM0M0n3sEeyivuDeOiJBMg" name="getGeneralStatusSection" bodyCondition="_NM0M1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NM0M1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_NM0M0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NM0M1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::GeneralStatusSection))->asSequence()->any(true).oclAsType(consol::GeneralStatusSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2p4Yo19xEey5t-mahoHmrg" type="_2Pxt6xSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2p4YpF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NM0M033sEeyivuDeOiJBMg" type="_2Pxt6xSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NM0M1H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2qe1kl9xEey5t-mahoHmrg" name="getMedicationsSection2" bodyCondition="_2qe1lV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2qe1lV9xEey5t-mahoHmrg" name="body" constrainedElement="_2qe1kl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2qe1ll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NNRf0n3sEeyivuDeOiJBMg" name="getMedicationsSection2" bodyCondition="_NNSG4n3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NNSG4n3sEeyivuDeOiJBMg" name="body" constrainedElement="_NNRf0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NNSG433sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSection2))->asSequence()->any(true).oclAsType(consol::MedicationsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2qe1k19xEey5t-mahoHmrg" type="_P2mp4ALQEeS0YMHMf4rRtQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2qe1lF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NNSG4H3sEeyivuDeOiJBMg" type="_P2mp4ALQEeS0YMHMf4rRtQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NNSG4X3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2rCPMF9xEey5t-mahoHmrg" name="getReasonForReferralSection2" bodyCondition="_2rCPM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2rCPM19xEey5t-mahoHmrg" name="body" constrainedElement="_2rCPMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2rCPNF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NNs9oH3sEeyivuDeOiJBMg" name="getReasonForReferralSection2" bodyCondition="_NNs9o33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NNs9o33sEeyivuDeOiJBMg" name="body" constrainedElement="_NNs9oH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NNs9pH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForReferralSection2))->asSequence()->any(true).oclAsType(consol::ReasonForReferralSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2rCPMV9xEey5t-mahoHmrg" type="_Ya0H0AB5EeS20Pddu0dxVw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2rCPMl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NNs9oX3sEeyivuDeOiJBMg" type="_Ya0H0AB5EeS20Pddu0dxVw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NNs9on3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4KYiEV9xEey5t-mahoHmrg" name="getFamilyHistorySection2" bodyCondition="_4KYiFF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4KYiFF9xEey5t-mahoHmrg" name="body" constrainedElement="_4KYiEV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4KYiFV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ofgjwn3sEeyivuDeOiJBMg" name="getFamilyHistorySection2" bodyCondition="_OfgjxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OfgjxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ofgjwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ofgjxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection2))->asSequence()->any(true).oclAsType(consol::FamilyHistorySection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4KYiEl9xEey5t-mahoHmrg" type="_NGivoIevEeSBauRYePLghA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4KYiE19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Ofgjw33sEeyivuDeOiJBMg" type="_NGivoIevEeSBauRYePLghA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OfgjxH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -25151,678 +25151,678 @@ Standardization of information used in this form will promote interoperability;
           <body>(self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2)) or  self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))) xor self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wgR9IF9xEey5t-mahoHmrg" name="USRealmHeader2TemplateId" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wgR9IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HzL1sn3sEeyivuDeOiJBMg" name="USRealmHeader2TemplateId" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HzMcwH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.13' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wgxsYF9xEey5t-mahoHmrg" name="TransferSummaryCodeP" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wgxsYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HzohoH3sEeyivuDeOiJBMg" name="TransferSummaryCodeP" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HzohoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wgTLQF9xEey5t-mahoHmrg" name="TransferSummaryCode" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wgTLQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_HzNq4H3sEeyivuDeOiJBMg" name="TransferSummaryCode" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_HzNq4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_whSCsF9xEey5t-mahoHmrg" name="TransferSummaryTitle" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_whSCsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_H0EmgH3sEeyivuDeOiJBMg" name="TransferSummaryTitle" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_H0EmgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wj_YcF9xEey5t-mahoHmrg" name="TransferSummaryParticipantSupport" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wj_YcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_H2gPcH3sEeyivuDeOiJBMg" name="TransferSummaryParticipantSupport" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_H2gPcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->select(participant : cda::Participant1 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant1))->select(typeCode = vocab::ParticipationType::IND)->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wlZtsF9xEey5t-mahoHmrg" name="TransferSummaryParticipantCallbackContact" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wlZtsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_H3xawH3sEeyivuDeOiJBMg" name="TransferSummaryParticipantCallbackContact" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_H3xawX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->select(participant : cda::Participant1 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant1))->select(typeCode = vocab::ParticipationType::CALLBCK)->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wnf_cF9xEey5t-mahoHmrg" name="TransferSummaryDocumentationOf" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wnf_cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_H5ggIH3sEeyivuDeOiJBMg" name="TransferSummaryDocumentationOf" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_H5ggIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->one(documentationOf : cda::DocumentationOf | not documentationOf.oclIsUndefined() and documentationOf.oclIsKindOf(cda::DocumentationOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2rkasF9xEey5t-mahoHmrg" name="TransferSummaryAdvanceDirectivesSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2rkasV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NOH0YH3sEeyivuDeOiJBMg" name="TransferSummaryAdvanceDirectivesSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NOH0YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdvanceDirectivesSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2sFYEF9xEey5t-mahoHmrg" name="TransferSummaryAllergiesSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2sFYEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NOhdAH3sEeyivuDeOiJBMg" name="TransferSummaryAllergiesSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NOhdAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2sluYF9xEey5t-mahoHmrg" name="TransferSummaryPhysicalExamSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2sluYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NO860H3sEeyivuDeOiJBMg" name="TransferSummaryPhysicalExamSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NO860X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2tHS0F9xEey5t-mahoHmrg" name="TransferSummaryEncountersSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2tHS0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NPXKgH3sEeyivuDeOiJBMg" name="TransferSummaryEncountersSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NPXKgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::EncountersSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2tnpIF9xEey5t-mahoHmrg" name="TransferSummaryFamilyHistorySection" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2tnpIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NP0dgH3sEeyivuDeOiJBMg" name="TransferSummaryFamilyHistorySection" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NP0dgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2uUzwF9xEey5t-mahoHmrg" name="TransferSummaryFunctionalStatusSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2uUzwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NQRJcH3sEeyivuDeOiJBMg" name="TransferSummaryFunctionalStatusSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NQRJcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FunctionalStatusSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2u1xIF9xEey5t-mahoHmrg" name="TransferSummaryImmunizationsSectionEntriesOptional2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2u1xIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NQrZIH3sEeyivuDeOiJBMg" name="TransferSummaryImmunizationsSectionEntriesOptional2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NQrZIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2vVgYF9xEey5t-mahoHmrg" name="TransferSummaryMedicalEquipmentSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2vVgYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NRGP4H3sEeyivuDeOiJBMg" name="TransferSummaryMedicalEquipmentSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NRGP4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicalEquipmentSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2v1PoF9xEey5t-mahoHmrg" name="TransferSummaryMedicationsSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2v1PoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NRgfkH3sEeyivuDeOiJBMg" name="TransferSummaryMedicationsSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NRgfkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2wVl8F9xEey5t-mahoHmrg" name="TransferSummaryPayersSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2wVl8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NR7WUH3sEeyivuDeOiJBMg" name="TransferSummaryPayersSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NR7WUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PayersSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2w18QF9xEey5t-mahoHmrg" name="TransferSummaryPlanOfTreatmentSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2w18QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NSWNEH3sEeyivuDeOiJBMg" name="TransferSummaryPlanOfTreatmentSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NSWNEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2xWSkF9xEey5t-mahoHmrg" name="TransferSummaryProblemSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2xWSkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NS0HIH3sEeyivuDeOiJBMg" name="TransferSummaryProblemSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NS0HIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2x0MoF9xEey5t-mahoHmrg" name="TransferSummaryProceduresSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2x0MoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NTQzEH3sEeyivuDeOiJBMg" name="TransferSummaryProceduresSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NTQzEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2yTU0F9xEey5t-mahoHmrg" name="TransferSummaryResultsSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2yT74F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NTxJYH3sEeyivuDeOiJBMg" name="TransferSummaryResultsSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NTxJYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2yydAF9xEey5t-mahoHmrg" name="TransferSummarySocialHistorySection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2yydAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NUPDcH3sEeyivuDeOiJBMg" name="TransferSummarySocialHistorySection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NUPDcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2zSzUF9xEey5t-mahoHmrg" name="TransferSummaryVitalSignsSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2zSzUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NUrvYH3sEeyivuDeOiJBMg" name="TransferSummaryVitalSignsSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NUrvYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2zzJoF9xEey5t-mahoHmrg" name="TransferSummaryMentalStatusSection" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2zzJoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NVJCYH3sEeyivuDeOiJBMg" name="TransferSummaryMentalStatusSection" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NVJCYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MentalStatusSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_20Tf8F9xEey5t-mahoHmrg" name="TransferSummaryGeneralStatusSection" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_20Tf8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NVrN4H3sEeyivuDeOiJBMg" name="TransferSummaryGeneralStatusSection" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NVrN4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::GeneralStatusSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_20z2QF9xEey5t-mahoHmrg" name="TransferSummaryReviewOfSystemsSection" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_20z2QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NWJH8H3sEeyivuDeOiJBMg" name="TransferSummaryReviewOfSystemsSection" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NWJH8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_21UMkF9xEey5t-mahoHmrg" name="TransferSummaryNutritionSection" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_21UzoF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NWjXoH3sEeyivuDeOiJBMg" name="TransferSummaryNutritionSection" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NWjXoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::NutritionSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_211J8F9xEey5t-mahoHmrg" name="TransferSummaryReasonForReferralSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_211J8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NW9nUH3sEeyivuDeOiJBMg" name="TransferSummaryReasonForReferralSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NW9nUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForReferralSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_22VgQF9xEey5t-mahoHmrg" name="TransferSummaryHistoryOfPastIllnessSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_22VgQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NXX3AH3sEeyivuDeOiJBMg" name="TransferSummaryHistoryOfPastIllnessSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NXX3AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2212kF9xEey5t-mahoHmrg" name="TransferSummaryHistoryOfPresentIllnessSection" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2212kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NX1KAH3sEeyivuDeOiJBMg" name="TransferSummaryHistoryOfPresentIllnessSection" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NX1KAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_23WM4F9xEey5t-mahoHmrg" name="TransferSummaryAssessmentAndPlanSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_23WM4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NYSdAH3sEeyivuDeOiJBMg" name="TransferSummaryAssessmentAndPlanSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NYSdAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_233KQF9xEey5t-mahoHmrg" name="TransferSummaryAssessmentSection" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_233KQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NYvI8H3sEeyivuDeOiJBMg" name="TransferSummaryAssessmentSection" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NYvI8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4K4RUF9xEey5t-mahoHmrg" name="TransferSummaryDischargeDiagnosisSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4K4RUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Of8BkH3sEeyivuDeOiJBMg" name="TransferSummaryDischargeDiagnosisSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Of8BkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::DischargeDiagnosisSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4LYnoF9xEey5t-mahoHmrg" name="TransferSummaryAdmissionMedicationsSectionEntriesOptional2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4LYnoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OgVqMH3sEeyivuDeOiJBMg" name="TransferSummaryAdmissionMedicationsSectionEntriesOptional2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OgVqMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdmissionMedicationsSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4L498F9xEey5t-mahoHmrg" name="TransferSummaryAdmissionDiagnosisSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4L5lAF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ogv54H3sEeyivuDeOiJBMg" name="TransferSummaryAdmissionDiagnosisSection2" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ogv54X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdmissionDiagnosisSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4MZ7UF9xEey5t-mahoHmrg" name="TransferSummaryCourseOfCareSection" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4MZ7UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OhKJkH3sEeyivuDeOiJBMg" name="TransferSummaryCourseOfCareSection" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OhKJkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::CourseOfCareSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7XaewF9xEey5t-mahoHmrg" name="TransferSummaryParticipantSupportAssociatedEntityAssociatedPersonName" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7XaewV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RkOR8H3sEeyivuDeOiJBMg" name="TransferSummaryParticipantSupportAssociatedEntityAssociatedPersonName" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RkOR8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::IND).associatedEntity->excluding(null).associatedPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7XbF0F9xEey5t-mahoHmrg" name="TransferSummaryParticipantSupportAssociatedEntityClassCodeP" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7XbF0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RkO5AH3sEeyivuDeOiJBMg" name="TransferSummaryParticipantSupportAssociatedEntityClassCodeP" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RkO5AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::IND).associatedEntity->excluding(null)->reject(isDefined('classCode'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7XbF0l9xEey5t-mahoHmrg" name="TransferSummaryParticipantSupportAssociatedEntityClassCode" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7XbF019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RkO5An3sEeyivuDeOiJBMg" name="TransferSummaryParticipantSupportAssociatedEntityClassCode" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RkO5A33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::IND).associatedEntity->excluding(null)->reject(not classCode.oclIsUndefined() and classCode.oclIsKindOf(vocab::RoleClassAssociative) and 
 let value : vocab::RoleClassAssociative = classCode.oclAsType(vocab::RoleClassAssociative) in 
 value = vocab::RoleClassAssociative::PRS or value = vocab::RoleClassAssociative::NOK or value = vocab::RoleClassAssociative::CAREGIVER or value = vocab::RoleClassAssociative::AGNT or value = vocab::RoleClassAssociative::GUAR or value = vocab::RoleClassAssociative::ECON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7XbF1F9xEey5t-mahoHmrg" name="TransferSummaryParticipantSupportAssociatedEntityAssociatedPerson" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Xbs4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RkO5BH3sEeyivuDeOiJBMg" name="TransferSummaryParticipantSupportAssociatedEntityAssociatedPerson" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RkO5BX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::IND).associatedEntity->excluding(null)->reject(associatedPerson->one(associatedPerson : cda::Person | not associatedPerson.oclIsUndefined() and associatedPerson.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Xbs4V9xEey5t-mahoHmrg" name="TransferSummaryParticipantSupportTypeCode" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Xbs4l9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RkPgEH3sEeyivuDeOiJBMg" name="TransferSummaryParticipantSupportTypeCode" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RkPgEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::IND)->select(typeCode = vocab::ParticipationType::IND)->reject(typeCode=vocab::ParticipationType::IND)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Xbs419xEey5t-mahoHmrg" name="TransferSummaryParticipantSupportAssociatedEntity" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Xbs5F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RkPgEn3sEeyivuDeOiJBMg" name="TransferSummaryParticipantSupportAssociatedEntity" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RkPgE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::IND)->select(typeCode = vocab::ParticipationType::IND)->reject(associatedEntity->one(associatedEntity : cda::AssociatedEntity | not associatedEntity.oclIsUndefined() and associatedEntity.oclIsKindOf(cda::AssociatedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Y9W4F9xEey5t-mahoHmrg" name="TransferSummaryParticipantCallbackContactAssociatedEntityAssociatedPersonName" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Y9W4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rllj4H3sEeyivuDeOiJBMg" name="TransferSummaryParticipantCallbackContactAssociatedEntityAssociatedPersonName" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rllj4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null).associatedPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Y998F9xEey5t-mahoHmrg" name="TransferSummaryParticipantCallbackContactAssociatedEntityClassCode" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Y998V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RlmK8H3sEeyivuDeOiJBMg" name="TransferSummaryParticipantCallbackContactAssociatedEntityClassCode" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RlmK8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null)->reject(classCode=vocab::RoleClassAssociative::ASSIGNED)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Y998l9xEey5t-mahoHmrg" name="TransferSummaryParticipantCallbackContactAssociatedEntityId" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Y99819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RlmK8n3sEeyivuDeOiJBMg" name="TransferSummaryParticipantCallbackContactAssociatedEntityId" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RlmK833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Y999F9xEey5t-mahoHmrg" name="TransferSummaryParticipantCallbackContactAssociatedEntityAddr" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Y999V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RlmK9H3sEeyivuDeOiJBMg" name="TransferSummaryParticipantCallbackContactAssociatedEntityAddr" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RlmK9X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (not addr->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Y-lAF9xEey5t-mahoHmrg" name="TransferSummaryParticipantCallbackContactAssociatedEntityTelecom" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Y-lAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RlmyAH3sEeyivuDeOiJBMg" name="TransferSummaryParticipantCallbackContactAssociatedEntityTelecom" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RlmyAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Y-lAl9xEey5t-mahoHmrg" name="TransferSummaryParticipantCallbackContactAssociatedEntityAssociatedPerson" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Y-lA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RlmyAn3sEeyivuDeOiJBMg" name="TransferSummaryParticipantCallbackContactAssociatedEntityAssociatedPerson" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RlmyA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null)->reject(associatedPerson->one(associatedPerson : cda::Person | not associatedPerson.oclIsUndefined() and associatedPerson.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Y_MEF9xEey5t-mahoHmrg" name="TransferSummaryParticipantCallbackContactAssociatedEntityScopingOrganization" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Y_MEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RlmyBH3sEeyivuDeOiJBMg" name="TransferSummaryParticipantCallbackContactAssociatedEntityScopingOrganization" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RlmyBX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null)->reject(scopingOrganization->one(scopingOrganization : cda::Organization | not scopingOrganization.oclIsUndefined() and scopingOrganization.oclIsKindOf(rim::Entity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Y_MEl9xEey5t-mahoHmrg" name="TransferSummaryParticipantCallbackContactTypeCode" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Y_ME19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RlnZEH3sEeyivuDeOiJBMg" name="TransferSummaryParticipantCallbackContactTypeCode" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RlnZEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::CALLBCK)->select(typeCode = vocab::ParticipationType::CALLBCK)->reject(typeCode=vocab::ParticipationType::CALLBCK)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7Y_MFF9xEey5t-mahoHmrg" name="TransferSummaryParticipantCallbackContactAssociatedEntity" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7Y_MFV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RlnZEn3sEeyivuDeOiJBMg" name="TransferSummaryParticipantCallbackContactAssociatedEntity" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RlnZE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::CALLBCK)->select(typeCode = vocab::ParticipationType::CALLBCK)->reject(associatedEntity->one(associatedEntity : cda::AssociatedEntity | not associatedEntity.oclIsUndefined() and associatedEntity.oclIsKindOf(cda::AssociatedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7ahdIF9xEey5t-mahoHmrg" name="TransferSummaryDocumentationOfServiceEventPerformerTypeCode" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7ahdIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rm-D8H3sEeyivuDeOiJBMg" name="TransferSummaryDocumentationOfServiceEventPerformerTypeCode" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rm-D8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PRF)->select(typeCode = vocab::x_ServiceEventPerformer::PRF)->reject(typeCode=vocab::x_ServiceEventPerformer::PRF)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7ahdIl9xEey5t-mahoHmrg" name="TransferSummaryDocumentationOfServiceEventPerformerFunctionCodeP" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7ahdI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rm-D8n3sEeyivuDeOiJBMg" name="TransferSummaryDocumentationOfServiceEventPerformerFunctionCodeP" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rm-D833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PRF)->select(typeCode = vocab::x_ServiceEventPerformer::PRF)->reject((functionCode.oclIsUndefined() or functionCode.isNullFlavorUndefined()) implies (not functionCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7aiEMF9xEey5t-mahoHmrg" name="TransferSummaryDocumentationOfServiceEventPerformerFunctionCode" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7aiEMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rm-D9H3sEeyivuDeOiJBMg" name="TransferSummaryDocumentationOfServiceEventPerformerFunctionCode" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rm-D9X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PRF)->select(typeCode = vocab::x_ServiceEventPerformer::PRF)->reject((functionCode.oclIsUndefined() or functionCode.isNullFlavorUndefined()) implies (not functionCode.oclIsUndefined() and functionCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = functionCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7aiEMl9xEey5t-mahoHmrg" name="TransferSummaryDocumentationOfServiceEventClassCode" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7aiEM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rm-rAH3sEeyivuDeOiJBMg" name="TransferSummaryDocumentationOfServiceEventClassCode" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rm-rAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(isDefined('classCode') and classCode=vocab::ActClassRoot::PCPR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7airQF9xEey5t-mahoHmrg" name="TransferSummaryDocumentationOfServiceEventCode" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7airQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rm-rAn3sEeyivuDeOiJBMg" name="TransferSummaryDocumentationOfServiceEventCode" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rm-rA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7airQl9xEey5t-mahoHmrg" name="TransferSummaryDocumentationOfServiceEventPerformer1" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7airQ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rm-rBH3sEeyivuDeOiJBMg" name="TransferSummaryDocumentationOfServiceEventPerformer1" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rm-rBX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(performer->select(performer : cda::Performer1 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer1))->select(typeCode = vocab::x_ServiceEventPerformer::PRF)->notEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7airRF9xEey5t-mahoHmrg" name="TransferSummaryDocumentationOfServiceEvent" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7ajSUF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rm-rBn3sEeyivuDeOiJBMg" name="TransferSummaryDocumentationOfServiceEvent" constrainedElement="_mgnrsKDQEeOPqKnBFQcY_A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rm-rB33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null)->reject(serviceEvent->one(serviceEvent : cda::ServiceEvent | not serviceEvent.oclIsUndefined() and serviceEvent.oclIsKindOf(cda::ServiceEvent)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_mgoSwKDQEeOPqKnBFQcY_A" general="_dduXkJ5OEeOr4eM3k36wAg"/>
-      <ownedOperation xmi:id="_2rlBwF9xEey5t-mahoHmrg" name="getAdvanceDirectivesSection2" bodyCondition="_2rlBw19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2rlBw19xEey5t-mahoHmrg" name="body" constrainedElement="_2rlBwF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2rlBxF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NOH0Yn3sEeyivuDeOiJBMg" name="getAdvanceDirectivesSection2" bodyCondition="_NOH0ZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NOH0ZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NOH0Yn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NOH0Zn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdvanceDirectivesSection2))->asSequence()->any(true).oclAsType(consol::AdvanceDirectivesSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2rlBwV9xEey5t-mahoHmrg" type="_ZFbCkAIPEeS-F85KYVlDyA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2rlBwl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NOH0Y33sEeyivuDeOiJBMg" type="_ZFbCkAIPEeS-F85KYVlDyA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NOH0ZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2sFYEl9xEey5t-mahoHmrg" name="getAllergiesSection2" bodyCondition="_2sFYFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2sFYFV9xEey5t-mahoHmrg" name="body" constrainedElement="_2sFYEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2sFYFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NOhdAn3sEeyivuDeOiJBMg" name="getAllergiesSection2" bodyCondition="_NOiEEX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NOiEEX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NOhdAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NOiEEn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSection2))->asSequence()->any(true).oclAsType(consol::AllergiesSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2sFYE19xEey5t-mahoHmrg" type="_EONPMAInEeSr1aKUYorURA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2sFYFF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NOhdA33sEeyivuDeOiJBMg" type="_EONPMAInEeSr1aKUYorURA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NOiEEH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2smVcF9xEey5t-mahoHmrg" name="getPhysicalExamSection2" bodyCondition="_2smVc19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2smVc19xEey5t-mahoHmrg" name="body" constrainedElement="_2smVcF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2smVdF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NO860n3sEeyivuDeOiJBMg" name="getPhysicalExamSection2" bodyCondition="_NO861X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NO861X3sEeyivuDeOiJBMg" name="body" constrainedElement="_NO860n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NO861n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection2))->asSequence()->any(true).oclAsType(consol::PhysicalExamSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2smVcV9xEey5t-mahoHmrg" type="_-nZiYP4uEeObaveuCI77uA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2smVcl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NO86033sEeyivuDeOiJBMg" type="_-nZiYP4uEeObaveuCI77uA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NO861H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2tHS0l9xEey5t-mahoHmrg" name="getEncountersSection2" bodyCondition="_2tHS1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2tHS1V9xEey5t-mahoHmrg" name="body" constrainedElement="_2tHS0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2tHS1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NPXKgn3sEeyivuDeOiJBMg" name="getEncountersSection2" bodyCondition="_NPXKhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NPXKhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NPXKgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NPXKhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::EncountersSection2))->asSequence()->any(true).oclAsType(consol::EncountersSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2tHS019xEey5t-mahoHmrg" type="_ogD-EAIvEeScubSeRE1upQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2tHS1F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NPXKg33sEeyivuDeOiJBMg" type="_ogD-EAIvEeScubSeRE1upQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NPXKhH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2tnpIl9xEey5t-mahoHmrg" name="getFamilyHistorySection" bodyCondition="_2tnpJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2tnpJV9xEey5t-mahoHmrg" name="body" constrainedElement="_2tnpIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2tnpJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NP0dgn3sEeyivuDeOiJBMg" name="getFamilyHistorySection" bodyCondition="_NP0dhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NP0dhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NP0dgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NP0dhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection))->asSequence()->any(true).oclAsType(consol::FamilyHistorySection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2tnpI19xEey5t-mahoHmrg" type="_2IWQIxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2tnpJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NP0dg33sEeyivuDeOiJBMg" type="_2IWQIxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NP0dhH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2uVa0F9xEey5t-mahoHmrg" name="getFunctionalStatusSection2" bodyCondition="_2uVa019xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2uVa019xEey5t-mahoHmrg" name="body" constrainedElement="_2uVa0F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2uVa1F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NQRJcn3sEeyivuDeOiJBMg" name="getFunctionalStatusSection2" bodyCondition="_NQRJdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NQRJdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NQRJcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NQRJdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FunctionalStatusSection2))->asSequence()->any(true).oclAsType(consol::FunctionalStatusSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2uVa0V9xEey5t-mahoHmrg" type="_8rMFkPyHEeOozpLKXSm5NA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2uVa0l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NQRJc33sEeyivuDeOiJBMg" type="_8rMFkPyHEeOozpLKXSm5NA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NQRJdH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2u1xIl9xEey5t-mahoHmrg" name="getImmunizationsSectionEntriesOptional2" bodyCondition="_2u1xJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2u1xJV9xEey5t-mahoHmrg" name="body" constrainedElement="_2u1xIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2u1xJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NQrZIn3sEeyivuDeOiJBMg" name="getImmunizationsSectionEntriesOptional2" bodyCondition="_NQrZJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NQrZJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NQrZIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NQrZJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::ImmunizationsSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2u1xI19xEey5t-mahoHmrg" type="_kdQhIPy3EeO1SvUcmWeLDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2u1xJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NQrZI33sEeyivuDeOiJBMg" type="_kdQhIPy3EeO1SvUcmWeLDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NQrZJH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2vVgYl9xEey5t-mahoHmrg" name="getMedicalEquipmentSection2" bodyCondition="_2vVgZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2vVgZV9xEey5t-mahoHmrg" name="body" constrainedElement="_2vVgYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2vVgZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NRGP4n3sEeyivuDeOiJBMg" name="getMedicalEquipmentSection2" bodyCondition="_NRGP5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NRGP5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_NRGP4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NRGP5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicalEquipmentSection2))->asSequence()->any(true).oclAsType(consol::MedicalEquipmentSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2vVgY19xEey5t-mahoHmrg" type="_5OKxwP1bEeO5Hq-yrsJSmg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2vVgZF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NRGP433sEeyivuDeOiJBMg" type="_5OKxwP1bEeO5Hq-yrsJSmg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NRGP5H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2v1Pol9xEey5t-mahoHmrg" name="getMedicationsSection2" bodyCondition="_2v1PpV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2v1PpV9xEey5t-mahoHmrg" name="body" constrainedElement="_2v1Pol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2v1Ppl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NRhGoH3sEeyivuDeOiJBMg" name="getMedicationsSection2" bodyCondition="_NRhGo33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NRhGo33sEeyivuDeOiJBMg" name="body" constrainedElement="_NRhGoH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NRhGpH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSection2))->asSequence()->any(true).oclAsType(consol::MedicationsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2v1Po19xEey5t-mahoHmrg" type="_P2mp4ALQEeS0YMHMf4rRtQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2v1PpF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NRhGoX3sEeyivuDeOiJBMg" type="_P2mp4ALQEeS0YMHMf4rRtQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NRhGon3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2wVl8l9xEey5t-mahoHmrg" name="getPayersSection2" bodyCondition="_2wVl9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2wVl9V9xEey5t-mahoHmrg" name="body" constrainedElement="_2wVl8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2wVl9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NR7WUn3sEeyivuDeOiJBMg" name="getPayersSection2" bodyCondition="_NR7WVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NR7WVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NR7WUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NR7WVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PayersSection2))->asSequence()->any(true).oclAsType(consol::PayersSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2wVl819xEey5t-mahoHmrg" type="_twgM0P4lEeOzC5ykp-XCaA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2wVl9F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NR7WU33sEeyivuDeOiJBMg" type="_twgM0P4lEeOzC5ykp-XCaA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NR7WVH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2w18Ql9xEey5t-mahoHmrg" name="getPlanOfTreatmentSection2" bodyCondition="_2w18RV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2w18RV9xEey5t-mahoHmrg" name="body" constrainedElement="_2w18Ql9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2w18Rl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NSWNEn3sEeyivuDeOiJBMg" name="getPlanOfTreatmentSection2" bodyCondition="_NSWNFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NSWNFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NSWNEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NSW0IH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2))->asSequence()->any(true).oclAsType(consol::PlanOfTreatmentSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2w18Q19xEey5t-mahoHmrg" type="_bwml0P4yEeO_Yb9cO8w3bA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2w18RF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NSWNE33sEeyivuDeOiJBMg" type="_bwml0P4yEeO_Yb9cO8w3bA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NSWNFH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2xWSkl9xEey5t-mahoHmrg" name="getProblemSection2" bodyCondition="_2xWSlV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2xWSlV9xEey5t-mahoHmrg" name="body" constrainedElement="_2xWSkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2xWSll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NS0HIn3sEeyivuDeOiJBMg" name="getProblemSection2" bodyCondition="_NS0HJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NS0HJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NS0HIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NS0HJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSection2))->asSequence()->any(true).oclAsType(consol::ProblemSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2xWSk19xEey5t-mahoHmrg" type="_IXrA4ALVEeSyydFGYJajGA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2xWSlF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NS0HI33sEeyivuDeOiJBMg" type="_IXrA4ALVEeSyydFGYJajGA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NS0HJH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2x0Mol9xEey5t-mahoHmrg" name="getProceduresSection2" bodyCondition="_2x0MpV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2x0MpV9xEey5t-mahoHmrg" name="body" constrainedElement="_2x0Mol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2x0Mpl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NTRaIH3sEeyivuDeOiJBMg" name="getProceduresSection2" bodyCondition="_NTRaI33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NTRaI33sEeyivuDeOiJBMg" name="body" constrainedElement="_NTRaIH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NTRaJH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSection2))->asSequence()->any(true).oclAsType(consol::ProceduresSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2x0Mo19xEey5t-mahoHmrg" type="_N6wUUALoEeSBA9s7kRnaEg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2x0MpF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NTRaIX3sEeyivuDeOiJBMg" type="_N6wUUALoEeSBA9s7kRnaEg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NTRaIn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2yT74V9xEey5t-mahoHmrg" name="getResultsSection2" bodyCondition="_2yT75F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2yT75F9xEey5t-mahoHmrg" name="body" constrainedElement="_2yT74V9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2yT75V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NTxJYn3sEeyivuDeOiJBMg" name="getResultsSection2" bodyCondition="_NTxJZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NTxJZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NTxJYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NTxJZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSection2))->asSequence()->any(true).oclAsType(consol::ResultsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2yT74l9xEey5t-mahoHmrg" type="_bAAhEALtEeSueJWOLw5iaQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2yT7419xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NTxJY33sEeyivuDeOiJBMg" type="_bAAhEALtEeSueJWOLw5iaQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NTxJZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2yydAl9xEey5t-mahoHmrg" name="getSocialHistorySection2" bodyCondition="_2yydBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2yydBV9xEey5t-mahoHmrg" name="body" constrainedElement="_2yydAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2yydBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NUPDcn3sEeyivuDeOiJBMg" name="getSocialHistorySection2" bodyCondition="_NUPDdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NUPDdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NUPDcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NUPDdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection2))->asSequence()->any(true).oclAsType(consol::SocialHistorySection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2yydA19xEey5t-mahoHmrg" type="_wLWZMAFHEeSG_MJH-zNFRw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2yydBF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NUPDc33sEeyivuDeOiJBMg" type="_wLWZMAFHEeSG_MJH-zNFRw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NUPDdH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2zSzUl9xEey5t-mahoHmrg" name="getVitalSignsSection2" bodyCondition="_2zSzVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2zSzVV9xEey5t-mahoHmrg" name="body" constrainedElement="_2zSzUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2zSzVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NUrvYn3sEeyivuDeOiJBMg" name="getVitalSignsSection2" bodyCondition="_NUsWcn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NUsWcn3sEeyivuDeOiJBMg" name="body" constrainedElement="_NUrvYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NUsWc33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSection2))->asSequence()->any(true).oclAsType(consol::VitalSignsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2zSzU19xEey5t-mahoHmrg" type="_D3010ALzEeSM0Jd2D1FgKw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2zSzVF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NUsWcH3sEeyivuDeOiJBMg" type="_D3010ALzEeSM0Jd2D1FgKw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NUsWcX3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2zzJol9xEey5t-mahoHmrg" name="getMentalStatusSection" bodyCondition="_2zzwsF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2zzwsF9xEey5t-mahoHmrg" name="body" constrainedElement="_2zzJol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2zzwsV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NVJCYn3sEeyivuDeOiJBMg" name="getMentalStatusSection" bodyCondition="_NVJpcX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NVJpcX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NVJCYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NVJpcn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MentalStatusSection))->asSequence()->any(true).oclAsType(consol::MentalStatusSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2zzJo19xEey5t-mahoHmrg" type="_4tfOMJ2CEeORR8_YW0n_jQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2zzJpF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NVJCY33sEeyivuDeOiJBMg" type="_4tfOMJ2CEeORR8_YW0n_jQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NVJpcH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_20Tf8l9xEey5t-mahoHmrg" name="getGeneralStatusSection" bodyCondition="_20Tf9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_20Tf9V9xEey5t-mahoHmrg" name="body" constrainedElement="_20Tf8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_20Tf9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NVr08H3sEeyivuDeOiJBMg" name="getGeneralStatusSection" bodyCondition="_NVr0833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NVr0833sEeyivuDeOiJBMg" name="body" constrainedElement="_NVr08H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NVr09H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::GeneralStatusSection))->asSequence()->any(true).oclAsType(consol::GeneralStatusSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_20Tf819xEey5t-mahoHmrg" type="_2Pxt6xSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_20Tf9F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NVr08X3sEeyivuDeOiJBMg" type="_2Pxt6xSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NVr08n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_20z2Ql9xEey5t-mahoHmrg" name="getReviewOfSystemsSection" bodyCondition="_20z2RV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_20z2RV9xEey5t-mahoHmrg" name="body" constrainedElement="_20z2Ql9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_20z2Rl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NWJH8n3sEeyivuDeOiJBMg" name="getReviewOfSystemsSection" bodyCondition="_NWJH9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NWJH9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_NWJH8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NWJH9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))->asSequence()->any(true).oclAsType(consol::ReviewOfSystemsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_20z2Q19xEey5t-mahoHmrg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_20z2RF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NWJH833sEeyivuDeOiJBMg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NWJH9H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_21UzoV9xEey5t-mahoHmrg" name="getNutritionSection" bodyCondition="_21UzpF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_21UzpF9xEey5t-mahoHmrg" name="body" constrainedElement="_21UzoV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_21UzpV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NWj-sH3sEeyivuDeOiJBMg" name="getNutritionSection" bodyCondition="_NWj-s33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NWj-s33sEeyivuDeOiJBMg" name="body" constrainedElement="_NWj-sH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NWj-tH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::NutritionSection))->asSequence()->any(true).oclAsType(consol::NutritionSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_21Uzol9xEey5t-mahoHmrg" type="_MlM4IJ2GEeORR8_YW0n_jQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_21Uzo19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NWj-sX3sEeyivuDeOiJBMg" type="_MlM4IJ2GEeORR8_YW0n_jQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NWj-sn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_211J8l9xEey5t-mahoHmrg" name="getReasonForReferralSection2" bodyCondition="_211J9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_211J9V9xEey5t-mahoHmrg" name="body" constrainedElement="_211J8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_211J9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NW-OYH3sEeyivuDeOiJBMg" name="getReasonForReferralSection2" bodyCondition="_NW-OY33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NW-OY33sEeyivuDeOiJBMg" name="body" constrainedElement="_NW-OYH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NW-OZH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForReferralSection2))->asSequence()->any(true).oclAsType(consol::ReasonForReferralSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_211J819xEey5t-mahoHmrg" type="_Ya0H0AB5EeS20Pddu0dxVw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_211J9F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NW-OYX3sEeyivuDeOiJBMg" type="_Ya0H0AB5EeS20Pddu0dxVw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NW-OYn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_22WHUF9xEey5t-mahoHmrg" name="getHistoryOfPastIllnessSection2" bodyCondition="_22WHU19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_22WHU19xEey5t-mahoHmrg" name="body" constrainedElement="_22WHUF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_22WHVF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NXX3An3sEeyivuDeOiJBMg" name="getHistoryOfPastIllnessSection2" bodyCondition="_NXX3BX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NXX3BX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NXX3An3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NXX3Bn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection2))->asSequence()->any(true).oclAsType(consol::HistoryOfPastIllnessSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_22WHUV9xEey5t-mahoHmrg" type="_sZlggPyhEeOC19UEcu7MOw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_22WHUl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NXX3A33sEeyivuDeOiJBMg" type="_sZlggPyhEeOC19UEcu7MOw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NXX3BH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_222doF9xEey5t-mahoHmrg" name="getHistoryOfPresentIllnessSection" bodyCondition="_222do19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_222do19xEey5t-mahoHmrg" name="body" constrainedElement="_222doF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_222dpF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NX1xEH3sEeyivuDeOiJBMg" name="getHistoryOfPresentIllnessSection" bodyCondition="_NX1xE33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NX1xE33sEeyivuDeOiJBMg" name="body" constrainedElement="_NX1xEH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NX1xFH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))->asSequence()->any(true).oclAsType(consol::HistoryOfPresentIllnessSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_222doV9xEey5t-mahoHmrg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_222dol9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NX1xEX3sEeyivuDeOiJBMg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NX1xEn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_23Wz8F9xEey5t-mahoHmrg" name="getAssessmentAndPlanSection2" bodyCondition="_23Wz819xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_23Wz819xEey5t-mahoHmrg" name="body" constrainedElement="_23Wz8F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_23Wz9F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NYSdAn3sEeyivuDeOiJBMg" name="getAssessmentAndPlanSection2" bodyCondition="_NYSdBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NYSdBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NYSdAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NYSdBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection2))->asSequence()->any(true).oclAsType(consol::AssessmentAndPlanSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_23Wz8V9xEey5t-mahoHmrg" type="_q_8twPvVEeOvZJBdQKQrqQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_23Wz8l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NYSdA33sEeyivuDeOiJBMg" type="_q_8twPvVEeOvZJBdQKQrqQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NYSdBH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_233KQl9xEey5t-mahoHmrg" name="getAssessmentSection" bodyCondition="_233KRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_233KRV9xEey5t-mahoHmrg" name="body" constrainedElement="_233KQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_233KRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NYvI8n3sEeyivuDeOiJBMg" name="getAssessmentSection" bodyCondition="_NYvI9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NYvI9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_NYvI8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NYvwAH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))->asSequence()->any(true).oclAsType(consol::AssessmentSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_233KQ19xEey5t-mahoHmrg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_233KRF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NYvI833sEeyivuDeOiJBMg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NYvI9H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4K44YF9xEey5t-mahoHmrg" name="getDischargeDiagnosisSection2" bodyCondition="_4K44Y19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4K44Y19xEey5t-mahoHmrg" name="body" constrainedElement="_4K44YF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4K44ZF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Of8ooH3sEeyivuDeOiJBMg" name="getDischargeDiagnosisSection2" bodyCondition="_Of8oo33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Of8oo33sEeyivuDeOiJBMg" name="body" constrainedElement="_Of8ooH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Of8opH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::DischargeDiagnosisSection2))->asSequence()->any(true).oclAsType(consol::DischargeDiagnosisSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4K44YV9xEey5t-mahoHmrg" type="_jfuGYPytEeOmn53IDV99zw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4K44Yl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Of8ooX3sEeyivuDeOiJBMg" type="_jfuGYPytEeOmn53IDV99zw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Of8oon3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4LZOsF9xEey5t-mahoHmrg" name="getAdmissionMedicationsSectionEntriesOptional2" bodyCondition="_4LZOs19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4LZOs19xEey5t-mahoHmrg" name="body" constrainedElement="_4LZOsF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4LZOtF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OgVqMn3sEeyivuDeOiJBMg" name="getAdmissionMedicationsSectionEntriesOptional2" bodyCondition="_OgVqNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OgVqNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OgVqMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OgVqNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdmissionMedicationsSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::AdmissionMedicationsSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4LZOsV9xEey5t-mahoHmrg" type="_ZLY3MPyqEeOlg_Cnc5bODw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4LZOsl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_OgVqM33sEeyivuDeOiJBMg" type="_ZLY3MPyqEeOlg_Cnc5bODw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OgVqNH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4L5lAV9xEey5t-mahoHmrg" name="getAdmissionDiagnosisSection2" bodyCondition="_4L5lBF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4L5lBF9xEey5t-mahoHmrg" name="body" constrainedElement="_4L5lAV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4L5lBV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ogwg8H3sEeyivuDeOiJBMg" name="getAdmissionDiagnosisSection2" bodyCondition="_Ogwg833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ogwg833sEeyivuDeOiJBMg" name="body" constrainedElement="_Ogwg8H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ogwg9H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdmissionDiagnosisSection2))->asSequence()->any(true).oclAsType(consol::AdmissionDiagnosisSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4L5lAl9xEey5t-mahoHmrg" type="_ctJgAPylEeOc0tW1-DpN-Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4L5lA19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Ogwg8X3sEeyivuDeOiJBMg" type="_ctJgAPylEeOc0tW1-DpN-Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ogwg8n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4MZ7Ul9xEey5t-mahoHmrg" name="getCourseOfCareSection" bodyCondition="_4MZ7VV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4MZ7VV9xEey5t-mahoHmrg" name="body" constrainedElement="_4MZ7Ul9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4MZ7Vl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OhKJkn3sEeyivuDeOiJBMg" name="getCourseOfCareSection" bodyCondition="_OhKJlX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OhKJlX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OhKJkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OhKJln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::CourseOfCareSection))->asSequence()->any(true).oclAsType(consol::CourseOfCareSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4MZ7U19xEey5t-mahoHmrg" type="_S0oqIIfLEeSBauRYePLghA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4MZ7VF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_OhKJk33sEeyivuDeOiJBMg" type="_S0oqIIfLEeSBauRYePLghA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OhKJlH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -25835,412 +25835,412 @@ This template is designed to be used in conjunction with the US Realm Header (V3
 The Patient Generated Document Header template is not a separate document type. The document body may contain any structured or unstructured content from C-CDA.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_woe24F9xEey5t-mahoHmrg" name="USRealmHeader2TemplateId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_woe24V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_H6Vmkn3sEeyivuDeOiJBMg" name="USRealmHeader2TemplateId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_H6Vmk33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.29.1' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wwPrwF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentRecordTarget" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wwPrwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IBMcgH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentRecordTarget" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IBMcgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->one(recordTarget : cda::RecordTarget | not recordTarget.oclIsUndefined() and recordTarget.oclIsKindOf(cda::RecordTarget))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_wzMSEF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentAuthor" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wzMSEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IDtlAH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentAuthor" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IDtlAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(cda::Author))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_w0TFUF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentDataEnterer" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_w0TFUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IEoLAH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentDataEnterer" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IEoLAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->one(dataEnterer : cda::DataEnterer | not dataEnterer.oclIsUndefined() and dataEnterer.oclIsKindOf(cda::DataEnterer))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_w1RVsF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentInformant" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_w1RVsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IFfGoH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentInformant" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IFfGoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->exists(informant : cda::Informant12 | not informant.oclIsUndefined() and informant.oclIsKindOf(cda::Informant12))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_w2dogF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentCustodian" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_w2dogV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IGWpUH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentCustodian" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IGWpUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->one(custodian : cda::Custodian | not custodian.oclIsUndefined() and custodian.oclIsKindOf(cda::Custodian))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_w3_SgF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentInformationRecipient" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_w3_SgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IHl_cH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentInformationRecipient" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IHl_cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->exists(informationRecipient : cda::InformationRecipient | not informationRecipient.oclIsUndefined() and informationRecipient.oclIsKindOf(cda::InformationRecipient))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_w49i4F9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentLegalAuthenticator" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_w4-J8F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IIf-YH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentLegalAuthenticator" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IIf-YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->one(legalAuthenticator : cda::LegalAuthenticator | not legalAuthenticator.oclIsUndefined() and legalAuthenticator.oclIsKindOf(cda::LegalAuthenticator))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_w5-PgF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentAuthenticator" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_w5-PgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IJVr4H3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentAuthenticator" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IJWS8H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->exists(authenticator : cda::Authenticator | not authenticator.oclIsUndefined() and authenticator.oclIsKindOf(cda::Authenticator))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_w69uAF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentParticipant" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_w69uAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IKN1oH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentParticipant" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IKN1oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant1 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_w7-aoF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentInFulfillmentOf" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_w7-aoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ILEKMH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentInFulfillmentOf" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ILEKMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->exists(inFulfillmentOf : cda::InFulfillmentOf | not inFulfillmentOf.oclIsUndefined() and inFulfillmentOf.oclIsKindOf(cda::InFulfillmentOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_w89SEF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOf" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_w89SEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IL6ewH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOf" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IL6ewX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->exists(documentationOf : cda::DocumentationOf | not documentationOf.oclIsUndefined() and documentationOf.oclIsKindOf(cda::DocumentationOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7dQBAF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardianId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7dQBAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RpTmQH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardianId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RpTmQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7dQoEF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardianCodeP" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7dQoEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RpTmQn3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardianCodeP" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RpTmQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7dQoEl9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardianCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7dQoE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RpUNUH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardianCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RpUNUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).guardian->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.111' and (value.code = 'DAUINLAW' or value.code = 'FTH' or value.code = 'DAU' or value.code = 'HPOWATT' or value.code = 'MTH' or value.code = 'SON' or value.code = 'SELF' or value.code = 'SONINLAW')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7dwXUF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientLanguageCommunicationPreferenceInd" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7dwXUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rp1xwH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientLanguageCommunicationPreferenceInd" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rp1xwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null).languageCommunication->excluding(null)->reject((preferenceInd.oclIsUndefined() or preferenceInd.isNullFlavorUndefined()) implies (not preferenceInd.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7dw-YF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientIfMoreThanOneLangComm" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7dw-YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rp2Y0H3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientIfMoreThanOneLangComm" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rp2Y0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject(languageCommunication->size() > 1 implies languageCommunication->one( langCom : cda::LanguageCommunication | langCom.preferenceInd.value))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7dw-Yl9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardian" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7dw-Y19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rp2Y0n3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardian" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rp2Y033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject(guardian->exists(guardian : cda::Guardian | not guardian.oclIsUndefined() and guardian.oclIsKindOf(cda::Guardian)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7dw-ZF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientLanguageCommunication" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7dw-ZV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rp2Y1H3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientLanguageCommunication" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rp2Y1X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null).patient->excluding(null)->reject(languageCommunication->exists(languageCommunication : cda::LanguageCommunication | not languageCommunication.oclIsUndefined() and languageCommunication.oclIsKindOf(cda::LanguageCommunication)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7dxlcF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRoleId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7dxlcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rp2_4H3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRoleId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rp2_4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7dxlcl9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatient" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7dxlc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rp2_4n3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatient" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rp2_433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null)->reject(patient->one(patient : cda::Patient | not patient.oclIsUndefined() and patient.oclIsKindOf(cda::Patient)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7dyMgF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRoleProviderOrganization" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7dyMgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rp2_5H3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRoleProviderOrganization" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rp2_5X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null)->reject(providerOrganization->one(providerOrganization : cda::Organization | not providerOrganization.oclIsUndefined() and providerOrganization.oclIsKindOf(rim::Entity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7dyMgl9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRole" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7dyMg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rp3m8H3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRole" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rp3m8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null)->reject(patientRole->one(patientRole : cda::PatientRole | not patientRole.oclIsUndefined() and patientRole.oclIsKindOf(cda::PatientRole)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7eySEF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthorCECodeSystemAndTerminology" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7eySEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rq1QQH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthorCECodeSystemAndTerminology" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rq1QQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null).code->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies (codeSystem = '2.16.840.1.113883.5.111'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7eySEl9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthorCECode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7eySE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rq1QQn3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthorCECode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rq1QQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null).code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not code.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7ey5IF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthorId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7ey5IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rq1QRH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthorId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rq1QRX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7ey5Il9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthorCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7ey5I19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rq13UH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthorCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rq13UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7ey5JF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthor" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7ey5JV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rq13Un3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthor" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rq13U33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null)->reject(assignedAuthor->one(assignedAuthor : cda::AssignedAuthor | not assignedAuthor.oclIsUndefined() and assignedAuthor.oclIsKindOf(cda::AssignedAuthor)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7fwicF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentDataEntererAssignedEntityCodeP" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7fwicV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rr0uwH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentDataEntererAssignedEntityCodeP" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rr0uwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7fwicl9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentDataEntererAssignedEntityCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7fwic19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rr0uwn3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentDataEntererAssignedEntityCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rr0uw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.111' and (value.code = 'DAUINLAW' or value.code = 'FTH' or value.code = 'DAU' or value.code = 'HPOWATT' or value.code = 'MTH' or value.code = 'SON' or value.code = 'SELF' or value.code = 'SONINLAW')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7fxJgF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentDataEntererAssignedEntity" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7fxJgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rr0uxH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentDataEntererAssignedEntity" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rr1V0H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.dataEnterer->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7gxPEF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentInformantRelatedEntityCodeP" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7gxPEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RsvUwH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentInformantRelatedEntityCodeP" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RsvUwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).relatedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7gxPEl9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentInformantRelatedEntityCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7gxPE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RsvUwn3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentInformantRelatedEntityCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RsvUw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null).relatedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.111' and (value.code = 'DAUINLAW' or value.code = 'FTH' or value.code = 'DAU' or value.code = 'HPOWATT' or value.code = 'MTH' or value.code = 'SON' or value.code = 'SELF' or value.code = 'SONINLAW')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7gxPFF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentInformantHasRelatedEntityOrAssignedEntity" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7gx2IF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RsvUxH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentInformantHasRelatedEntityOrAssignedEntity" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RsvUxX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null)->reject(relatedEntity->one(relatedEntity : cda::RelatedEntity | not relatedEntity.oclIsUndefined() and relatedEntity.oclIsKindOf(cda::RelatedEntity)) xor assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7gx2IV9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentInformantRelatedEntity" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7gx2Il9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rsv70H3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentInformantRelatedEntity" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rsv70X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->excluding(null)->reject(relatedEntity->one(relatedEntity : cda::RelatedEntity | not relatedEntity.oclIsUndefined() and relatedEntity.oclIsKindOf(cda::RelatedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7iS5EF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentCustodianAssignedCustodianRepresentedCustodianOrganizationId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7iS5EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RuEKcH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentCustodianAssignedCustodianRepresentedCustodianOrganizationId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RuEKcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null).representedCustodianOrganization->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7iTgIF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentCustodianAssignedCustodianRepresentedCustodianOrganization" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7iTgIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RuEKcn3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentCustodianAssignedCustodianRepresentedCustodianOrganization" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RuExgH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null)->reject(representedCustodianOrganization->one(representedCustodianOrganization : cda::CustodianOrganization | not representedCustodianOrganization.oclIsUndefined() and representedCustodianOrganization.oclIsKindOf(cda::CustodianOrganization)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7iTgIl9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentCustodianAssignedCustodian" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7iTgI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RuExgX3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentCustodianAssignedCustodian" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RuExgn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null)->reject(assignedCustodian->one(assignedCustodian : cda::AssignedCustodian | not assignedCustodian.oclIsUndefined() and assignedCustodian.oclIsKindOf(cda::AssignedCustodian)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7jVa4F9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentInformationRecipientIntendedRecipientIIRoot" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7jVa4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ru87QH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentInformationRecipientIntendedRecipientIIRoot" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ru87QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null).id->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not root.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7jVa4l9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentInformationRecipientIntendedRecipientId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7jVa419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ru9iUH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentInformationRecipientIntendedRecipientId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ru9iUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null).intendedRecipient->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7jWB8F9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentInformationRecipientIntendedRecipient" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7jWB8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ru9iUn3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentInformationRecipientIntendedRecipient" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ru9iU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null)->reject(intendedRecipient->one(intendedRecipient : cda::IntendedRecipient | not intendedRecipient.oclIsUndefined() and intendedRecipient.oclIsKindOf(cda::IntendedRecipient)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7kUSUF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntityCECodeSystemAndTerminology" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7kUSUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rv4vYH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntityCECodeSystemAndTerminology" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rv4vYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null).code->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies (codeSystem = '2.16.840.1.113883.5.111'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7kU5YF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntityCECode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7kU5YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rv5WcH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntityCECode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rv5WcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null).code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not code.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7kU5Yl9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntityId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7kU5Y19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rv5Wcn3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntityId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rv5Wc33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7kU5ZF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntityCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7kVgcF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rv5WdH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntityCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rv5WdX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7kVgcV9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntity" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7kVgcl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rv59gH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntity" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rv59gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.legalAuthenticator->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7lTw0F9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntityId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7lTw0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RwyHQH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntityId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RwyHQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7lTw0l9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntityCodeP" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7lTw019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RwyuUH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntityCodeP" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RwyuUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7lTw1F9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntityCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7lTw1V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RwyuUn3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntityCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RwyuU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.111' and (value.code = 'DAUINLAW' or value.code = 'FTH' or value.code = 'DAU' or value.code = 'HPOWATT' or value.code = 'MTH' or value.code = 'SON' or value.code = 'SELF' or value.code = 'SONINLAW')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7lUX4F9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntity" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7lUX4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RwyuVH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntity" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RwyuVX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authenticator->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7mVEgF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentParticipantAssociatedEntityCodeP" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7mVEgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rxpp8H3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentParticipantAssociatedEntityCodeP" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rxpp8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).associatedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7mVEgl9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentParticipantAssociatedEntityCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7mVEg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Rxpp8n3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentParticipantAssociatedEntityCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Rxpp833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).associatedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.111' and (value.code = 'DAUINLAW' or value.code = 'FTH' or value.code = 'DAU' or value.code = 'HPOWATT' or value.code = 'MTH' or value.code = 'SON' or value.code = 'SELF' or value.code = 'SONINLAW')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7mVEhF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentParticipantIfTypeCodeINDThenAEClassCodeFromINDRoleclassCodes" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7mVrkF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RxqRAH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentParticipantIfTypeCodeINDThenAEClassCodeFromINDRoleclassCodes" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RxqRAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(p : cda::Participant1 | p.typeCode = vocab::ParticipationType::IND and not ( p.associatedEntity.classCode = vocab::RoleClassAssociative::PRS  or p.associatedEntity.classCode = vocab::RoleClassAssociative::NOK or p.associatedEntity.classCode = vocab::RoleClassAssociative::CAREGIVER or p.associatedEntity.classCode = vocab::RoleClassAssociative::AGNT or p.associatedEntity.classCode = vocab::RoleClassAssociative::GUAR or p.associatedEntity.classCode = vocab::RoleClassAssociative::ECON or p.associatedEntity.isNullFlavorDefined() ) or p.associatedEntity.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7mVrkV9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentParticipantTypeCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7mVrkl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RxqRAn3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentParticipantTypeCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RxqRA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(isDefined('typeCode'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7mVrk19xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentParticipantAssociatedEntity" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7mVrlF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RxqRBH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentParticipantAssociatedEntity" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RxqRBX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(associatedEntity->one(associatedEntity : cda::AssociatedEntity | not associatedEntity.oclIsUndefined() and associatedEntity.oclIsKindOf(cda::AssociatedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7nWYMF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentInFulfillmentOfOrderId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7nWYMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_RyjB0H3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentInFulfillmentOfOrderId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_RyjB0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->excluding(null).order->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7nWYMl9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentInFulfillmentOfOrder" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7nWYM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ryjo4H3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentInFulfillmentOfOrder" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ryjo4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->excluding(null)->reject(order->one(order : cda::Order | not order.oclIsUndefined() and order.oclIsKindOf(cda::Order)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7pV8QF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7pV8QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R0b4MH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityId" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R0b4MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null).assignedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7pWjUF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityCodeP" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7pWjUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R0b4Mn3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityCodeP" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R0b4M33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7pWjUl9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7pWjU19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R0cfQH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R0cfQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.111' and (value.code = 'DAUINLAW' or value.code = 'FTH' or value.code = 'DAU' or value.code = 'HPOWATT' or value.code = 'MTH' or value.code = 'SON' or value.code = 'SELF' or value.code = 'SONINLAW')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7pXKYF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerFunctionCodeP" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7pXKYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R0cfQn3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerFunctionCodeP" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R0cfQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->reject((functionCode.oclIsUndefined() or functionCode.isNullFlavorUndefined()) implies (not functionCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7pXKYl9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerFunctionCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7pXKY19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R0cfRH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerFunctionCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R0cfRX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->reject((functionCode.oclIsUndefined() or functionCode.isNullFlavorUndefined()) implies (not functionCode.oclIsUndefined() and functionCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = functionCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.90' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7pXxcF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntity" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7pXxcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R0dGUH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntity" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R0dGUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7pXxcl9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7pXxc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R0dGUn3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventCode" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R0dGU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7pXxdF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformer" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7pXxdV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R0dtYH3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformer" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R0dtYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(performer->exists(performer : cda::Performer1 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer1)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7pYYgF9xEey5t-mahoHmrg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEvent" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7pYYgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R0dtYn3sEeyivuDeOiJBMg" name="USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEvent" constrainedElement="_OA1xkKi8EeOTwZftO6CV5g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R0dtY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null)->reject(serviceEvent->one(serviceEvent : cda::ServiceEvent | not serviceEvent.oclIsUndefined() and serviceEvent.oclIsKindOf(cda::ServiceEvent)))</body>
         </specification>
@@ -26256,80 +26256,80 @@ This template represents the Author Participation (including the author timestam
 The Author Participation template was added to those templates in scope for analysis in R2. Although it is not explicitly stated in all templates the Author Participation template can be used in any template.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_w-XnUF9xEey5t-mahoHmrg" name="AuthorParticipationTemplateId" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_w-XnUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_INRJoH3sEeyivuDeOiJBMg" name="AuthorParticipationTemplateId" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_INRJoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.119')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_w-Y1cF9xEey5t-mahoHmrg" name="AuthorParticipationTime" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_w-Y1cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_INSXwH3sEeyivuDeOiJBMg" name="AuthorParticipationTime" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_INSXwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.time.oclIsUndefined() or self.time.isNullFlavorUndefined()) implies (not self.time.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_w_BHkF9xEey5t-mahoHmrg" name="AuthorParticipationAssignedAuthor" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_w_BHkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_INz8MH3sEeyivuDeOiJBMg" name="AuthorParticipationAssignedAuthor" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_INz8MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->one(assignedAuthor : cda::AssignedAuthor | not assignedAuthor.oclIsUndefined() and assignedAuthor.oclIsKindOf(cda::AssignedAuthor))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7qYeEF9xEey5t-mahoHmrg" name="AuthorParticipationAssignedAuthorAssignedPersonName" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7qYeEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R1ZhgH3sEeyivuDeOiJBMg" name="AuthorParticipationAssignedAuthorAssignedPersonName" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R1ZhgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null).assignedPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (not name->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7q6CgF9xEey5t-mahoHmrg" name="AuthorParticipationAssignedAuthorRepresentedOrganizationId" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7q6CgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R10YQH3sEeyivuDeOiJBMg" name="AuthorParticipationAssignedAuthorRepresentedOrganizationId" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R10YQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null).representedOrganization->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7q6Cgl9xEey5t-mahoHmrg" name="AuthorParticipationAssignedAuthorRepresentedOrganizationName" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7q6Cg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R10YQn3sEeyivuDeOiJBMg" name="AuthorParticipationAssignedAuthorRepresentedOrganizationName" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R10YQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null).representedOrganization->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (not name->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7q6ChF9xEey5t-mahoHmrg" name="AuthorParticipationAssignedAuthorRepresentedOrganizationTelecom" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7q6ChV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R10YRH3sEeyivuDeOiJBMg" name="AuthorParticipationAssignedAuthorRepresentedOrganizationTelecom" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R10YRX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null).representedOrganization->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (not telecom->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7q6pkF9xEey5t-mahoHmrg" name="AuthorParticipationAssignedAuthorRepresentedOrganizationAddr" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7q6pkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R10_UH3sEeyivuDeOiJBMg" name="AuthorParticipationAssignedAuthorRepresentedOrganizationAddr" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R10_UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null).representedOrganization->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (not addr->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7q6pkl9xEey5t-mahoHmrg" name="AuthorParticipationAssignedAuthorCodeTerminology" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7q6pk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R10_Un3sEeyivuDeOiJBMg" name="AuthorParticipationAssignedAuthorCodeTerminology" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R10_U33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null)->reject(code.codeSystem = '2.16.840.1.113883.6.101' or code.codeSystem = '2.16.840.1.113883.5.111')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7q6plF9xEey5t-mahoHmrg" name="AuthorParticipationAssignedAuthorId" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7q6plV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R10_VH3sEeyivuDeOiJBMg" name="AuthorParticipationAssignedAuthorId" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R10_VX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7q7QoF9xEey5t-mahoHmrg" name="AuthorParticipationAssignedAuthorCode" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7q7QoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R10_Vn3sEeyivuDeOiJBMg" name="AuthorParticipationAssignedAuthorCode" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R10_V33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7q7Qol9xEey5t-mahoHmrg" name="AuthorParticipationAssignedAuthorAssignedPerson" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7q7Qo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R11mYH3sEeyivuDeOiJBMg" name="AuthorParticipationAssignedAuthorAssignedPerson" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R11mYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null)->reject(assignedPerson->one(assignedPerson : cda::Person | not assignedPerson.oclIsUndefined() and assignedPerson.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7q7QpF9xEey5t-mahoHmrg" name="AuthorParticipationAssignedAuthorRepresentedOrganization" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7q7QpV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R11mYn3sEeyivuDeOiJBMg" name="AuthorParticipationAssignedAuthorRepresentedOrganization" constrainedElement="_7jqj4KrlEeOxqJAXCMXUYg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R11mY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null)->reject(representedOrganization->one(representedOrganization : cda::Organization | not representedOrganization.oclIsUndefined() and representedOrganization.oclIsKindOf(cda::Organization)))</body>
         </specification>
@@ -26342,42 +26342,42 @@ The Author Participation template was added to those templates in scope for anal
       <ownedComment xmi:id="_qsCkoK-1EeO8duI_7f6kZw">
         <body>This template represents the medications taken by the patient prior to and at the time of admission.</body>
       </ownedComment>
-      <ownedRule xmi:id="_xKMc0F9xEey5t-mahoHmrg" name="AdmissionMedication2TemplateId" constrainedElement="_ZQpEwK-1EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xKMc0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IXfcoH3sEeyivuDeOiJBMg" name="AdmissionMedication2TemplateId" constrainedElement="_ZQpEwK-1EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IXfcoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.36' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xKO5EF9xEey5t-mahoHmrg" name="AdmissionMedicationCodeP" constrainedElement="_ZQpEwK-1EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xKO5EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IXh44H3sEeyivuDeOiJBMg" name="AdmissionMedicationCodeP" constrainedElement="_ZQpEwK-1EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IXh44X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xKND4V9xEey5t-mahoHmrg" name="AdmissionMedicationCode" constrainedElement="_ZQpEwK-1EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xKND4l9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IXgDsH3sEeyivuDeOiJBMg" name="AdmissionMedicationCode" constrainedElement="_ZQpEwK-1EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IXgDsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '42346-7' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y-GDYF9xEey5t-mahoHmrg" name="AdmissionMedicationMedicationActivity" constrainedElement="_ZQpEwK-1EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y-GDYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J9d78H3sEeyivuDeOiJBMg" name="AdmissionMedicationMedicationActivity" constrainedElement="_ZQpEwK-1EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J9d78X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::MedicationActivity2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_ZQxAkK-1EeO8duI_7f6kZw" general="_LNP08EFGEeGorO80f-Cppg"/>
-      <ownedOperation xmi:id="_y-GDYl9xEey5t-mahoHmrg" name="getConsolMedicationActivity2s" bodyCondition="_y-GDZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_y-GDZV9xEey5t-mahoHmrg" name="body" constrainedElement="_y-GDYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_y-GDZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_J9d78n3sEeyivuDeOiJBMg" name="getConsolMedicationActivity2s" bodyCondition="_J9d79X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_J9d79X3sEeyivuDeOiJBMg" name="body" constrainedElement="_J9d78n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_J9ejAH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity2)).oclAsType(consol::MedicationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_y-GDY19xEey5t-mahoHmrg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y-GDZF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_J9d7833sEeyivuDeOiJBMg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J9d79H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -26414,230 +26414,230 @@ The observation/value element contains the detailed patient directive which may
           <body>self.effectiveTime.high.hasContent() or self.effectiveTime.high.nullFlavor = vocab::NullFlavor::NA</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xKQHMF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2TemplateId" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xKQHMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IXjHAH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2TemplateId" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IXjHAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.48' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xKy5wF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationCodeP" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xKy5wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IYCPMH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationCodeP" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IYCPMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xKR8YF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationCode" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xKR8YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IXk8MH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationCode" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IXk8MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '52765003' or value.code = '61420007' or value.code = '71388002' or value.code = '78823007' or value.code = '89666000' or value.code = '225204009' or value.code = '281789004' or value.code = '304251008'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xLT3IF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationEffectiveTime" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xLT3IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IYgwUH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationEffectiveTime" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IYgwUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xLVsUF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2Value" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xLVsUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IYilgH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2Value" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IYilgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xO9oEF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationVerifier" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xO9oEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IbvqgH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationVerifier" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IbvqgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->select(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))->select(typeCode=vocab::ParticipationType::VRF)->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xPd-YF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationCustodian" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xPd-YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IcLIUH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationCustodian" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IcLIUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->select(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))->select(typeCode=vocab::ParticipationType::CST)->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xQcOwF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationReference" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xQcOwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IdBc4H3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationReference" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IdBc4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->exists(reference : cda::Reference | not reference.oclIsUndefined() and reference.oclIsKindOf(cda::Reference))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3ZHdMF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2AuthorParticipation" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3ZHdMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_N1Z20H3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2AuthorParticipation" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_N1Z20X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7rbm8F9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2CDTranslation" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7rcOAF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R2REMH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2CDTranslation" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R2REMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->size() = 1 and translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.code = '75320-2' and value.codeSystem = '2.16.840.1.113883.6.1')) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7rcOAV9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2CDTranslationP" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7rcOAl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R2REMn3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2CDTranslationP" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R2REM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7rdcIF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2IVLTSLow" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7reDMF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R2SSUH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2IVLTSLow" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R2SSUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((low.oclIsUndefined() or low.isNullFlavorUndefined()) implies (not low.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7reDMV9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2IVLTSHigh" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7reDMl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R2SSUn3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2IVLTSHigh" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R2SSU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((high.oclIsUndefined() or high.isNullFlavorUndefined()) implies (not high.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7tI3IF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2VerifierParticipantRolePlayingEntityName" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7tI3IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R3w5AH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2VerifierParticipantRolePlayingEntityName" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R3w5AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF).participantRole->excluding(null).playingEntity->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7tKFQF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2VerifierParticipantRoleCodeP" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7tKFQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R3yHIH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2VerifierParticipantRoleCodeP" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R3yHIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF).participantRole->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7tKFQl9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2VerifierParticipantRoleCode" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7tKFQ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R3yHIn3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2VerifierParticipantRoleCode" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R3yHI33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF).participantRole->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7tKFRF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2VerifierParticipantRoleAddr" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7tKFRV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R3yuMH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2VerifierParticipantRoleAddr" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R3yuMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF).participantRole->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (not addr->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7tKsUF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2VerifierParticipantRolePlayingEntity" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7tKsUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R3yuMn3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2VerifierParticipantRolePlayingEntity" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R3yuM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF).participantRole->excluding(null)->reject(playingEntity->one(playingEntity : cda::PlayingEntity | not playingEntity.oclIsUndefined() and playingEntity.oclIsKindOf(cda::PlayingEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7tKsUl9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2VerifierTemplateId" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7tKsU19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R3zVQH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2VerifierTemplateId" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R3zVQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF)->select(typeCode=vocab::ParticipationType::VRF)->reject(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.1.58'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7tKsVF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationVerifierTime" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7tLTYF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R3zVQn3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationVerifierTime" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R3zVQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF)->select(typeCode=vocab::ParticipationType::VRF)->reject((time.oclIsUndefined() or time.isNullFlavorUndefined()) implies (not time.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7tLTYV9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationVerifierParticipantRole" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7tLTYl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R3z8UH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationVerifierParticipantRole" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R3z8UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::VRF)->select(typeCode=vocab::ParticipationType::VRF)->reject(participantRole->one(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(cda::ParticipantRole)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7uqhIF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2CustodianCustodianRoleCustodianEntityCodeP" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7uqhIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R5NqgH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2CustodianCustodianRoleCustodianEntityCodeP" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R5NqgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CST).participantRole->excluding(null).playingEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7uqhIl9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2CustodianCustodianRoleCustodianEntityCode" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7uqhI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R5Nqgn3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2CustodianCustodianRoleCustodianEntityCode" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R5Nqg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CST).participantRole->excluding(null).playingEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '63161005' or value.code = '2603003')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7urIMF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationCustodianCustodianRoleCustodianEntityName" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7urIMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R5NqhH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationCustodianCustodianRoleCustodianEntityName" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R5NqhX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CST).participantRole->excluding(null).playingEntity->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (name->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7urIMl9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2CustodianCustodianRoleCodeP" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7urIM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R5ORkH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2CustodianCustodianRoleCodeP" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R5ORkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CST).participantRole->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7urINF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2CustodianCustodianRoleCode" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7urINV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R5ORkn3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2CustodianCustodianRoleCode" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R5ORk33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CST).participantRole->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.111' and (value.code = 'DAUINLAW' or value.code = 'FTH' or value.code = 'DAU' or value.code = 'HPOWATT' or value.code = 'MTH' or value.code = 'SON' or value.code = 'SELF' or value.code = 'SONINLAW')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7urvQF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationCustodianCustodianRoleAddr" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7urvQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R5ORlH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationCustodianCustodianRoleAddr" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R5ORlX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CST).participantRole->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (not addr->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7urvQl9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationCustodianCustodianRoleTelecom" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7urvQ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R5O4oH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationCustodianCustodianRoleTelecom" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R5O4oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CST).participantRole->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7urvRF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationCustodianCustodianRolePlayingEntity" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7urvRV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R5O4on3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationCustodianCustodianRolePlayingEntity" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R5O4o33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CST).participantRole->excluding(null)->reject(playingEntity->one(playingEntity : cda::PlayingEntity | not playingEntity.oclIsUndefined() and playingEntity.oclIsKindOf(cda::PlayingEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7usWUF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationCustodianAdvanceDirectiveObservationCustodianRole" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7usWUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R5PfsH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationCustodianAdvanceDirectiveObservationCustodianRole" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R5PfsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::CST)->select(typeCode=vocab::ParticipationType::CST)->reject(participantRole->one(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(cda::ParticipantRole)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7voKcF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2ReferenceAdvanceDirectiveObservationReferenceExternalDocumentTextMediaType" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7voKcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R6L64H3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2ReferenceAdvanceDirectiveObservationReferenceExternalDocumentTextMediaType" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R6L64X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null).externalDocument->excluding(null)->reject(not text.mediaType.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7voxgF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2ReferenceAdvanceDirectiveObservationReferenceExternalDocumentTextReference" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7voxgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R6Mh8H3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2ReferenceAdvanceDirectiveObservationReferenceExternalDocumentTextReference" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R6Mh8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null).externalDocument->excluding(null)->reject(not text.oclIsUndefined() implies not text.reference.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7voxgl9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationReferenceExternalDocumentId" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7voxg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R6Mh8n3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationReferenceExternalDocumentId" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R6Mh833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null).externalDocument->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7voxhF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationReferenceExternalDocumentText" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7voxhV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R6Mh9H3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationReferenceExternalDocumentText" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R6Mh9X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null).externalDocument->excluding(null)->reject((text.oclIsUndefined() or text.isNullFlavorUndefined()) implies (not text.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7vpYkF9xEey5t-mahoHmrg" name="AdvanceDirectiveObservationReferenceTypeCode" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7vpYkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R6NJAH3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservationReferenceTypeCode" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R6NJAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null)->reject(not typeCode.oclIsUndefined() and typeCode.oclIsKindOf(vocab::x_ActRelationshipExternalReference) and 
 let value : vocab::x_ActRelationshipExternalReference = typeCode.oclAsType(vocab::x_ActRelationshipExternalReference) in 
 value = vocab::x_ActRelationshipExternalReference::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7vpYkl9xEey5t-mahoHmrg" name="AdvanceDirectiveObservation2AdvanceDirectiveObservationReferenceExternalDocument" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7vpYk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R6NJAn3sEeyivuDeOiJBMg" name="AdvanceDirectiveObservation2AdvanceDirectiveObservationReferenceExternalDocument" constrainedElement="_GnllUK-9EeO8duI_7f6kZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R6NJA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null)->reject(externalDocument->one(externalDocument : cda::ExternalDocument | not externalDocument.oclIsUndefined() and externalDocument.oclIsKindOf(cda::ExternalDocument)))</body>
         </specification>
@@ -26656,58 +26656,58 @@ The statusCode of the Allergy Concern Act is the definitive indication of the st
 The effectiveTime/low of the Allergy Concern Act asserts when the concern became active. This equates to the time the concern was authored in the patient's chart. The effectiveTime/high asserts when the concern was completed (e.g., when the clinician deemed there is no longer any need to track the underlying condition).&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_xR5AQF9xEey5t-mahoHmrg" name="AllergyConcernAct2TemplateId" constrainedElement="_uCiIYLNwEeOtlapy2HWYww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xR5AQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IeTPQn3sEeyivuDeOiJBMg" name="AllergyConcernAct2TemplateId" constrainedElement="_uCiIYLNwEeOtlapy2HWYww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IeTPQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.30' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xR61cF9xEey5t-mahoHmrg" name="AllergyProblemActCode" constrainedElement="_uCiIYLNwEeOtlapy2HWYww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xR61cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IeVEcH3sEeyivuDeOiJBMg" name="AllergyProblemActCode" constrainedElement="_uCiIYLNwEeOtlapy2HWYww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IeVEcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xSdoAF9xEey5t-mahoHmrg" name="AllergyConcernAct2AuthorParticipation" constrainedElement="_uCiIYLNwEeOtlapy2HWYww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xSdoAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IezlkH3sEeyivuDeOiJBMg" name="AllergyConcernAct2AuthorParticipation" constrainedElement="_uCiIYLNwEeOtlapy2HWYww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IezlkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y-kkgF9xEey5t-mahoHmrg" name="AllergyProblemActAllergyObservation" constrainedElement="_uCiIYLNwEeOtlapy2HWYww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y-kkgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J96A0H3sEeyivuDeOiJBMg" name="AllergyProblemActAllergyObservation" constrainedElement="_uCiIYLNwEeOtlapy2HWYww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J96A0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AllergyObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7vr00F9xEey5t-mahoHmrg" name="AllergyProblemActCDCodeAndCodeSystemValues" constrainedElement="_uCiIYLNwEeOtlapy2HWYww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7vr00V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R6O-MH3sEeyivuDeOiJBMg" name="AllergyProblemActCDCodeAndCodeSystemValues" constrainedElement="_uCiIYLNwEeOtlapy2HWYww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R6O-MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject((code = 'CONC' and codeSystem = '2.16.840.1.113883.5.6') or (code = '48765-2' and codeSystem = '2.16.840.1.113883.6.1'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7vr00l9xEey5t-mahoHmrg" name="AllergyProblemActCDCode" constrainedElement="_uCiIYLNwEeOtlapy2HWYww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7vr0019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R6PlQH3sEeyivuDeOiJBMg" name="AllergyProblemActCDCode" constrainedElement="_uCiIYLNwEeOtlapy2HWYww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R6PlQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not code.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7vr01F9xEey5t-mahoHmrg" name="AllergyProblemActCDCodeSystem" constrainedElement="_uCiIYLNwEeOtlapy2HWYww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7vr01V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R6PlQn3sEeyivuDeOiJBMg" name="AllergyProblemActCDCodeSystem" constrainedElement="_uCiIYLNwEeOtlapy2HWYww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R6PlQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not codeSystem.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_uCivcLNwEeOtlapy2HWYww" general="_2EAisBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_y-kkgl9xEey5t-mahoHmrg" name="getConsolAllergyObservation2s" bodyCondition="_y-kkhV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_y-kkhV9xEey5t-mahoHmrg" name="body" constrainedElement="_y-kkgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_y-kkhl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_J96A0n3sEeyivuDeOiJBMg" name="getConsolAllergyObservation2s" bodyCondition="_J96A1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_J96A1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_J96A0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_J96A1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AllergyObservation2)).oclAsType(consol::AllergyObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_y-kkg19xEey5t-mahoHmrg" type="_uVJogLj5EeODDJAC5t5vpw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y-kkhF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_J96A033sEeyivuDeOiJBMg" type="_uVJogLj5EeODDJAC5t5vpw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J96A1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -26771,223 +26771,223 @@ The agent responsible for an allergy or adverse reaction is not always a manufac
           <body>self.entryRelationship->select(er : cda::EntryRelationship | er.observation.oclIsTypeOf(consol::CriticalityObservation))->forAll(ent : cda::EntryRelationship | ent.inversionInd=true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xSdoAl9xEey5t-mahoHmrg" name="AllergyObservation2TemplateId" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xSdoA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ie0MoH3sEeyivuDeOiJBMg" name="AllergyObservation2TemplateId" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ie0MoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.7' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xShSYF9xEey5t-mahoHmrg" name="AllergyObservation2NegationInd" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xShSYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ie2o4H3sEeyivuDeOiJBMg" name="AllergyObservation2NegationInd" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ie3P8H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.negationInd.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xSkVsF9xEey5t-mahoHmrg" name="AllergyObservationCodeP" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xSkVsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ie5sMH3sEeyivuDeOiJBMg" name="AllergyObservationCodeP" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ie5sMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xSiggF9xEey5t-mahoHmrg" name="AllergyObservationCode" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xSiggV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ie4eEH3sEeyivuDeOiJBMg" name="AllergyObservationCode" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ie4eEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xTF6IF9xEey5t-mahoHmrg" name="AllergyObservationValueP" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xTF6IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IfY0YH3sEeyivuDeOiJBMg" name="AllergyObservationValueP" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IfY0YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (not self.value->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xSmK4F9xEey5t-mahoHmrg" name="AllergyObservationValue" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xSmK4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ie7hYH3sEeyivuDeOiJBMg" name="AllergyObservationValue" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ie7hYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '420134006' or value.code = '418038007' or value.code = '419511003' or value.code = '418471000' or value.code = '419199007' or value.code = '416098002' or value.code = '414285001' or value.code = '59037007' or value.code = '235719002' or value.code = '232347008' or value.code = '426232007')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xTp60F9xEey5t-mahoHmrg" name="AllergyObservationStatusCodeP" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xTp60V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_If9cIH3sEeyivuDeOiJBMg" name="AllergyObservationStatusCodeP" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_If9cIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xToFoF9xEey5t-mahoHmrg" name="AllergyObservationStatusCode" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xToFoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_If7m8H3sEeyivuDeOiJBMg" name="AllergyObservationStatusCode" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_If7m8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xTsXEF9xEey5t-mahoHmrg" name="AllergyObservationEffectiveTime" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xTsXEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_If_RUH3sEeyivuDeOiJBMg" name="AllergyObservationEffectiveTime" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_If_4YH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xUXFcF9xEey5t-mahoHmrg" name="AllergyObservation2AuthorParticipation" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xUXFcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IgluQH3sEeyivuDeOiJBMg" name="AllergyObservation2AuthorParticipation" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IgluQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xU1mkF9xEey5t-mahoHmrg" name="AllergyObservationAllergyStatusObservation" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xU1mkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ig_98H3sEeyivuDeOiJBMg" name="AllergyObservationAllergyStatusObservation" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ig_98X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y_Fh4F9xEey5t-mahoHmrg" name="AllergyObservationReactionObservation" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y_Fh4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J-ZJAH3sEeyivuDeOiJBMg" name="AllergyObservationReactionObservation" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J-ZJAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ReactionObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::MFST)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y_GI8F9xEey5t-mahoHmrg" name="AllergyObservationSeverityObservation" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y_GI8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J-ZwEH3sEeyivuDeOiJBMg" name="AllergyObservationSeverityObservation" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J-ZwEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SeverityObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zP0FgF9xEey5t-mahoHmrg" name="AllergyObservationParticipant" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zP0FgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KMhroH3sEeyivuDeOiJBMg" name="AllergyObservationParticipant" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KMhroX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->one(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4hNGoF9xEey5t-mahoHmrg" name="AllergyObservation2CriticalityObservation" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4hNGoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ox5UQH3sEeyivuDeOiJBMg" name="AllergyObservation2CriticalityObservation" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ox5UQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::CriticalityObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7vtqAF9xEey5t-mahoHmrg" name="AllergyObservation2IVLTSLow" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7vtqAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R6QzYH3sEeyivuDeOiJBMg" name="AllergyObservation2IVLTSLow" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R6QzYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((low.oclIsUndefined() or low.isNullFlavorUndefined()) implies (not low.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7vuREF9xEey5t-mahoHmrg" name="AllergyObservation2IVLTSHigh" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7vuREV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R6RacH3sEeyivuDeOiJBMg" name="AllergyObservation2IVLTSHigh" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R6RacX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((high.oclIsUndefined() or high.isNullFlavorUndefined()) implies (not high.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xKbgF9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xKbgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R7jM0H3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R7jM0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null).code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((originalText.oclIsUndefined() or originalText.isNullFlavorUndefined()) implies (true) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xKbgl9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntityCETranslation" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xKbg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R7jz4H3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntityCETranslation" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R7jz4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null).code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (true) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xLCkF9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xLCkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R7jz4n3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R7jz433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xLCkl9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntityAllergySpecificMedication" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xLCk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R7jz5H3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntityAllergySpecificMedication" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R7jz5X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xLClF9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntityAllergyClassMedication" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xLClV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R7jz5n3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntityAllergyClassMedication" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R7jz533sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xLpoF9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntityAllergyFoodOtherSubstance" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xLpoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R7ka8H3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntityAllergyFoodOtherSubstance" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R7ka8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xLpol9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntityReferenceValue" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xLpo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R7ka8n3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntityReferenceValue" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R7ka833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xLppF9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xLppV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R7ka9H3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R7ka9X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xMQsF9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntityCode" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xMQsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R7lCAH3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntityCode" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R7lCAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xMQsl9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRolePlayingEntity" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xMQs19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R7lCAn3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRolePlayingEntity" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R7lCA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null)->reject(playingEntity->one(playingEntity : cda::PlayingEntity | not playingEntity.oclIsUndefined() and playingEntity.oclIsKindOf(cda::PlayingEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xMQtF9xEey5t-mahoHmrg" name="AllergyObservationParticipantParticipantRole" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xMQtV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R7lCBH3sEeyivuDeOiJBMg" name="AllergyObservationParticipantParticipantRole" constrainedElement="_uVJogLj5EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R7lCBX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(participantRole->one(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(cda::ParticipantRole)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_uVNS4Lj5EeODDJAC5t5vpw" general="_2EaLUBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_xU2NoF9xEey5t-mahoHmrg" name="getConsolAllergyStatusObservations" bodyCondition="_xU2No19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xU2No19xEey5t-mahoHmrg" name="body" constrainedElement="_xU2NoF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xU2NpF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ig_98n3sEeyivuDeOiJBMg" name="getConsolAllergyStatusObservations" bodyCondition="_IhAlAH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_IhAlAH3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ig_98n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_IhAlAX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AllergyStatusObservation)).oclAsType(consol::AllergyStatusObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xU2NoV9xEey5t-mahoHmrg" type="_2FRuAhSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xU2Nol9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Ig_9833sEeyivuDeOiJBMg" type="_2FRuAhSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ig_99H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_y_Fh4l9xEey5t-mahoHmrg" name="getConsolReactionObservation2s" bodyCondition="_y_Fh5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_y_Fh5V9xEey5t-mahoHmrg" name="body" constrainedElement="_y_Fh4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_y_Fh5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_J-ZJAn3sEeyivuDeOiJBMg" name="getConsolReactionObservation2s" bodyCondition="_J-ZJBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_J-ZJBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_J-ZJAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_J-ZJBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ReactionObservation2)).oclAsType(consol::ReactionObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_y_Fh419xEey5t-mahoHmrg" type="_U3yosPDxEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y_Fh5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_J-ZJA33sEeyivuDeOiJBMg" type="_U3yosPDxEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J-ZJBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_y_GI8l9xEey5t-mahoHmrg" name="getConsolSeverityObservation2" bodyCondition="_y_GI9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_y_GI9V9xEey5t-mahoHmrg" name="body" constrainedElement="_y_GI8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_y_GI9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_J-aXIH3sEeyivuDeOiJBMg" name="getConsolSeverityObservation2" bodyCondition="_J-aXI33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_J-aXI33sEeyivuDeOiJBMg" name="body" constrainedElement="_J-aXIH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_J-aXJH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SeverityObservation2))->asSequence()->any(true).oclAsType(consol::SeverityObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_y_GI819xEey5t-mahoHmrg" type="_B0oKYPJdEeO2NaSiicarcg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y_GI9F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_J-aXIX3sEeyivuDeOiJBMg" type="_B0oKYPJdEeO2NaSiicarcg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J-aXIn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4hNGol9xEey5t-mahoHmrg" name="getCriticalityObservation" bodyCondition="_4hNGpV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4hNGpV9xEey5t-mahoHmrg" name="body" constrainedElement="_4hNGol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4hNGpl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ox5UQn3sEeyivuDeOiJBMg" name="getCriticalityObservation" bodyCondition="_Ox5URX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ox5URX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ox5UQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ox5URn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CriticalityObservation))->asSequence()->any(true).oclAsType(consol::CriticalityObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4hNGo19xEey5t-mahoHmrg" type="_LspMELDzEeafNo3UpQoAYw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4hNGpF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Ox5UQ33sEeyivuDeOiJBMg" type="_LspMELDzEeafNo3UpQoAYw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ox5URH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -27007,46 +27007,46 @@ value.code = 'completed')</body>
           <body>not self.code.oclIsUndefined() or not self.effectiveTime.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xU2NpV9xEey5t-mahoHmrg" name="MentalStatusOrganizer2TemplateId" constrainedElement="_6LYrULkoEeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xU20sF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IhAlAn3sEeyivuDeOiJBMg" name="MentalStatusOrganizer2TemplateId" constrainedElement="_6LYrULkoEeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IhAlA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.75' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xU4C0F9xEey5t-mahoHmrg" name="ResultOrganizerCode" constrainedElement="_6LYrULkoEeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xU4C0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IhCaMH3sEeyivuDeOiJBMg" name="ResultOrganizerCode" constrainedElement="_6LYrULkoEeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IhCaMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xU54AF9xEey5t-mahoHmrg" name="MentalStatusOrganizer2EffectiveTime" constrainedElement="_6LYrULkoEeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xU54AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IhEPYH3sEeyivuDeOiJBMg" name="MentalStatusOrganizer2EffectiveTime" constrainedElement="_6LYrULkoEeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IhEPYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zPR6AF9xEey5t-mahoHmrg" name="ResultOrganizerResultObservation" constrainedElement="_6LYrULkoEeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zPR6AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KMEYoH3sEeyivuDeOiJBMg" name="ResultOrganizerResultObservation" constrainedElement="_6LYrULkoEeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KMEYoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->exists(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::MentalStatusObservation2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xOs8F9xEey5t-mahoHmrg" name="MentalStatusOrganizer2CDCode" constrainedElement="_6LYrULkoEeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xOs8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R7neQH3sEeyivuDeOiJBMg" name="MentalStatusOrganizer2CDCode" constrainedElement="_6LYrULkoEeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R7neQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not code.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_6LYrUbkoEeODDJAC5t5vpw" general="_jfoCUOZbEeGINOJ_SD9_dA"/>
-      <ownedOperation xmi:id="_zPShEF9xEey5t-mahoHmrg" name="getConsolMentalStatusObservation2s" bodyCondition="_zPShE19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zPShE19xEey5t-mahoHmrg" name="body" constrainedElement="_zPShEF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zPShFF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KMEYon3sEeyivuDeOiJBMg" name="getConsolMentalStatusObservation2s" bodyCondition="_KMEYpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KMEYpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KMEYon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KMEYpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::MentalStatusObservation2)).oclAsType(consol::MentalStatusObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zPShEV9xEey5t-mahoHmrg" type="_ze150PitEeOXlK95I8tUew" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zPShEl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KMEYo33sEeyivuDeOiJBMg" type="_ze150PitEeOXlK95I8tUew" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KMEYpH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -27060,72 +27060,72 @@ value.code = 'completed')</body>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xU8UQF9xEey5t-mahoHmrg" name="CoverageActivity2TemplateId" constrainedElement="_aJr6ULkxEeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xU8UQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IhGroH3sEeyivuDeOiJBMg" name="CoverageActivity2TemplateId" constrainedElement="_aJr6ULkxEeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IhGroX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.60' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xU-wgF9xEey5t-mahoHmrg" name="CoverageActivityCodeP" constrainedElement="_aJr6ULkxEeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xU-wgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IhIg0H3sEeyivuDeOiJBMg" name="CoverageActivityCodeP" constrainedElement="_aJr6ULkxEeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IhJH4H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xU9iYF9xEey5t-mahoHmrg" name="CoverageActivityCode" constrainedElement="_aJr6ULkxEeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xU9iYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IhHSsH3sEeyivuDeOiJBMg" name="CoverageActivityCode" constrainedElement="_aJr6ULkxEeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IhHSsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '48768-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y_lRIF9xEey5t-mahoHmrg" name="CoverageActivityPolicyActivity" constrainedElement="_aJr6ULkxEeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y_lRIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J-5fUH3sEeyivuDeOiJBMg" name="CoverageActivityPolicyActivity" constrainedElement="_aJr6ULkxEeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J-5fUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3ZoakF9xEey5t-mahoHmrg" name="CoverageActivity2EntryRelationship" constrainedElement="_aJr6ULkxEeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3ZoakV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_N10GgH3sEeyivuDeOiJBMg" name="CoverageActivity2EntryRelationship" constrainedElement="_aJr6ULkxEeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_N10GgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.oclIsUndefined() and entryRelationship.oclIsKindOf(cda::EntryRelationship))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xucMF9xEey5t-mahoHmrg" name="CoverageActivity2EntryRelationshipINTValue" constrainedElement="_aJr6ULkxEeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xucMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R8MGAH3sEeyivuDeOiJBMg" name="CoverageActivity2EntryRelationshipINTValue" constrainedElement="_aJr6ULkxEeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R8MGAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null).sequenceNumber->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not value.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xvDQF9xEey5t-mahoHmrg" name="CoverageActivity2EntryRelationshipTypeCode" constrainedElement="_aJr6ULkxEeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xvDQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R8MtEH3sEeyivuDeOiJBMg" name="CoverageActivity2EntryRelationshipTypeCode" constrainedElement="_aJr6ULkxEeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R8MtEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->reject(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xvDQl9xEey5t-mahoHmrg" name="CoverageActivity2EntryRelationshipSequenceNumber" constrainedElement="_aJr6ULkxEeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xvDQ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R8MtEn3sEeyivuDeOiJBMg" name="CoverageActivity2EntryRelationshipSequenceNumber" constrainedElement="_aJr6ULkxEeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R8MtE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->reject((sequenceNumber.oclIsUndefined() or sequenceNumber.isNullFlavorUndefined()) implies (not sequenceNumber.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xvDRF9xEey5t-mahoHmrg" name="CoverageActivity2EntryRelationshipPolicyActivity2" constrainedElement="_aJr6ULkxEeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xvDRV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R8MtFH3sEeyivuDeOiJBMg" name="CoverageActivity2EntryRelationshipPolicyActivity2" constrainedElement="_aJr6ULkxEeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R8MtFX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->reject(act->one(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PolicyActivity2)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_aJr6UbkxEeODDJAC5t5vpw" general="_Cg3pkBUmEeGvPruliC3crg"/>
-      <ownedOperation xmi:id="_y_lRIl9xEey5t-mahoHmrg" name="getConsolPolicyActivity2s" bodyCondition="_y_lRJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_y_lRJV9xEey5t-mahoHmrg" name="body" constrainedElement="_y_lRIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_y_lRJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_J-6GYH3sEeyivuDeOiJBMg" name="getConsolPolicyActivity2s" bodyCondition="_J-6GY33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_J-6GY33sEeyivuDeOiJBMg" name="body" constrainedElement="_J-6GYH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_J-6GZH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PolicyActivity2)).oclAsType(consol::PolicyActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_y_lRI19xEey5t-mahoHmrg" type="_Q0ODkOwlEeOqa975IP2wug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y_lRJF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_J-6GYX3sEeyivuDeOiJBMg" type="_Q0ODkOwlEeOqa975IP2wug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J-6GYn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -27135,84 +27135,84 @@ value.code = '48768-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
 This template represents a &quot;snapshot in time&quot; observation, simply reflecting what the patient's current smoking status is at the time of the observation. As a result, the effectiveTime is constrained to a time stamp, and will approximately correspond with the author/time. Details regarding the time period when the patient is/was smoking would be recorded in the Tobacco Use template.&#xD;
 If the patient's current smoking status is unknown, the value element must be populated with SNOMED CT code 266927001 to communicate &quot;Unknown if ever smoked&quot; from the Current Smoking Status Value Set.</body>
       </ownedComment>
-      <ownedRule xmi:id="_xVDpAV9xEey5t-mahoHmrg" name="SmokingStatusMeaningfulUse2TemplateId" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xVEQEF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IhNZUH3sEeyivuDeOiJBMg" name="SmokingStatusMeaningfulUse2TemplateId" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IhNZUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.78' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xVFeMF9xEey5t-mahoHmrg" name="SmokingStatusMeaningfulUse2Id" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xVFeMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IhOncH3sEeyivuDeOiJBMg" name="SmokingStatusMeaningfulUse2Id" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IhOncX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xVH6cF9xEey5t-mahoHmrg" name="SmokingStatusObservationCodeP" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xVH6cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IhQcoH3sEeyivuDeOiJBMg" name="SmokingStatusObservationCodeP" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IhQcoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xVGFQF9xEey5t-mahoHmrg" name="SmokingStatusObservationCode" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xVGFQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IhPOgH3sEeyivuDeOiJBMg" name="SmokingStatusObservationCode" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IhPOgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '72166-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xVqF8F9xEey5t-mahoHmrg" name="SmokingStatusObservationValueP" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xVqF8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ihu9wH3sEeyivuDeOiJBMg" name="SmokingStatusObservationValueP" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ihu9wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (not self.value->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xVJIkF9xEey5t-mahoHmrg" name="SmokingStatusObservationValue" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xVJIkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IhRqwH3sEeyivuDeOiJBMg" name="SmokingStatusObservationValue" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IhRqwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '449868002' or value.code = '428041000124106' or value.code = '8517006' or value.code = '266919005' or value.code = '77176002' or value.code = '266927001' or value.code = '428071000124103' or value.code = '428061000124105')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xWLqYF9xEey5t-mahoHmrg" name="SmokingStatusObservationEffectiveTime" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xWLqYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IiLCoH3sEeyivuDeOiJBMg" name="SmokingStatusObservationEffectiveTime" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IiLCoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xW5cEF9xEey5t-mahoHmrg" name="SmokingStatusMeaningfulUse2AuthorParticipation" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xW5cEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IioVoH3sEeyivuDeOiJBMg" name="SmokingStatusMeaningfulUse2AuthorParticipation" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IioVoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xxfgF9xEey5t-mahoHmrg" name="SmokingStatusMeaningfulUse2CDCodeTermAssertionOrLoinc" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xxfgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R8OiQH3sEeyivuDeOiJBMg" name="SmokingStatusMeaningfulUse2CDCodeTermAssertionOrLoinc" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R8OiQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xxfgl9xEey5t-mahoHmrg" name="SmokingStatusObservationIVLTSCenter" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xxfg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R8PJUH3sEeyivuDeOiJBMg" name="SmokingStatusObservationIVLTSCenter" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R8PJUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (center.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xyGkF9xEey5t-mahoHmrg" name="SmokingStatusObservationIVLTSHigh" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xyGkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R8PJUn3sEeyivuDeOiJBMg" name="SmokingStatusObservationIVLTSHigh" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R8PJU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (high.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xyGkl9xEey5t-mahoHmrg" name="SmokingStatusObservationIVLTSLow" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xyGk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R8PJVH3sEeyivuDeOiJBMg" name="SmokingStatusObservationIVLTSLow" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R8PJVX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (low.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xytoF9xEey5t-mahoHmrg" name="SmokingStatusObservationIVLTSWidth" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xytoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R8PwYH3sEeyivuDeOiJBMg" name="SmokingStatusObservationIVLTSWidth" constrainedElement="_Hl3ScLk0EeODDJAC5t5vpw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R8PwYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (width.oclIsUndefined() )))</body>
         </specification>
@@ -27223,42 +27223,42 @@ value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '449868002' or val
       <ownedComment xmi:id="_A79IEL87EeOS5KuvmCHHew">
         <body>This template represents the observation that a patient has died. It also represents the cause of death, indicated by an entryRelationship type of 'CAUS'. This template allows for more specific representation of data than is available with the use of dischargeDispositionCode.</body>
       </ownedComment>
-      <ownedRule xmi:id="_xW6DIF9xEey5t-mahoHmrg" name="DeceasedObservation2TemplateId" constrainedElement="_4iF6IL86EeOS5KuvmCHHew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xW6DIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IioVon3sEeyivuDeOiJBMg" name="DeceasedObservation2TemplateId" constrainedElement="_4iF6IL86EeOS5KuvmCHHew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IioVo33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.79' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xW8fYF9xEey5t-mahoHmrg" name="DeceasedObservationCodeP" constrainedElement="_4iF6IL86EeOS5KuvmCHHew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xW8fYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Iiqx4H3sEeyivuDeOiJBMg" name="DeceasedObservationCodeP" constrainedElement="_4iF6IL86EeOS5KuvmCHHew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Iiqx4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xW6qMV9xEey5t-mahoHmrg" name="DeceasedObservationCode" constrainedElement="_4iF6IL86EeOS5KuvmCHHew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xW7RQF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IipjwH3sEeyivuDeOiJBMg" name="DeceasedObservationCode" constrainedElement="_4iF6IL86EeOS5KuvmCHHew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IipjwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zAFAYF9xEey5t-mahoHmrg" name="DeceasedObservationProblemObservation" constrainedElement="_4iF6IL86EeOS5KuvmCHHew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zAFAYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J_ZOkH3sEeyivuDeOiJBMg" name="DeceasedObservationProblemObservation" constrainedElement="_4iF6IL86EeOS5KuvmCHHew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J_ZOkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::CAUS)</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_4iIWYL86EeOS5KuvmCHHew" general="_lm3boOZbEeGINOJ_SD9_dA"/>
-      <ownedOperation xmi:id="_zAFAYl9xEey5t-mahoHmrg" name="getConsolProblemObservation2" bodyCondition="_zAFAZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zAFAZV9xEey5t-mahoHmrg" name="body" constrainedElement="_zAFAYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zAFAZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_J_Z1oH3sEeyivuDeOiJBMg" name="getConsolProblemObservation2" bodyCondition="_J_Z1o33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_J_Z1o33sEeyivuDeOiJBMg" name="body" constrainedElement="_J_Z1oH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_J_Z1pH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation2))->asSequence()->any(true).oclAsType(consol::ProblemObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zAFAY19xEey5t-mahoHmrg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zAFAZF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_J_Z1oX3sEeyivuDeOiJBMg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J_Z1on3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -27266,70 +27266,70 @@ value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
       <ownedComment xmi:id="_QIz30MykEeO93sHu8pHB2g">
         <body>This template represents medications that the patient is intended to take (or stop) after discharge.</body>
       </ownedComment>
-      <ownedRule xmi:id="_xW9tgF9xEey5t-mahoHmrg" name="DischargeMedication2TemplateId" constrainedElement="_EIeu8MyjEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xW9tgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IisAAH3sEeyivuDeOiJBMg" name="DischargeMedication2TemplateId" constrainedElement="_EIeu8MyjEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IisAAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.35' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xXAJwF9xEey5t-mahoHmrg" name="DischargeMedicationCodeP" constrainedElement="_EIeu8MyjEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xXAJwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IiucQH3sEeyivuDeOiJBMg" name="DischargeMedicationCodeP" constrainedElement="_EIeu8MyjEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IiucQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xW-7oF9xEey5t-mahoHmrg" name="DischargeMedicationCode" constrainedElement="_EIeu8MyjEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xW-7oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IisnEX3sEeyivuDeOiJBMg" name="DischargeMedicationCode" constrainedElement="_EIeu8MyjEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IisnEn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '10183-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xXBX4F9xEey5t-mahoHmrg" name="DischargeMedication2StatusCode" constrainedElement="_EIeu8MyjEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xXBX4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IivqYH3sEeyivuDeOiJBMg" name="DischargeMedication2StatusCode" constrainedElement="_EIeu8MyjEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IivqYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xXDNEF9xEey5t-mahoHmrg" name="DischargeMedication2StatusCodeP" constrainedElement="_EIeu8MyjEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xXDNEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Iiw4gH3sEeyivuDeOiJBMg" name="DischargeMedication2StatusCodeP" constrainedElement="_EIeu8MyjEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Iiw4gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zAkIkF9xEey5t-mahoHmrg" name="DischargeMedicationMedicationActivity" constrainedElement="_EIeu8MyjEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zAkIkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J_16gH3sEeyivuDeOiJBMg" name="DischargeMedicationMedicationActivity" constrainedElement="_EIeu8MyjEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J_16gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::MedicationActivity2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xzUsF9xEey5t-mahoHmrg" name="DischargeMedication2CDTranslation" constrainedElement="_EIeu8MyjEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xz7wF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R8Q-gH3sEeyivuDeOiJBMg" name="DischargeMedication2CDTranslation" constrainedElement="_EIeu8MyjEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R8Q-gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->size() = 1 and translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.code = '75311-1' and value.codeSystem = '2.16.840.1.113883.6.1')) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7xz7wV9xEey5t-mahoHmrg" name="DischargeMedication2CDTranslationP" constrainedElement="_EIeu8MyjEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7xz7wl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R8Q-gn3sEeyivuDeOiJBMg" name="DischargeMedication2CDTranslationP" constrainedElement="_EIeu8MyjEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R8Q-g33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->size() =  1) )))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_EIhLMMyjEeO93sHu8pHB2g" general="_hD-z0CUPEeGiOPpZVnfEJA"/>
-      <ownedOperation xmi:id="_zAkIkl9xEey5t-mahoHmrg" name="getConsolMedicationActivity2s" bodyCondition="_zAkIlV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zAkIlV9xEey5t-mahoHmrg" name="body" constrainedElement="_zAkIkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zAkIll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_J_16gn3sEeyivuDeOiJBMg" name="getConsolMedicationActivity2s" bodyCondition="_J_16hX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_J_16hX3sEeyivuDeOiJBMg" name="body" constrainedElement="_J_16gn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_J_16hn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity2)).oclAsType(consol::MedicationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zAkIk19xEey5t-mahoHmrg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zAkIlF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_J_16g33sEeyivuDeOiJBMg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J_16hH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -27343,114 +27343,114 @@ value.code = '75311-1' and value.codeSystem = '2.16.840.1.113883.6.1')) )))</bod
           <body>(self.sDTCDischargeDispositionCode->isEmpty() or self.sDTCDischargeDispositionCode->exists(element | element.isNullFlavorUndefined())) implies (self.sDTCDischargeDispositionCode->forAll( element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CE) and let value : datatypes::CE = element.oclAsType(datatypes::CE) in (value.codeSystem = '2.16.840.1.113883.6.301.5' or value.codeSystem = '2.16.840.1.113883.12.112') and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xXGQYF9xEey5t-mahoHmrg" name="EncounterActivity2TemplateId" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xXGQYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IizUwH3sEeyivuDeOiJBMg" name="EncounterActivity2TemplateId" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IizUwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.49' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xXHegF9xEey5t-mahoHmrg" name="EncounterActivitiesCode" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xXHegV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ii0i4H3sEeyivuDeOiJBMg" name="EncounterActivitiesCode" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ii0i4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.12' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xXob4F9xEey5t-mahoHmrg" name="EncounterActivitiesCodeP" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xXob4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IjQnwH3sEeyivuDeOiJBMg" name="EncounterActivitiesCodeP" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IjQnwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xYIyMF9xEey5t-mahoHmrg" name="EncounterActivitiesSDTCDischargeDispositionCode" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xYIyMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IjtTsH3sEeyivuDeOiJBMg" name="EncounterActivitiesSDTCDischargeDispositionCode" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IjtTsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.sDTCDischargeDispositionCode->isEmpty() or self.sDTCDischargeDispositionCode->exists(element | element.isNullFlavorUndefined())) implies (not self.sDTCDischargeDispositionCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zBeukF9xEey5t-mahoHmrg" name="EncounterActivitiesIndication" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zBeukV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KAroAH3sEeyivuDeOiJBMg" name="EncounterActivitiesIndication" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KAroAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zB-d0F9xEey5t-mahoHmrg" name="EncounterActivitiesEncounterDiagnosis" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zB-d0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KBHF0H3sEeyivuDeOiJBMg" name="EncounterActivitiesEncounterDiagnosis" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KBHF0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EncounterDiagnosis2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3apuQF9xEey5t-mahoHmrg" name="EncounterActivitiesServiceDeliveryLocation" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3apuQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_N2qbEH3sEeyivuDeOiJBMg" name="EncounterActivitiesServiceDeliveryLocation" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_N2qbEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant2 | not participant.participantRole.oclIsUndefined() and participant.participantRole.oclIsKindOf(consol::ServiceDeliveryLocation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3bKroF9xEey5t-mahoHmrg" name="EncounterActivitiesEncounterPerformer" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3bKroV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_N3FR0H3sEeyivuDeOiJBMg" name="EncounterActivitiesEncounterPerformer" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_N3F44H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->exists(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7yUSEF9xEey5t-mahoHmrg" name="EncounterActivity2CDTranslation" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7yUSEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R8vfoH3sEeyivuDeOiJBMg" name="EncounterActivity2CDTranslation" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R8vfoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (( not translation->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7zR7YF9xEey5t-mahoHmrg" name="EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCodeP" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7zR7YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R9qssH3sEeyivuDeOiJBMg" name="EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCodeP" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R9qssX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7zSicF9xEey5t-mahoHmrg" name="EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCode" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7zSicV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R9qssn3sEeyivuDeOiJBMg" name="EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCode" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R9qss33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7zSicl9xEey5t-mahoHmrg" name="EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntity" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7zSic19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R9qstH3sEeyivuDeOiJBMg" name="EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntity" constrainedElement="_RGU34MzDEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R9qstX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_RGVe8MzDEeO93sHu8pHB2g" general="_2LayQBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_zBeukl9xEey5t-mahoHmrg" name="getConsolIndication2s" bodyCondition="_zBeulV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zBeulV9xEey5t-mahoHmrg" name="body" constrainedElement="_zBeukl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zBeull9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KAroAn3sEeyivuDeOiJBMg" name="getConsolIndication2s" bodyCondition="_KAroBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KAroBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KAroAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KAroBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication2)).oclAsType(consol::Indication2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zBeuk19xEey5t-mahoHmrg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zBeulF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KAroA33sEeyivuDeOiJBMg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KAroBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zB-d0l9xEey5t-mahoHmrg" name="getConsolEncounterDiagnosis2s" bodyCondition="_zB-d1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zB-d1V9xEey5t-mahoHmrg" name="body" constrainedElement="_zB-d0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zB-d1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KBHF0n3sEeyivuDeOiJBMg" name="getConsolEncounterDiagnosis2s" bodyCondition="_KBHF1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KBHF1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_KBHF0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KBHF1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::EncounterDiagnosis2)).oclAsType(consol::EncounterDiagnosis2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zB-d019xEey5t-mahoHmrg" type="_jH6CcMzNEeO93sHu8pHB2g" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zB-d1F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KBHF033sEeyivuDeOiJBMg" type="_jH6CcMzNEeO93sHu8pHB2g" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KBHF1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3apuQl9xEey5t-mahoHmrg" name="getConsolServiceDeliveryLocations" bodyCondition="_3apuRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3apuRV9xEey5t-mahoHmrg" name="body" constrainedElement="_3apuQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3apuRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_N2rCIH3sEeyivuDeOiJBMg" name="getConsolServiceDeliveryLocations" bodyCondition="_N2rCI33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_N2rCI33sEeyivuDeOiJBMg" name="body" constrainedElement="_N2rCIH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_N2rCJH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getParticipantRoles()->select(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(consol::ServiceDeliveryLocation)).oclAsType(consol::ServiceDeliveryLocation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3apuQ19xEey5t-mahoHmrg" type="_2LiHABSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3apuRF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_N2rCIX3sEeyivuDeOiJBMg" type="_2LiHABSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_N2rCIn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -27458,42 +27458,42 @@ value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()
       <ownedComment xmi:id="_JPYv0MzOEeO93sHu8pHB2g">
         <body>This template wraps relevant problems or diagnoses at the close of a visit or that need to be followed after the visit. If the encounter is associated with a Hospital Discharge, the Hospital Discharge Diagnosis must be used. This entry requires at least one Problem Observation entry.</body>
       </ownedComment>
-      <ownedRule xmi:id="_xZNJMF9xEey5t-mahoHmrg" name="EncounterDiagnosis2TemplateId" constrainedElement="_jH6CcMzNEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xZNJMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IkrkEX3sEeyivuDeOiJBMg" name="EncounterDiagnosis2TemplateId" constrainedElement="_jH6CcMzNEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IksLIH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.80' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xZPlcF9xEey5t-mahoHmrg" name="EncounterDiagnosisCodeP" constrainedElement="_jH6CcMzNEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xZPlcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IkuAUH3sEeyivuDeOiJBMg" name="EncounterDiagnosisCodeP" constrainedElement="_jH6CcMzNEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IkuAUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xZNwQV9xEey5t-mahoHmrg" name="EncounterDiagnosisCode" constrainedElement="_jH6CcMzNEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xZOXUF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IksyMH3sEeyivuDeOiJBMg" name="EncounterDiagnosisCode" constrainedElement="_jH6CcMzNEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IksyMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '29308-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zBCCoF9xEey5t-mahoHmrg" name="EncounterDiagnosisProblemObservation" constrainedElement="_jH6CcMzNEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zBCCoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KAQxQH3sEeyivuDeOiJBMg" name="EncounterDiagnosisProblemObservation" constrainedElement="_jH6CcMzNEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KAQxQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_jH6CcczNEeO93sHu8pHB2g" general="_Ker6MOM2EeGfv4R-kzpM0g"/>
-      <ownedOperation xmi:id="_zBCCol9xEey5t-mahoHmrg" name="getConsolProblemObservation2s" bodyCondition="_zBCCpV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zBCCpV9xEey5t-mahoHmrg" name="body" constrainedElement="_zBCCol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zBCCpl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KAQxQn3sEeyivuDeOiJBMg" name="getConsolProblemObservation2s" bodyCondition="_KAQxRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KAQxRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KAQxQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KAQxRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation2)).oclAsType(consol::ProblemObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zBCCo19xEey5t-mahoHmrg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zBCCpF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KAQxQ33sEeyivuDeOiJBMg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KAQxRH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -27513,96 +27513,96 @@ value.code = '29308-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xZQzkF9xEey5t-mahoHmrg" name="FunctionalStatusObservation2TemplateId" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xZQzkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IkvOcH3sEeyivuDeOiJBMg" name="FunctionalStatusObservation2TemplateId" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IkvOcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.67' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xZUd8F9xEey5t-mahoHmrg" name="ResultObservationCodeP" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xZUd8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Iky40H3sEeyivuDeOiJBMg" name="ResultObservationCodeP" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Iky40X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xZSowF9xEey5t-mahoHmrg" name="ResultObservationCode" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xZSowV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IkxDoH3sEeyivuDeOiJBMg" name="ResultObservationCode" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IkxDoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '54522-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xZWTIF9xEey5t-mahoHmrg" name="ResultObservationText" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xZWTIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ik0G8H3sEeyivuDeOiJBMg" name="ResultObservationText" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ik0uAH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xZYIUF9xEey5t-mahoHmrg" name="ResultObservationInterpretationCode" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xZYIUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ik18IH3sEeyivuDeOiJBMg" name="ResultObservationInterpretationCode" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ik18IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.interpretationCode->isEmpty() or self.interpretationCode->exists(element | element.isNullFlavorUndefined())) implies (true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xZakkF9xEey5t-mahoHmrg" name="ResultObservationMethodCode" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xZakkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ik3xUH3sEeyivuDeOiJBMg" name="ResultObservationMethodCode" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ik3xUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.methodCode->isEmpty() or self.methodCode->exists(element | element.isNullFlavorUndefined())) implies (true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xZdA0F9xEey5t-mahoHmrg" name="ResultObservationTargetSiteCode" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xZdA0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ik60oH3sEeyivuDeOiJBMg" name="ResultObservationTargetSiteCode" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ik60oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xZ8wEF9xEey5t-mahoHmrg" name="FunctionalStatusResultObservationReferenceRange" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xZ9XIF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IlZVwH3sEeyivuDeOiJBMg" name="FunctionalStatusResultObservationReferenceRange" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IlZVwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->exists(referenceRange : cda::ReferenceRange | not referenceRange.oclIsUndefined() and referenceRange.oclIsKindOf(cda::ReferenceRange))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xa7ngF9xEey5t-mahoHmrg" name="FunctionalStatusResultObservationAuthor" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xa7ngV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ImSGkH3sEeyivuDeOiJBMg" name="FunctionalStatusResultObservationAuthor" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ImSGkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xbavsF9xEey5t-mahoHmrg" name="FunctionalStatusObservation2AuthorParticipation" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xbbWwF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ims9UH3sEeyivuDeOiJBMg" name="FunctionalStatusObservation2AuthorParticipation" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ims9UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zCaisF9xEey5t-mahoHmrg" name="FunctionalStatusResultObservationNonMedicinalSupplyActivity" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zCaisV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KBijoH3sEeyivuDeOiJBMg" name="FunctionalStatusResultObservationNonMedicinalSupplyActivity" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KBijoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::NonMedicinalSupplyActivity2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_70SA8F9xEey5t-mahoHmrg" name="FunctionalStatusResultObservationReferenceRangeObservationRangeNoCode" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_70SA8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R-iPYH3sEeyivuDeOiJBMg" name="FunctionalStatusResultObservationReferenceRangeObservationRangeNoCode" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R-iPYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->excluding(null).observationRange->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_70SA8l9xEey5t-mahoHmrg" name="FunctionalStatusResultObservationReferenceRangeObservationRange" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_70SA819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R-i2cH3sEeyivuDeOiJBMg" name="FunctionalStatusResultObservationReferenceRangeObservationRange" constrainedElement="_3WqogMzSEeO93sHu8pHB2g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R-i2cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_3WqogczSEeO93sHu8pHB2g" general="_viRU0OZbEeGINOJ_SD9_dA"/>
-      <ownedOperation xmi:id="_zCaisl9xEey5t-mahoHmrg" name="getConsolNonMedicinalSupplyActivity2" bodyCondition="_zCaitV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zCaitV9xEey5t-mahoHmrg" name="body" constrainedElement="_zCaisl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zCaitl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KBijon3sEeyivuDeOiJBMg" name="getConsolNonMedicinalSupplyActivity2" bodyCondition="_KBjKsX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KBjKsX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KBijon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KBjKsn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::NonMedicinalSupplyActivity2))->asSequence()->any(true).oclAsType(consol::NonMedicinalSupplyActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zCais19xEey5t-mahoHmrg" type="_k_C20OaCEeOmzetP5oaH3A" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zCaitF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_KBijo33sEeyivuDeOiJBMg" type="_k_C20OaCEeOmzetP5oaH3A" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KBjKsH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -27628,170 +27628,170 @@ value.code = '54522-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>self.entryRelationship->select(er : cda::EntryRelationship | er.observation.oclIsTypeOf(consol::SeverityObservation))->forAll(ent : cda::EntryRelationship | ent.inversionInd=true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xbbWwV9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationTemplateId" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xbbWwl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ims9Un3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationTemplateId" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ims9U33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.24.3.90')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xbdL8F9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationClassCode" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xbdL8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ImuygH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationClassCode" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ImuygX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xbfBIF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationMoodCode" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xbfBIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ImwAoH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationMoodCode" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ImwAoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xbgPQF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationId" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xbgPQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ImxOwH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationId" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ImxOwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xbirgF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationCodeP" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xbirgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ImzD8H3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationCodeP" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ImzD8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xbhdYF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationCode" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xbhdYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Imyc4H3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationCode" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Imyc4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xbjSkF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationStatusCode" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xbjSkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Im0SEH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationStatusCode" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Im0SEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xbkgsF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationStatusCodeP" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xbkgsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Im1gMH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationStatusCodeP" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Im1gMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xblu0F9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationEffectiveTime" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xblu0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Im2uUH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationEffectiveTime" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Im3VYH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xbm88F9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationValue" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xbm88V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Im38cH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationValue" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Im38cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '420134006' or value.code = '418038007' or value.code = '419511003' or value.code = '418471000' or value.code = '419199007' or value.code = '416098002' or value.code = '414285001' or value.code = '59037007' or value.code = '235719002' or value.code = '232347008' or value.code = '426232007')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xcE3AF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationValueP" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xcE3AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_InV2gH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationValueP" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_InV2gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xdHY0F9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationAllergyStatusObservation" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xdHY0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IoWjIH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationAllergyStatusObservation" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IoWjIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AllergyStatusObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xdnIEF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationReactionObservation" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xdnIEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ioz2IH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationReactionObservation" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ioz2IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ReactionObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::MFST)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xeEbEF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationSeverityObservation" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xeEbEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IpP7AH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationSeverityObservation" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IpP7AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SeverityObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xejjQF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipant" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xejjQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IpqxwH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipant" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IpqxwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_71zq8F9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_71zq8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R_6vcH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R_6vcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null).code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((originalText.oclIsUndefined() or originalText.isNullFlavorUndefined()) implies (not originalText.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_710SAF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCETranslation" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_710SAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R_7WgH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCETranslation" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R_7WgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null).code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (not translation->isEmpty()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_710SAl9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_710SA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R_7Wgn3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R_7Wg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(not code.originalText.reference.value.oclIsUndefined() implies not getSection().text.getText(code.originalText.reference.value.substring(2, code.originalText.reference.value.size())).oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_710SBF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityReferenceValue" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_710SBV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R_79kH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityReferenceValue" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R_79kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(not code.originalText.reference.oclIsUndefined() implies code.originalText.reference.value->size() = 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7105EF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7105EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R_79kn3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R_79k33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(not code.originalText.oclIsUndefined() implies not code.originalText.reference.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7105El9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCodeTerminologyValueSetGroupSRFI" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7105E19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R_8koH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCodeTerminologyValueSetGroupSRFI" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R_8koX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(( code.oclIsUndefined() or code.isNullFlavorUndefined() ) implies ( not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and ( ( let value : datatypes::CE = code.oclAsType(datatypes::CE) in value.codeSystem = '2.16.840.1.113883.3.26.1.5' and not value.code.oclIsUndefined() ) or ( let value : datatypes::CE = code.oclAsType(datatypes::CE) in value.codeSystem = '2.16.840.1.113883.6.88' and not value.code.oclIsUndefined() ) or ( let value : datatypes::CE = code.oclAsType(datatypes::CE) in value.codeSystem = '2.16.840.1.113883.4.9' and not value.code.oclIsUndefined() ) or ( let value : datatypes::CE = code.oclAsType(datatypes::CE) in value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined() ) ) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7105FF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityClassCode" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7105FV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R_8kon3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityClassCode" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R_9LsH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(isDefined('classCode') and classCode=vocab::EntityClassRoot::MMAT)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_711gIF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCode" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_711gIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R_9LsX3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCode" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R_9Lsn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_711gIl9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRoleClassCode" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_711gI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R_9Ls33sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRoleClassCode" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R_9LtH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null)->reject(isDefined('classCode') and classCode=vocab::RoleClassRoot::MANU)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_711gJF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntity" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_711gJV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R_9ywH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntity" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R_9ywX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null)->reject(playingEntity->one(playingEntity : cda::PlayingEntity | not playingEntity.oclIsUndefined() and playingEntity.oclIsKindOf(cda::PlayingEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_712HMF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantTypeCode" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_712HMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R_9ywn3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantTypeCode" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R_9yw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(typeCode=vocab::ParticipationType::CSM)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_712HMl9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRole" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_712HM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R_9yxH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRole" constrainedElement="_mgny4NF8EeOHUokOVP95oQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R_9yxX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(participantRole->one(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(cda::ParticipantRole)))</body>
         </specification>
@@ -27799,37 +27799,37 @@ value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '420134006' or val
       <generalization xmi:id="_mgny6NF8EeOHUokOVP95oQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_bJyIQDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_xdHY0l9xEey5t-mahoHmrg" name="getAllergyStatusObservation" bodyCondition="_xdHY1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xdHY1V9xEey5t-mahoHmrg" name="body" constrainedElement="_xdHY0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xdHY1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_IoWjIn3sEeyivuDeOiJBMg" name="getAllergyStatusObservation" bodyCondition="_IoWjJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_IoWjJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_IoWjIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_IoWjJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AllergyStatusObservation))->asSequence()->any(true).oclAsType(consol::AllergyStatusObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xdHY019xEey5t-mahoHmrg" type="_2FRuAhSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xdHY1F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_IoWjI33sEeyivuDeOiJBMg" type="_2FRuAhSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IoWjJH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_xdnIEl9xEey5t-mahoHmrg" name="getReactionObservations" bodyCondition="_xdnIFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xdnIFV9xEey5t-mahoHmrg" name="body" constrainedElement="_xdnIEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xdnIFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ioz2In3sEeyivuDeOiJBMg" name="getReactionObservations" bodyCondition="_Ioz2JX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ioz2JX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ioz2In3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ioz2Jn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ReactionObservation)).oclAsType(consol::ReactionObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xdnIE19xEey5t-mahoHmrg" type="_2E_aIRSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xdnIFF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Ioz2I33sEeyivuDeOiJBMg" type="_2E_aIRSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ioz2JH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_xeEbEl9xEey5t-mahoHmrg" name="getSeverityObservation" bodyCondition="_xeEbFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xeEbFV9xEey5t-mahoHmrg" name="body" constrainedElement="_xeEbEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xeEbFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_IpP7An3sEeyivuDeOiJBMg" name="getSeverityObservation" bodyCondition="_IpP7BX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_IpP7BX3sEeyivuDeOiJBMg" name="body" constrainedElement="_IpP7An3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_IpP7Bn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SeverityObservation))->asSequence()->any(true).oclAsType(consol::SeverityObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xeEbE19xEey5t-mahoHmrg" type="_2FGu4hSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xeEbFF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_IpP7A33sEeyivuDeOiJBMg" type="_2FGu4hSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IpP7BH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -27843,71 +27843,71 @@ value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '420134006' or val
           <body>self.code.isNullFlavorDefined() or self.code.codeSystem = '2.16.840.1.113883.6.254' or self.code.codeSystem = '2.16.840.1.113883.6.1'</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xfhMkF9xEey5t-mahoHmrg" name="FunctionalStatusOrganizer2TemplateId" constrainedElement="_yU2tgOD0EeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xfhMkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IqhtYH3sEeyivuDeOiJBMg" name="FunctionalStatusOrganizer2TemplateId" constrainedElement="_yU2tgOD0EeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IqhtYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.66' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xfiasF9xEey5t-mahoHmrg" name="ResultOrganizerCode" constrainedElement="_yU2tgOD0EeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xfiasV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IqjikH3sEeyivuDeOiJBMg" name="ResultOrganizerCode" constrainedElement="_yU2tgOD0EeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IqjikX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xfleAF9xEey5t-mahoHmrg" name="ResultOrganizerStatusCodeP" constrainedElement="_yU2tgOD0EeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xfleAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Iqml4H3sEeyivuDeOiJBMg" name="ResultOrganizerStatusCodeP" constrainedElement="_yU2tgOD0EeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Iqml4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xfkP4F9xEey5t-mahoHmrg" name="ResultOrganizerStatusCode" constrainedElement="_yU2tgOD0EeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xfkP4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IqkwsH3sEeyivuDeOiJBMg" name="ResultOrganizerStatusCode" constrainedElement="_yU2tgOD0EeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IqkwsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xgD_IF9xEey5t-mahoHmrg" name="FunctionalStatusResultOrganizerFunctionalStatusResultObservation" constrainedElement="_yU2tgOD0EeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xgD_IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IrCDsH3sEeyivuDeOiJBMg" name="FunctionalStatusResultOrganizerFunctionalStatusResultObservation" constrainedElement="_yU2tgOD0EeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IrCDsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->exists(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::FunctionalStatusObservation2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xgh5MF9xEey5t-mahoHmrg" name="FunctionalStatusOrganizer2SelfCareActivities" constrainedElement="_yU2tgOD0EeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xgh5MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IrevoH3sEeyivuDeOiJBMg" name="FunctionalStatusOrganizer2SelfCareActivities" constrainedElement="_yU2tgOD0EeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IrevoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->exists(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::SelfCareActivities))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xhBocF9xEey5t-mahoHmrg" name="FunctionalStatusOrganizer2AuthorParticipation" constrainedElement="_yU2tgOD0EeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xhBocV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ir4_UH3sEeyivuDeOiJBMg" name="FunctionalStatusOrganizer2AuthorParticipation" constrainedElement="_yU2tgOD0EeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ir4_UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_yVKPgOD0EeOmBMTtnrPqww" general="_zBlUUOZbEeGINOJ_SD9_dA"/>
-      <ownedOperation xmi:id="_xgEmMF9xEey5t-mahoHmrg" name="getConsolFunctionalStatusObservation2s" bodyCondition="_xgEmM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xgEmM19xEey5t-mahoHmrg" name="body" constrainedElement="_xgEmMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xgEmNF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_IrCDsn3sEeyivuDeOiJBMg" name="getConsolFunctionalStatusObservation2s" bodyCondition="_IrCDtX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_IrCDtX3sEeyivuDeOiJBMg" name="body" constrainedElement="_IrCDsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_IrCDtn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::FunctionalStatusObservation2)).oclAsType(consol::FunctionalStatusObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xgEmMV9xEey5t-mahoHmrg" type="_3WqogMzSEeO93sHu8pHB2g" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xgEmMl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_IrCDs33sEeyivuDeOiJBMg" type="_3WqogMzSEeO93sHu8pHB2g" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IrCDtH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_xgh5Ml9xEey5t-mahoHmrg" name="getSelfCareActivitiess" bodyCondition="_xgh5NV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xgh5NV9xEey5t-mahoHmrg" name="body" constrainedElement="_xgh5Ml9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xgh5Nl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_IrfWsH3sEeyivuDeOiJBMg" name="getSelfCareActivitiess" bodyCondition="_IrfWs33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_IrfWs33sEeyivuDeOiJBMg" name="body" constrainedElement="_IrfWsH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_IrfWtH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SelfCareActivities)).oclAsType(consol::SelfCareActivities)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xgh5M19xEey5t-mahoHmrg" type="_nC0xUJmzEeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xgh5NF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_IrfWsX3sEeyivuDeOiJBMg" type="_nC0xUJmzEeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IrfWsn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -27933,46 +27933,46 @@ value.code = 'completed')</body>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xhBocl9xEey5t-mahoHmrg" name="HealthStatusObservation2TemplateId" constrainedElement="_DMvdYOEFEeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xhBoc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ir5mYH3sEeyivuDeOiJBMg" name="HealthStatusObservation2TemplateId" constrainedElement="_DMvdYOEFEeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ir5mYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.5' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xhEEsF9xEey5t-mahoHmrg" name="HealthStatusObservation2Id" constrainedElement="_DMvdYOEFEeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xhEEsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ir7bkH3sEeyivuDeOiJBMg" name="HealthStatusObservation2Id" constrainedElement="_DMvdYOEFEeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ir7bkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xhGg8F9xEey5t-mahoHmrg" name="HealthStatusObservationCodeP" constrainedElement="_DMvdYOEFEeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xhGg8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ir930H3sEeyivuDeOiJBMg" name="HealthStatusObservationCodeP" constrainedElement="_DMvdYOEFEeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ir930X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xhFS0F9xEey5t-mahoHmrg" name="HealthStatusObservationCode" constrainedElement="_DMvdYOEFEeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xhFS0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ir8CoH3sEeyivuDeOiJBMg" name="HealthStatusObservationCode" constrainedElement="_DMvdYOEFEeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ir8psH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '11323-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xhIWIF9xEey5t-mahoHmrg" name="HealthStatusObservationText" constrainedElement="_DMvdYOEFEeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xhIWIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ir_F8H3sEeyivuDeOiJBMg" name="HealthStatusObservationText" constrainedElement="_DMvdYOEFEeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ir_F8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xhKyYF9xEey5t-mahoHmrg" name="HealthStatusObservationStatusCodeP" constrainedElement="_DMvdYOEFEeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xhKyYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IsBiMH3sEeyivuDeOiJBMg" name="HealthStatusObservationStatusCodeP" constrainedElement="_DMvdYOEFEeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IsBiMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xhJkQF9xEey5t-mahoHmrg" name="HealthStatusObservationStatusCode" constrainedElement="_DMvdYOEFEeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xhJkQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IsAUEH3sEeyivuDeOiJBMg" name="HealthStatusObservationStatusCode" constrainedElement="_DMvdYOEFEeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IsAUEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
@@ -27985,42 +27985,42 @@ value.code = 'completed')</body>
       <ownedComment xmi:id="_XfoAYOEIEeOmBMTtnrPqww">
         <body>This template represents problems or diagnoses identified by the clinician at the time of the patient's admission.</body>
       </ownedComment>
-      <ownedRule xmi:id="_xhMAgF9xEey5t-mahoHmrg" name="HospitalAdmissionDiagnosis2TemplateId" constrainedElement="_GM6icOEIEeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xhMAgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IsCwUH3sEeyivuDeOiJBMg" name="HospitalAdmissionDiagnosis2TemplateId" constrainedElement="_GM6icOEIEeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IsCwUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.34' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xhOcwF9xEey5t-mahoHmrg" name="HospitalAdmissionDiagnosisCodeP" constrainedElement="_GM6icOEIEeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xhOcwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IsElgH3sEeyivuDeOiJBMg" name="HospitalAdmissionDiagnosisCodeP" constrainedElement="_GM6icOEIEeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IsElgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xhNOoF9xEey5t-mahoHmrg" name="HospitalAdmissionDiagnosisCode" constrainedElement="_GM6icOEIEeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xhNOoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IsDXYH3sEeyivuDeOiJBMg" name="HospitalAdmissionDiagnosisCode" constrainedElement="_GM6icOEIEeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IsDXYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '46241-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zC65AF9xEey5t-mahoHmrg" name="HospitalAdmissionDiagnosisProblemObservation" constrainedElement="_GM6icOEIEeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zC65AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KB-BcH3sEeyivuDeOiJBMg" name="HospitalAdmissionDiagnosisProblemObservation" constrainedElement="_GM6icOEIEeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KB-BcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_GM6iceEIEeOmBMTtnrPqww" general="_5K6mAEFHEeGorO80f-Cppg"/>
-      <ownedOperation xmi:id="_zC65Al9xEey5t-mahoHmrg" name="getConsolProblemObservation2s" bodyCondition="_zC7gEV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zC7gEV9xEey5t-mahoHmrg" name="body" constrainedElement="_zC65Al9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zC7gEl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KB-Bcn3sEeyivuDeOiJBMg" name="getConsolProblemObservation2s" bodyCondition="_KB-BdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KB-BdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KB-Bcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KB-Bdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation2)).oclAsType(consol::ProblemObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zC65A19xEey5t-mahoHmrg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zC7gEF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KB-Bc33sEeyivuDeOiJBMg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KB-BdH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -28028,42 +28028,42 @@ value.code = '46241-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_ao5hoOEMEeOmBMTtnrPqww">
         <body>This template represents problems or diagnoses present at the time of discharge which occurred during the hospitalization or need to be monitored after hospitalization. It requires at least one Problem Observation entry.</body>
       </ownedComment>
-      <ownedRule xmi:id="_xhPq4F9xEey5t-mahoHmrg" name="HospitalDischargeDiagnosis2TemplateId" constrainedElement="_Trd1cOEMEeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xhPq4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IsFMkH3sEeyivuDeOiJBMg" name="HospitalDischargeDiagnosis2TemplateId" constrainedElement="_Trd1cOEMEeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IsFzoH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.33' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xhSHIF9xEey5t-mahoHmrg" name="HospitalDischargeDiagnosisCodeP" constrainedElement="_Trd1cOEMEeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xhSHIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IsHo0H3sEeyivuDeOiJBMg" name="HospitalDischargeDiagnosisCodeP" constrainedElement="_Trd1cOEMEeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IsHo0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xhQ5AF9xEey5t-mahoHmrg" name="HospitalDischargeDiagnosisCode" constrainedElement="_Trd1cOEMEeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xhQ5AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IsGasH3sEeyivuDeOiJBMg" name="HospitalDischargeDiagnosisCode" constrainedElement="_Trd1cOEMEeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IsGasX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '11535-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zDZaIF9xEey5t-mahoHmrg" name="HospitalDischargeDiagnosisProblemObservation" constrainedElement="_Trd1cOEMEeOmBMTtnrPqww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zDZaIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KCYRIH3sEeyivuDeOiJBMg" name="HospitalDischargeDiagnosisProblemObservation" constrainedElement="_Trd1cOEMEeOmBMTtnrPqww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KCYRIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_Trd1ceEMEeOmBMTtnrPqww" general="_KtwVgCULEeGiOPpZVnfEJA"/>
-      <ownedOperation xmi:id="_zDZaIl9xEey5t-mahoHmrg" name="getConsolProblemObservation2s" bodyCondition="_zDZaJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zDZaJV9xEey5t-mahoHmrg" name="body" constrainedElement="_zDZaIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zDZaJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KCY4MH3sEeyivuDeOiJBMg" name="getConsolProblemObservation2s" bodyCondition="_KCY4M33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KCY4M33sEeyivuDeOiJBMg" name="body" constrainedElement="_KCY4MH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KCY4NH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation2)).oclAsType(consol::ProblemObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zDZaI19xEey5t-mahoHmrg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zDZaJF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KCY4MX3sEeyivuDeOiJBMg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KCY4Mn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -28114,182 +28114,182 @@ This information should be included in an Immunization Activity when available.
           <body>self.entryRelationship->select(er : cda::EntryRelationship | er.act.oclIsTypeOf(consol::Instruction2))->forAll(ent : cda::EntryRelationship | ent.inversionInd=true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xhTVQF9xEey5t-mahoHmrg" name="ImmunizationActivity2TemplateId" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xhTVQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IsIP4H3sEeyivuDeOiJBMg" name="ImmunizationActivity2TemplateId" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IsIP4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.52' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xhVKcF9xEey5t-mahoHmrg" name="ImmunizationActivityCode" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xhVKcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IsKFEH3sEeyivuDeOiJBMg" name="ImmunizationActivityCode" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IsKFEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xh3V8F9xEey5t-mahoHmrg" name="ImmunizationActivityStatusCodeP" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xh3V8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Isn_IH3sEeyivuDeOiJBMg" name="ImmunizationActivityStatusCodeP" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Isn_IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xhW_oF9xEey5t-mahoHmrg" name="ImmunizationActivityStatusCode" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xhW_oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IsLTMH3sEeyivuDeOiJBMg" name="ImmunizationActivityStatusCode" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IsLTMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'normal' or value.code = 'aborted' or value.code = 'active' or value.code = 'cancelled' or value.code = 'completed' or value.code = 'held' or value.code = 'new' or value.code = 'suspended' or value.code = 'nullified' or value.code = 'obsolete')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xiYTUF9xEey5t-mahoHmrg" name="ImmunizationActivityRepeatNumber" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xiYTUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ItI8gH3sEeyivuDeOiJBMg" name="ImmunizationActivityRepeatNumber" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ItI8gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.repeatNumber.oclIsUndefined() or self.repeatNumber.isNullFlavorUndefined()) implies (not self.repeatNumber.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xi53wF9xEey5t-mahoHmrg" name="ImmunizationActivityAdministrationUnitCodeP" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xi53wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ItpS0H3sEeyivuDeOiJBMg" name="ImmunizationActivityAdministrationUnitCodeP" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ItpS0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.administrationUnitCode.oclIsUndefined() or self.administrationUnitCode.isNullFlavorUndefined()) implies (not self.administrationUnitCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xiaIgF9xEey5t-mahoHmrg" name="ImmunizationActivityAdministrationUnitCode" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xiaIgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ItKxsH3sEeyivuDeOiJBMg" name="ImmunizationActivityAdministrationUnitCode" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ItKxsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.administrationUnitCode.oclIsUndefined() or self.administrationUnitCode.isNullFlavorUndefined()) implies (not self.administrationUnitCode.oclIsUndefined() and self.administrationUnitCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.administrationUnitCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.85' and (value.code = 'APPFUL' or value.code = 'DROP' or value.code = 'NDROP' or value.code = 'OPDROP' or value.code = 'ORDROP' or value.code = 'OTDROP' or value.code = 'PUFF' or value.code = 'SCOOP' or value.code = 'SPRY'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xjcDQF9xEey5t-mahoHmrg" name="ImmunizationActivityText" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xjcDQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IuEwoH3sEeyivuDeOiJBMg" name="ImmunizationActivityText" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IuEwoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xj7LcF9xEey5t-mahoHmrg" name="ImmunizationActivityRouteCodeP" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xj7LcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IugOcH3sEeyivuDeOiJBMg" name="ImmunizationActivityRouteCodeP" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IugOcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.routeCode.oclIsUndefined() or self.routeCode.isNullFlavorUndefined()) implies (not self.routeCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xjdRYF9xEey5t-mahoHmrg" name="ImmunizationActivityRouteCode" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xjdRYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IuF-wH3sEeyivuDeOiJBMg" name="ImmunizationActivityRouteCode" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IuF-wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.routeCode.oclIsUndefined() or self.routeCode.isNullFlavorUndefined()) implies (not self.routeCode.oclIsUndefined() and self.routeCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.routeCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.3.26.1.1' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xl3sMF9xEey5t-mahoHmrg" name="ImmunizationActivity2AuthorParticipation" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xl3sMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IwQh8H3sEeyivuDeOiJBMg" name="ImmunizationActivity2AuthorParticipation" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IwQh8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xmW0YF9xEey5t-mahoHmrg" name="ImmunizationActivityDrugVehicle" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xmW0YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IwrYsH3sEeyivuDeOiJBMg" name="ImmunizationActivityDrugVehicle" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IwrYsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant2 | not participant.participantRole.oclIsUndefined() and participant.participantRole.oclIsKindOf(consol::DrugVehicle))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zD6XgF9xEey5t-mahoHmrg" name="ImmunizationActivityIndication" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zD6XgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KCzu8H3sEeyivuDeOiJBMg" name="ImmunizationActivityIndication" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KCzu8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zEaGwF9xEey5t-mahoHmrg" name="ImmunizationActivityMedicationSupplyOrder" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zEaGwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KDRB8H3sEeyivuDeOiJBMg" name="ImmunizationActivityMedicationSupplyOrder" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KDRB8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::MedicationSupplyOrder2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zE7EIF9xEey5t-mahoHmrg" name="ImmunizationActivityMedicationDispense" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zE7EIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KDsfwH3sEeyivuDeOiJBMg" name="ImmunizationActivityMedicationDispense" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KDsfwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::MedicationDispense2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zFcBgF9xEey5t-mahoHmrg" name="ImmunizationActivityReactionObservation" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zFcBgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KEGIYH3sEeyivuDeOiJBMg" name="ImmunizationActivityReactionObservation" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KEGIYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ReactionObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::CAUS)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zF-0EF9xEey5t-mahoHmrg" name="ImmunizationActivityInstructions" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zF-0EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KEg_IH3sEeyivuDeOiJBMg" name="ImmunizationActivityInstructions" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KEg_IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instruction2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zGgYgF9xEey5t-mahoHmrg" name="ImmunizationActivityConsumable" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zGgYgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KE8c8H3sEeyivuDeOiJBMg" name="ImmunizationActivityConsumable" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KE8c8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.consumable->one(consumable : cda::Consumable | not consumable.oclIsUndefined() and consumable.oclIsKindOf(cda::Consumable))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_24ZVwF9xEey5t-mahoHmrg" name="ImmunizationActivityPrecondition" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_24ZVwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NZKmwH3sEeyivuDeOiJBMg" name="ImmunizationActivityPrecondition" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NZKmwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.precondition->exists(precondition : cda::Precondition | not precondition.oclIsUndefined() and precondition.oclIsKindOf(cda::Precondition))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3bsQEF9xEey5t-mahoHmrg" name="ImmunizationActivity2EntryRelationshipForSubAdminAct" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3bsQEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_N3ndUH3sEeyivuDeOiJBMg" name="ImmunizationActivity2EntryRelationshipForSubAdminAct" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_N3ndUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->select(entryRelationship : cda::EntryRelationship | not entryRelationship.oclIsUndefined() and entryRelationship.oclIsKindOf(cda::EntryRelationship))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP)->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7138YF9xEey5t-mahoHmrg" name="ImmunizationActivity2EntryRelationshipTypeCode" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7138YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_R__n8H3sEeyivuDeOiJBMg" name="ImmunizationActivity2EntryRelationshipTypeCode" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R__n8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP)->reject(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7138Yl9xEey5t-mahoHmrg" name="ImmunizationActivity2EntryRelationshipInversionInd" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7138Y19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SAAPAH3sEeyivuDeOiJBMg" name="ImmunizationActivity2EntryRelationshipInversionInd" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SAAPAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP)->reject(not inversionInd.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7138ZF9xEey5t-mahoHmrg" name="ImmunizationActivity2EntryRelationshipSequenceNumber" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7138ZV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SAAPAn3sEeyivuDeOiJBMg" name="ImmunizationActivity2EntryRelationshipSequenceNumber" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SAAPA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP)->reject((sequenceNumber.oclIsUndefined() or sequenceNumber.isNullFlavorUndefined()) implies (not sequenceNumber.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_714jcF9xEey5t-mahoHmrg" name="ImmunizationActivity2EntryRelationshipSubstanceAdministeredAct" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_714jcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SAA2EH3sEeyivuDeOiJBMg" name="ImmunizationActivity2EntryRelationshipSubstanceAdministeredAct" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SAA2EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::COMP)->reject(act->one(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::SubstanceAdministeredAct)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_72VPYF9xEey5t-mahoHmrg" name="ImmunizationActivityConsumableImmunizationMedicationInformation" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_72VPYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SAhMYH3sEeyivuDeOiJBMg" name="ImmunizationActivityConsumableImmunizationMedicationInformation" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SAhMYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.consumable->excluding(null)->reject(manufacturedProduct->one(manufacturedProduct : cda::ManufacturedProduct | not manufacturedProduct.oclIsUndefined() and manufacturedProduct.oclIsKindOf(consol::ImmunizationMedicationInformation2)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_720-oF9xEey5t-mahoHmrg" name="ImmunizationActivityPreconditionTypeCode" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_720-oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SA_GcH3sEeyivuDeOiJBMg" name="ImmunizationActivityPreconditionTypeCode" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SA_GcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.precondition->excluding(null)->reject(typeCode=vocab::ActRelationshipType::PRCN)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_720-ol9xEey5t-mahoHmrg" name="ImmunizationActivityPreconditionPreconditionForSubstanceAdministration" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_720-o19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SA_tgH3sEeyivuDeOiJBMg" name="ImmunizationActivityPreconditionPreconditionForSubstanceAdministration" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SA_tgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.precondition->excluding(null)->reject(criterion->one(criterion : cda::Criterion | not criterion.oclIsUndefined() and criterion.oclIsKindOf(consol::PreconditionForSubstanceAdministration2)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_73S4sF9xEey5t-mahoHmrg" name="ImmunizationActivity2CETranslationP" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_73S4sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SBdnkH3sEeyivuDeOiJBMg" name="ImmunizationActivity2CETranslationP" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SBdnkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.routeCode->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (not translation->isEmpty()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_73S4sl9xEey5t-mahoHmrg" name="ImmunizationActivity2CETranslation" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_73S4s19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SBeOoH3sEeyivuDeOiJBMg" name="ImmunizationActivity2CETranslation" constrainedElement="_zI6vcOE7EeOTq9XEMvvkWw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SBeOoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.routeCode->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
@@ -28297,70 +28297,70 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
         </specification>
       </ownedRule>
       <generalization xmi:id="_zI_A4OE7EeOTq9XEMvvkWw" general="_2MAoIBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_xmXbcF9xEey5t-mahoHmrg" name="getConsolDrugVehicles" bodyCondition="_xmXbc19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xmXbc19xEey5t-mahoHmrg" name="body" constrainedElement="_xmXbcF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xmXbdF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Iwr_wH3sEeyivuDeOiJBMg" name="getConsolDrugVehicles" bodyCondition="_Iwr_w33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Iwr_w33sEeyivuDeOiJBMg" name="body" constrainedElement="_Iwr_wH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Iwr_xH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getParticipantRoles()->select(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(consol::DrugVehicle)).oclAsType(consol::DrugVehicle)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xmXbcV9xEey5t-mahoHmrg" type="_VBXq8BUTEeG6PvUxSTZnaw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xmXbcl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Iwr_wX3sEeyivuDeOiJBMg" type="_VBXq8BUTEeG6PvUxSTZnaw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Iwr_wn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zD6Xgl9xEey5t-mahoHmrg" name="getConsolIndication2s" bodyCondition="_zD6XhV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zD6XhV9xEey5t-mahoHmrg" name="body" constrainedElement="_zD6Xgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zD6Xhl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KCzu8n3sEeyivuDeOiJBMg" name="getConsolIndication2s" bodyCondition="_KCzu9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KCzu9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_KCzu8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KCzu9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication2)).oclAsType(consol::Indication2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zD6Xg19xEey5t-mahoHmrg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zD6XhF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KCzu833sEeyivuDeOiJBMg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KCzu9H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zEaGwl9xEey5t-mahoHmrg" name="getConsolMedicationSupplyOrder2" bodyCondition="_zEaGxV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zEaGxV9xEey5t-mahoHmrg" name="body" constrainedElement="_zEaGwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zEaGxl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KDRB8n3sEeyivuDeOiJBMg" name="getConsolMedicationSupplyOrder2" bodyCondition="_KDRB9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KDRB9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_KDRB8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KDRB9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::MedicationSupplyOrder2))->asSequence()->any(true).oclAsType(consol::MedicationSupplyOrder2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zEaGw19xEey5t-mahoHmrg" type="_InVpIOZ8EeOmzetP5oaH3A" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zEaGxF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_KDRB833sEeyivuDeOiJBMg" type="_InVpIOZ8EeOmzetP5oaH3A" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KDRB9H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zE7EIl9xEey5t-mahoHmrg" name="getConsolMedicationDispense2" bodyCondition="_zE7rMV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zE7rMV9xEey5t-mahoHmrg" name="body" constrainedElement="_zE7EIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zE7rMl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KDsfwn3sEeyivuDeOiJBMg" name="getConsolMedicationDispense2" bodyCondition="_KDsfxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KDsfxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KDsfwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KDsfxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::MedicationDispense2))->asSequence()->any(true).oclAsType(consol::MedicationDispense2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zE7EI19xEey5t-mahoHmrg" type="_qH-ckOXfEeOkFcFJ9uzEEw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zE7rMF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_KDsfw33sEeyivuDeOiJBMg" type="_qH-ckOXfEeOkFcFJ9uzEEw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KDsfxH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zFcokF9xEey5t-mahoHmrg" name="getConsolReactionObservation2" bodyCondition="_zFcok19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zFcok19xEey5t-mahoHmrg" name="body" constrainedElement="_zFcokF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zFcolF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KEGIYn3sEeyivuDeOiJBMg" name="getConsolReactionObservation2" bodyCondition="_KEGIZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KEGIZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KEGIYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KEGIZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ReactionObservation2))->asSequence()->any(true).oclAsType(consol::ReactionObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zFcokV9xEey5t-mahoHmrg" type="_U3yosPDxEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zFcokl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_KEGIY33sEeyivuDeOiJBMg" type="_U3yosPDxEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KEGIZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zF-0El9xEey5t-mahoHmrg" name="getConsolInstruction2" bodyCondition="_zF-0FV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zF-0FV9xEey5t-mahoHmrg" name="body" constrainedElement="_zF-0El9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zF-0Fl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KEg_In3sEeyivuDeOiJBMg" name="getConsolInstruction2" bodyCondition="_KEg_JX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KEg_JX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KEg_In3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KEg_Jn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instruction2))->asSequence()->any(true).oclAsType(consol::Instruction2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zF-0E19xEey5t-mahoHmrg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zF-0FF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_KEg_I33sEeyivuDeOiJBMg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KEg_JH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -28368,78 +28368,78 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
       <ownedComment xmi:id="_xLRlgOHUEeO04sHNODkHmQ">
         <body>The Immunization Medication Information represents product information about the immunization substance. The vaccine manufacturer and vaccine lot number are typically recorded in the medical record and should be included if known.</body>
       </ownedComment>
-      <ownedRule xmi:id="_xmXbdV9xEey5t-mahoHmrg" name="ImmunizationMedicationInformation2TemplateId" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xmXbdl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Iwr_xX3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformation2TemplateId" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Iwr_xn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.54' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xoGg0F9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationManufacturedMaterial" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xoGg0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IyLNgH3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationManufacturedMaterial" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IyLNgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->one(manufacturedMaterial : cda::Material | not manufacturedMaterial.oclIsUndefined() and manufacturedMaterial.oclIsKindOf(cda::Material))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_74TlUF9xEey5t-mahoHmrg" name="ImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslationP" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_74TlUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SCY0oH3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslationP" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SCY0oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null).code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (not translation->isEmpty()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_74TlUl9xEey5t-mahoHmrg" name="ImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslation" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_74TlU19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SCZbsH3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslation" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SCZbsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null).code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 not value.codeSystem.oclIsUndefined() or not value.codeSystemName.oclIsUndefined())) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_74TlVF9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeOriginalText" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_74TlVV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SCZbsn3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeOriginalText" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SCZbs33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_74UMYF9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialOriginalTextReference" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_74UMYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SCZbtH3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialOriginalTextReference" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SCaCwH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_74UMYl9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialTextReferenceValue" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_74UMY19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SCaCwX3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialTextReferenceValue" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SCaCwn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_74UzcF9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialOriginalTextReferenceValue" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_74UzcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SCaCw33sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialOriginalTextReferenceValue" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SCaCxH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_74VagF9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeTranslation" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_74VagV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SCap0H3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeTranslation" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SCap0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_74Vagl9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeP" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_74Vag19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SCap0n3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeP" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SCap033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_74WBkF9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCode" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_74WBkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SCbQ4H3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCode" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SCbQ4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.12.292' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_74WBkl9xEey5t-mahoHmrg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialLotNumberText" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_74WBk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SCbQ4n3sEeyivuDeOiJBMg" name="ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialLotNumberText" constrainedElement="_Rx8LIOHUEeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SCbQ433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject((lotNumberText.oclIsUndefined() or lotNumberText.isNullFlavorUndefined()) implies (not lotNumberText.oclIsUndefined()))</body>
         </specification>
@@ -28468,40 +28468,40 @@ value.codeSystem = '2.16.840.1.113883.12.292' and not value.code.oclIsUndefined(
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xoHH4F9xEey5t-mahoHmrg" name="Indication2TemplateId" constrainedElement="_PrEOIOHoEeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xoHH4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IyLNgn3sEeyivuDeOiJBMg" name="Indication2TemplateId" constrainedElement="_PrEOIOHoEeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IyLNg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.19' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xoI9EF9xEey5t-mahoHmrg" name="IndicationId" constrainedElement="_PrEOIOHoEeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xoJkIF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IyNCsH3sEeyivuDeOiJBMg" name="IndicationId" constrainedElement="_PrEOIOHoEeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IyNCsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xop6cF9xEey5t-mahoHmrg" name="IndicationCodeP" constrainedElement="_PrEOIOHoEeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xop6cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IyoggH3sEeyivuDeOiJBMg" name="IndicationCodeP" constrainedElement="_PrEOIOHoEeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IyoggX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xoKyQF9xEey5t-mahoHmrg" name="IndicationCode" constrainedElement="_PrEOIOHoEeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xoKyQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IyOQ0H3sEeyivuDeOiJBMg" name="IndicationCode" constrainedElement="_PrEOIOHoEeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IyOQ0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 not value.codeSystem.oclIsUndefined() or not value.codeSystemName.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xpqAAF9xEey5t-mahoHmrg" name="IndicationValueP" constrainedElement="_PrEOIOHoEeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xpqAAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Izk7sH3sEeyivuDeOiJBMg" name="IndicationValueP" constrainedElement="_PrEOIOHoEeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Izk7sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (not self.value->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xpKQwF9xEey5t-mahoHmrg" name="IndicationValue" constrainedElement="_PrEOIOHoEeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xpK30F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_IzI20H3sEeyivuDeOiJBMg" name="IndicationValue" constrainedElement="_PrEOIOHoEeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_IzI20X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
@@ -28514,14 +28514,14 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
       <ownedComment xmi:id="_2laBMOH7EeO04sHNODkHmQ">
         <body>The Instruction template can be used in several ways, such as to record patient instructions within a Medication Activity or to record fill instructions within a supply order. The template's moodCode can only be INT. If an instruction was already be given, the Procedure Activity Act template (instead of this template) should be used to represent the already occurred instruction. The act/code defines the type of instruction. Though not defined in this template, a Vaccine Information Statement (VIS) document could be referenced through act/reference/externalDocument, and patient awareness of the instructions can be represented with the generic participant and the participant/awarenessCode.</body>
       </ownedComment>
-      <ownedRule xmi:id="_xqLkcF9xEey5t-mahoHmrg" name="Instruction2TemplateId" constrainedElement="_D62NwOH7EeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xqLkcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I0BnoH3sEeyivuDeOiJBMg" name="Instruction2TemplateId" constrainedElement="_D62NwOH7EeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I0BnoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.20' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xqMykF9xEey5t-mahoHmrg" name="InstructionsText" constrainedElement="_D62NwOH7EeO04sHNODkHmQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xqMykV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I0C1wH3sEeyivuDeOiJBMg" name="InstructionsText" constrainedElement="_D62NwOH7EeO04sHNODkHmQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I0C1wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (true)</body>
         </specification>
@@ -28620,263 +28620,263 @@ This effectiveTime represents either the medication duration (i.e., the time the
           <body>( self.effectiveTime->select(ef | ef.oclIsTypeOf(datatypes::IVL_TS))->forAll( eff | eff.oclAsType(datatypes::IVL_TS).low->size() = 1) )  and  ( self.effectiveTime->select(ef | ef.oclIsTypeOf(datatypes::SXCM_TS))->forAll( eff | eff.oclAsType(datatypes:: SXCM_TS).value->size() = 1 or eff.oclAsType(datatypes::SXCM_TS).isNullFlavorDefined()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xqOAsF9xEey5t-mahoHmrg" name="MedicationActivity2TemplateId" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xqOAsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I0ED4H3sEeyivuDeOiJBMg" name="MedicationActivity2TemplateId" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I0ED4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.16' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xqS5MF9xEey5t-mahoHmrg" name="MedicationActivityCode" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xqS5MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I0IVUH3sEeyivuDeOiJBMg" name="MedicationActivityCode" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I0IVUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xq0doF9xEey5t-mahoHmrg" name="MedicationActivityStatusCodeP" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xq0doV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I0mPYH3sEeyivuDeOiJBMg" name="MedicationActivityStatusCodeP" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I0mPYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xqUHUF9xEey5t-mahoHmrg" name="MedicationActivityStatusCode" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xqUHUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I0JjcH3sEeyivuDeOiJBMg" name="MedicationActivityStatusCode" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I0JjcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'aborted' or value.code = 'active' or value.code = 'completed' or value.code = 'nullified' or value.code = 'suspended')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xrWCEF9xEey5t-mahoHmrg" name="MedicationActivityRepeatNumber" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xrWCEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I1DiYH3sEeyivuDeOiJBMg" name="MedicationActivityRepeatNumber" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I1DiYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.repeatNumber.oclIsUndefined() or self.repeatNumber.isNullFlavorUndefined()) implies (not self.repeatNumber.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xr6CwF9xEey5t-mahoHmrg" name="MedicationActivityRouteCodeP" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xr6CwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I1kfwH3sEeyivuDeOiJBMg" name="MedicationActivityRouteCodeP" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I1kfwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.routeCode.oclIsUndefined() or self.routeCode.isNullFlavorUndefined()) implies (not self.routeCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xrX3QF9xEey5t-mahoHmrg" name="MedicationActivityRouteCode" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xrX3QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I1EwgH3sEeyivuDeOiJBMg" name="MedicationActivityRouteCode" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I1EwgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.routeCode.oclIsUndefined() or self.routeCode.isNullFlavorUndefined()) implies (not self.routeCode.oclIsUndefined() and self.routeCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.routeCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.3.26.1.1' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xscOQF9xEey5t-mahoHmrg" name="MedicationActivityDoseQuantity" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xscOQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I2BLsH3sEeyivuDeOiJBMg" name="MedicationActivityDoseQuantity" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I2BLsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.doseQuantity.oclIsUndefined() or self.doseQuantity.isNullFlavorUndefined()) implies (not self.doseQuantity.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xs_n4F9xEey5t-mahoHmrg" name="MedicationActivityAdministrationUnitCodeP" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xs_n4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I2d3oH3sEeyivuDeOiJBMg" name="MedicationActivityAdministrationUnitCodeP" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I2d3oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.administrationUnitCode.oclIsUndefined() or self.administrationUnitCode.isNullFlavorUndefined()) implies (not self.administrationUnitCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xsdcYF9xEey5t-mahoHmrg" name="MedicationActivityAdministrationUnitCode" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xseDcF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I2DA4H3sEeyivuDeOiJBMg" name="MedicationActivityAdministrationUnitCode" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I2DA4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.administrationUnitCode.oclIsUndefined() or self.administrationUnitCode.isNullFlavorUndefined()) implies (not self.administrationUnitCode.oclIsUndefined() and self.administrationUnitCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.administrationUnitCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.3.26.1.1' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xthMUF9xEey5t-mahoHmrg" name="MedicationActivityText" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xthMUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I25VcH3sEeyivuDeOiJBMg" name="MedicationActivityText" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I25VcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xvEEcF9xEey5t-mahoHmrg" name="MedicationActivity2DrugMonitoringAct" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xvEEcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I4LH0H3sEeyivuDeOiJBMg" name="MedicationActivity2DrugMonitoringAct" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I4LH0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::DrugMonitoringAct) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xvkawF9xEey5t-mahoHmrg" name="MedicationActivityInstructions" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xvkawV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I4l-kH3sEeyivuDeOiJBMg" name="MedicationActivityInstructions" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I4l-kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instruction2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xwC74F9xEey5t-mahoHmrg" name="MedicationActivity2AuthorParticipation" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xwC74V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I5AOQH3sEeyivuDeOiJBMg" name="MedicationActivity2AuthorParticipation" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I5AOQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xwirIF9xEey5t-mahoHmrg" name="MedicationActivity2SubstanceAdministeredAct" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xwirIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I5evYH3sEeyivuDeOiJBMg" name="MedicationActivity2SubstanceAdministeredAct" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I5fWcH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::SubstanceAdministeredAct) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xxBzUF9xEey5t-mahoHmrg" name="MedicationActivityIndication" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xxCaYF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I56NMH3sEeyivuDeOiJBMg" name="MedicationActivityIndication" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I56NMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zHwVsF9xEey5t-mahoHmrg" name="MedicationActivityConsumable" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zHwVsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KFxjYH3sEeyivuDeOiJBMg" name="MedicationActivityConsumable" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KFxjYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.consumable->one(consumable : cda::Consumable | not consumable.oclIsUndefined() and consumable.oclIsKindOf(cda::Consumable))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zI6zUF9xEey5t-mahoHmrg" name="MedicationActivityMedicationSupplyOrder" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zI6zUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KGmCwH3sEeyivuDeOiJBMg" name="MedicationActivityMedicationSupplyOrder" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KGmCwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::MedicationSupplyOrder2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zJc-0F9xEey5t-mahoHmrg" name="MedicationActivityMedicationDispense" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zJc-0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KHEj4H3sEeyivuDeOiJBMg" name="MedicationActivityMedicationDispense" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KHEj4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::MedicationDispense2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zJ98MF9xEey5t-mahoHmrg" name="MedicationActivityReactionObservation" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zJ98MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KHhP0H3sEeyivuDeOiJBMg" name="MedicationActivityReactionObservation" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KHhP0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ReactionObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::CAUS)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_25dFsF9xEey5t-mahoHmrg" name="MedicationActivityPrecondition" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_25dFsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NaA7UH3sEeyivuDeOiJBMg" name="MedicationActivityPrecondition" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NaA7UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.precondition->exists(precondition : cda::Precondition | not precondition.oclIsUndefined() and precondition.oclIsKindOf(cda::Precondition))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4dY9oF9xEey5t-mahoHmrg" name="MedicationActivity2MedicationFreeTextSig" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4dY9oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OvNzsH3sEeyivuDeOiJBMg" name="MedicationActivity2MedicationFreeTextSig" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OvNzsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::MedicationFreeTextSig) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_75Tq4F9xEey5t-mahoHmrg" name="MedicationActivity2CETranslationP" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_75Tq4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SDZhQH3sEeyivuDeOiJBMg" name="MedicationActivity2CETranslationP" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SDZhQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.routeCode->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (not translation->isEmpty()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_75Tq4l9xEey5t-mahoHmrg" name="MedicationActivity2CETranslation" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_75Tq419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SDZhQn3sEeyivuDeOiJBMg" name="MedicationActivity2CETranslation" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SDaIUH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.routeCode->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_750oQF9xEey5t-mahoHmrg" name="MedicationActivityPreconditionTypeCode" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_750oQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SD53kH3sEeyivuDeOiJBMg" name="MedicationActivityPreconditionTypeCode" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SD53kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.precondition->excluding(null)->reject(typeCode=vocab::ActRelationshipType::PRCN)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_750oQl9xEey5t-mahoHmrg" name="MedicationActivityPreconditionPreconditionForSubstanceAdministration" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_750oQ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SD6eoH3sEeyivuDeOiJBMg" name="MedicationActivityPreconditionPreconditionForSubstanceAdministration" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SD6eoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.precondition->excluding(null)->reject(criterion->one(criterion : cda::Criterion | not criterion.oclIsUndefined() and criterion.oclIsKindOf(consol::PreconditionForSubstanceAdministration2)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_76U-kF9xEey5t-mahoHmrg" name="MedicationActivityConsumableMedicationInformation" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_76U-kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SEZm0H3sEeyivuDeOiJBMg" name="MedicationActivityConsumableMedicationInformation" constrainedElement="_WnSCMOLAEeOc7-TVP7Wi6w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SEZm0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.consumable->excluding(null)->reject(manufacturedProduct->one(manufacturedProduct : cda::ManufacturedProduct | not manufacturedProduct.oclIsUndefined() and manufacturedProduct.oclIsKindOf(consol::MedicationInformation2)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_WnVFgOLAEeOc7-TVP7Wi6w" general="_2GHbgBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_xvEEcl9xEey5t-mahoHmrg" name="getDrugMonitoringAct" bodyCondition="_xvEEdV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xvEEdV9xEey5t-mahoHmrg" name="body" constrainedElement="_xvEEcl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xvEEdl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_I4LH0n3sEeyivuDeOiJBMg" name="getDrugMonitoringAct" bodyCondition="_I4Lu4n3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_I4Lu4n3sEeyivuDeOiJBMg" name="body" constrainedElement="_I4LH0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_I4Lu433sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::DrugMonitoringAct))->asSequence()->any(true).oclAsType(consol::DrugMonitoringAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xvEEc19xEey5t-mahoHmrg" type="_MbKs8IqvEeOoMZgUoTghIg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xvEEdF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_I4Lu4H3sEeyivuDeOiJBMg" type="_MbKs8IqvEeOoMZgUoTghIg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_I4Lu4X3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_xvkawl9xEey5t-mahoHmrg" name="getConsolInstruction2" bodyCondition="_xvkaxV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xvkaxV9xEey5t-mahoHmrg" name="body" constrainedElement="_xvkawl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xvkaxl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_I4l-kn3sEeyivuDeOiJBMg" name="getConsolInstruction2" bodyCondition="_I4l-lX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_I4l-lX3sEeyivuDeOiJBMg" name="body" constrainedElement="_I4l-kn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_I4l-ln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instruction2))->asSequence()->any(true).oclAsType(consol::Instruction2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xvkaw19xEey5t-mahoHmrg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xvkaxF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_I4l-k33sEeyivuDeOiJBMg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_I4l-lH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_xwirIl9xEey5t-mahoHmrg" name="getSubstanceAdministeredActs" bodyCondition="_xwirJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xwirJV9xEey5t-mahoHmrg" name="body" constrainedElement="_xwirIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xwirJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_I5fWcX3sEeyivuDeOiJBMg" name="getSubstanceAdministeredActs" bodyCondition="_I5fWdH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_I5fWdH3sEeyivuDeOiJBMg" name="body" constrainedElement="_I5fWcX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_I5fWdX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::SubstanceAdministeredAct)).oclAsType(consol::SubstanceAdministeredAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xwirI19xEey5t-mahoHmrg" type="_KTrEAJpdEeOK6dzbL4VoTA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xwirJF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_I5fWcn3sEeyivuDeOiJBMg" type="_KTrEAJpdEeOK6dzbL4VoTA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_I5fWc33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_xxCaYV9xEey5t-mahoHmrg" name="getConsolIndication2s" bodyCondition="_xxCaZF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_xxCaZF9xEey5t-mahoHmrg" name="body" constrainedElement="_xxCaYV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_xxCaZV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_I56NMn3sEeyivuDeOiJBMg" name="getConsolIndication2s" bodyCondition="_I56NNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_I56NNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_I56NMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_I56NNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication2)).oclAsType(consol::Indication2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_xxCaYl9xEey5t-mahoHmrg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xxCaY19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_I56NM33sEeyivuDeOiJBMg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_I56NNH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zI6zUl9xEey5t-mahoHmrg" name="getConsolMedicationSupplyOrder2" bodyCondition="_zI7aYF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zI7aYF9xEey5t-mahoHmrg" name="body" constrainedElement="_zI6zUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zI7aYV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KGmCwn3sEeyivuDeOiJBMg" name="getConsolMedicationSupplyOrder2" bodyCondition="_KGmCxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KGmCxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KGmCwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KGmCxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::MedicationSupplyOrder2))->asSequence()->any(true).oclAsType(consol::MedicationSupplyOrder2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zI6zU19xEey5t-mahoHmrg" type="_InVpIOZ8EeOmzetP5oaH3A" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zI6zVF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_KGmCw33sEeyivuDeOiJBMg" type="_InVpIOZ8EeOmzetP5oaH3A" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KGmCxH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zJc-0l9xEey5t-mahoHmrg" name="getConsolMedicationDispense2s" bodyCondition="_zJc-1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zJc-1V9xEey5t-mahoHmrg" name="body" constrainedElement="_zJc-0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zJc-1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KHFK8H3sEeyivuDeOiJBMg" name="getConsolMedicationDispense2s" bodyCondition="_KHFK833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KHFK833sEeyivuDeOiJBMg" name="body" constrainedElement="_KHFK8H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KHFK9H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::MedicationDispense2)).oclAsType(consol::MedicationDispense2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zJc-019xEey5t-mahoHmrg" type="_qH-ckOXfEeOkFcFJ9uzEEw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zJc-1F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KHFK8X3sEeyivuDeOiJBMg" type="_qH-ckOXfEeOkFcFJ9uzEEw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KHFK8n3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zJ98Ml9xEey5t-mahoHmrg" name="getConsolReactionObservation2" bodyCondition="_zJ98NV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zJ98NV9xEey5t-mahoHmrg" name="body" constrainedElement="_zJ98Ml9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zJ98Nl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KHh24H3sEeyivuDeOiJBMg" name="getConsolReactionObservation2" bodyCondition="_KHh2433sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KHh2433sEeyivuDeOiJBMg" name="body" constrainedElement="_KHh24H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KHh25H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ReactionObservation2))->asSequence()->any(true).oclAsType(consol::ReactionObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zJ98M19xEey5t-mahoHmrg" type="_U3yosPDxEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zJ98NF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_KHh24X3sEeyivuDeOiJBMg" type="_U3yosPDxEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KHh24n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4dZksF9xEey5t-mahoHmrg" name="getMedicationFreeTextSigs" bodyCondition="_4dZks19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4dZks19xEey5t-mahoHmrg" name="body" constrainedElement="_4dZksF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4dZktF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OvNzsn3sEeyivuDeOiJBMg" name="getMedicationFreeTextSigs" bodyCondition="_OvNztX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OvNztX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OvNzsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OvNztn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationFreeTextSig)).oclAsType(consol::MedicationFreeTextSig)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4dZksV9xEey5t-mahoHmrg" type="_kowjcDr-EeWD4MX6K2c_gA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4dZksl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OvNzs33sEeyivuDeOiJBMg" type="_kowjcDr-EeWD4MX6K2c_gA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OvNztH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -28902,48 +28902,48 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
           <body>self.product.manufacturedProduct.oclIsTypeOf(consol::MedicationInformation2) xor self.product.manufacturedProduct.oclIsTypeOf(consol::ImmunizationMedicationInformation2)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xxDBcF9xEey5t-mahoHmrg" name="MedicationDispense2TemplateId" constrainedElement="_qH-ckOXfEeOkFcFJ9uzEEw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xxDBcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I56NN33sEeyivuDeOiJBMg" name="MedicationDispense2TemplateId" constrainedElement="_qH-ckOXfEeOkFcFJ9uzEEw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I560QH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.18' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xxj-0F9xEey5t-mahoHmrg" name="MedicationDispenseStatusCodeP" constrainedElement="_qH-ckOXfEeOkFcFJ9uzEEw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xxj-0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I6W5IH3sEeyivuDeOiJBMg" name="MedicationDispenseStatusCodeP" constrainedElement="_qH-ckOXfEeOkFcFJ9uzEEw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I6W5IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xxE2oF9xEey5t-mahoHmrg" name="MedicationDispenseStatusCode" constrainedElement="_qH-ckOXfEeOkFcFJ9uzEEw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xxE2oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I58CYH3sEeyivuDeOiJBMg" name="MedicationDispenseStatusCode" constrainedElement="_qH-ckOXfEeOkFcFJ9uzEEw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I58CYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'aborted' or value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xyEVIF9xEey5t-mahoHmrg" name="MedicationDispenseRepeatNumber" constrainedElement="_qH-ckOXfEeOkFcFJ9uzEEw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xyEVIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I60MIH3sEeyivuDeOiJBMg" name="MedicationDispenseRepeatNumber" constrainedElement="_qH-ckOXfEeOkFcFJ9uzEEw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I60MIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.repeatNumber.oclIsUndefined() or self.repeatNumber.isNullFlavorUndefined()) implies (not self.repeatNumber.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zKeSgF9xEey5t-mahoHmrg" name="MedicationDispenseMedicationSupplyOrder" constrainedElement="_qH-ckOXfEeOkFcFJ9uzEEw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zKeSgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KH8toH3sEeyivuDeOiJBMg" name="MedicationDispenseMedicationSupplyOrder" constrainedElement="_qH-ckOXfEeOkFcFJ9uzEEw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KH8toX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::MedicationSupplyOrder2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_qH_DoOXfEeOkFcFJ9uzEEw" general="_DpoGkBUUEeG6PvUxSTZnaw"/>
-      <ownedOperation xmi:id="_zKe5kF9xEey5t-mahoHmrg" name="getConsolMedicationSupplyOrder2" bodyCondition="_zKe5k19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zKe5k19xEey5t-mahoHmrg" name="body" constrainedElement="_zKe5kF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zKe5lF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KH8ton3sEeyivuDeOiJBMg" name="getConsolMedicationSupplyOrder2" bodyCondition="_KH8tpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KH8tpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KH8ton3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KH8tpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::MedicationSupplyOrder2))->asSequence()->any(true).oclAsType(consol::MedicationSupplyOrder2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zKe5kV9xEey5t-mahoHmrg" type="_InVpIOZ8EeOmzetP5oaH3A" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zKe5kl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_KH8to33sEeyivuDeOiJBMg" type="_InVpIOZ8EeOmzetP5oaH3A" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KH8tpH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -28952,62 +28952,62 @@ value.code = 'aborted' or value.code = 'completed')</body>
         <body>A medication should be recorded as a pre-coordinated ingredient + strength + dose form (e.g., &quot;metoprolol 25mg tablet&quot;, &quot;amoxicillin 400mg/5mL suspension&quot;) where possible. This includes RxNorm codes whose Term Type is SCD (semantic clinical drug), SBD (semantic brand drug), GPCK (generic pack), BPCK (brand pack).&#xD;
 The dose (doseQuantity) represents how many of the consumables are to be administered at each administration event. As a result, the dose is always relative to the consumable. Thus, a patient consuming a single &quot;metoprolol 25mg tablet&quot; per administration will have a doseQuantity of &quot;1&quot;, whereas a patient consuming &quot;metoprolol&quot; will have a dose of &quot;25 mg&quot;.</body>
       </ownedComment>
-      <ownedRule xmi:id="_xyFjQF9xEey5t-mahoHmrg" name="MedicationInformation2TemplateId" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xyFjQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I61aQH3sEeyivuDeOiJBMg" name="MedicationInformation2TemplateId" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I61aQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.23' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xzresF9xEey5t-mahoHmrg" name="MedicationInformationManufacturedMaterial" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xzresV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I8OhYH3sEeyivuDeOiJBMg" name="MedicationInformationManufacturedMaterial" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I8OhYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->one(manufacturedMaterial : cda::Material | not manufacturedMaterial.oclIsUndefined() and manufacturedMaterial.oclIsKindOf(cda::Material))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_77RZwF9xEey5t-mahoHmrg" name="MedicationInformation2MedicationInformationManufacturedMaterialCETranslation" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_77RZwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SFZsYH3sEeyivuDeOiJBMg" name="MedicationInformation2MedicationInformationManufacturedMaterialCETranslation" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SFaTcH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null).code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (not translation->isEmpty()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_77SA0F9xEey5t-mahoHmrg" name="MedicationInformationMedicationInformationManufacturedMaterialCodeOriginalText" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_77SA0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SFaTcX3sEeyivuDeOiJBMg" name="MedicationInformationMedicationInformationManufacturedMaterialCodeOriginalText" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SFaTcn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_77SA0l9xEey5t-mahoHmrg" name="MedicationInformationMedicationInformationManufacturedMaterialCodeTranslation" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_77SA019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SFaTc33sEeyivuDeOiJBMg" name="MedicationInformationMedicationInformationManufacturedMaterialCodeTranslation" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SFaTdH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_77Sn4F9xEey5t-mahoHmrg" name="MedicationInformationMedicationInformationManufacturedMaterialReference" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_77Sn4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SFa6gH3sEeyivuDeOiJBMg" name="MedicationInformationMedicationInformationManufacturedMaterialReference" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SFa6gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_77Sn4l9xEey5t-mahoHmrg" name="MedicationInformationMedicationInformationManufacturedMaterialOriginalTextReferenceValue" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_77Sn419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SFa6gn3sEeyivuDeOiJBMg" name="MedicationInformationMedicationInformationManufacturedMaterialOriginalTextReferenceValue" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SFa6g33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_77Sn5F9xEey5t-mahoHmrg" name="MedicationInformationMedicationInformationManufacturedMaterialReferenceValue" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_77Sn5V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SFa6hH3sEeyivuDeOiJBMg" name="MedicationInformationMedicationInformationManufacturedMaterialReferenceValue" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SFa6hX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_77TO8F9xEey5t-mahoHmrg" name="MedicationInformationMedicationInformationManufacturedMaterialCodeP" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_77TO8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SFbhkH3sEeyivuDeOiJBMg" name="MedicationInformationMedicationInformationManufacturedMaterialCodeP" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SFbhkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_77TO8l9xEey5t-mahoHmrg" name="MedicationInformationMedicationInformationManufacturedMaterialCode" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_77TO819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SFbhkn3sEeyivuDeOiJBMg" name="MedicationInformationMedicationInformationManufacturedMaterialCode" constrainedElement="_Hz__kOXrEeOkFcFJ9uzEEw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SFbhk33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.manufacturedMaterial->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
@@ -29044,48 +29044,48 @@ value.codeSystem = '2.16.840.1.113883.6.88' and not value.code.oclIsUndefined())
           <body>self.entryRelationship->select(er : cda::EntryRelationship | er.act.oclIsTypeOf(consol::Instruction2))->forAll(ent : cda::EntryRelationship | ent.inversionInd=true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xzsFwF9xEey5t-mahoHmrg" name="MedicationSupplyOrder2TemplateId" constrainedElement="_InVpIOZ8EeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xzsFwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I8PvgH3sEeyivuDeOiJBMg" name="MedicationSupplyOrder2TemplateId" constrainedElement="_InVpIOZ8EeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I8PvgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.17' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x0PfYF9xEey5t-mahoHmrg" name="MedicationSupplyOrderStatusCodeP" constrainedElement="_InVpIOZ8EeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x0PfYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I8wF0H3sEeyivuDeOiJBMg" name="MedicationSupplyOrderStatusCodeP" constrainedElement="_InVpIOZ8EeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I8wF0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_xzt68F9xEey5t-mahoHmrg" name="MedicationSupplyOrderStatusCode" constrainedElement="_InVpIOZ8EeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_xzt68V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I8RksH3sEeyivuDeOiJBMg" name="MedicationSupplyOrderStatusCode" constrainedElement="_InVpIOZ8EeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I8RksX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'normal' or value.code = 'aborted' or value.code = 'active' or value.code = 'cancelled' or value.code = 'completed' or value.code = 'held' or value.code = 'new' or value.code = 'suspended' or value.code = 'nullified' or value.code = 'obsolete')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x0xD0F9xEey5t-mahoHmrg" name="MedicationSupplyOrderRepeatNumber" constrainedElement="_InVpIOZ8EeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x0xD0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I9N_4H3sEeyivuDeOiJBMg" name="MedicationSupplyOrderRepeatNumber" constrainedElement="_InVpIOZ8EeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I9N_4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.repeatNumber.oclIsUndefined() or self.repeatNumber.isNullFlavorUndefined()) implies (not self.repeatNumber.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x1RaIF9xEey5t-mahoHmrg" name="MedicationSupplyOrderInstructions" constrainedElement="_InVpIOZ8EeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x1RaIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I9tvIH3sEeyivuDeOiJBMg" name="MedicationSupplyOrderInstructions" constrainedElement="_InVpIOZ8EeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I9tvIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instruction2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_InVpIeZ8EeOmzetP5oaH3A" general="_j3aTQBrTEeGo461UQq-B1g"/>
-      <ownedOperation xmi:id="_x1RaIl9xEey5t-mahoHmrg" name="getConsolInstruction2" bodyCondition="_x1RaJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_x1RaJV9xEey5t-mahoHmrg" name="body" constrainedElement="_x1RaIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_x1RaJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_I9tvIn3sEeyivuDeOiJBMg" name="getConsolInstruction2" bodyCondition="_I9uWMX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_I9uWMX3sEeyivuDeOiJBMg" name="body" constrainedElement="_I9tvIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_I9uWMn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instruction2))->asSequence()->any(true).oclAsType(consol::Instruction2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_x1RaI19xEey5t-mahoHmrg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x1RaJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_I9tvI33sEeyivuDeOiJBMg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_I9uWMH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -29099,59 +29099,59 @@ value.code = 'normal' or value.code = 'aborted' or value.code = 'active' or valu
           <body>self.entryRelationship->select(er : cda::EntryRelationship | er.act.oclIsTypeOf(consol::Instruction2))->forAll(ent : cda::EntryRelationship | ent.inversionInd=true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x1SBMF9xEey5t-mahoHmrg" name="NonMedicinalSupplyActivity2TemplateId" constrainedElement="_k_C20OaCEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x1SBMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I9uWM33sEeyivuDeOiJBMg" name="NonMedicinalSupplyActivity2TemplateId" constrainedElement="_k_C20OaCEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I9uWNH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.50' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x10zwF9xEey5t-mahoHmrg" name="NonMedicinalSupplyActivityStatusCodeP" constrainedElement="_k_C20OaCEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x10zwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I-M3UH3sEeyivuDeOiJBMg" name="NonMedicinalSupplyActivityStatusCodeP" constrainedElement="_k_C20OaCEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I-M3UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x1TPUF9xEey5t-mahoHmrg" name="NonMedicinalSupplyActivityStatusCode" constrainedElement="_k_C20OaCEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x1TPUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I9vkUH3sEeyivuDeOiJBMg" name="NonMedicinalSupplyActivityStatusCode" constrainedElement="_k_C20OaCEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I9vkUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'normal' or value.code = 'aborted' or value.code = 'active' or value.code = 'cancelled' or value.code = 'completed' or value.code = 'held' or value.code = 'new' or value.code = 'suspended' or value.code = 'nullified' or value.code = 'obsolete')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x20SQF9xEey5t-mahoHmrg" name="NonMedicinalSupplyActivity2Instruction2" constrainedElement="_k_C20OaCEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x20SQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I_Dy8H3sEeyivuDeOiJBMg" name="NonMedicinalSupplyActivity2Instruction2" constrainedElement="_k_C20OaCEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I_Dy8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instruction2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3cKxMF9xEey5t-mahoHmrg" name="NonMedicinalSupplyActivityProductInstance" constrainedElement="_k_C20OaCEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3cKxMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_N4NTMH3sEeyivuDeOiJBMg" name="NonMedicinalSupplyActivityProductInstance" constrainedElement="_k_C20OaCEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_N4NTMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->one(participant : cda::Participant2 | not participant.participantRole.oclIsUndefined() and participant.participantRole.oclIsKindOf(consol::ProductInstance))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_k_C20eaCEeOmzetP5oaH3A" general="_2HIvMBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_x20SQl9xEey5t-mahoHmrg" name="getInstruction2" bodyCondition="_x20SRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_x20SRV9xEey5t-mahoHmrg" name="body" constrainedElement="_x20SQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_x20SRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_I_Dy8n3sEeyivuDeOiJBMg" name="getInstruction2" bodyCondition="_I_Dy9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_I_Dy9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_I_Dy8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_I_Dy9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instruction2))->asSequence()->any(true).oclAsType(consol::Instruction2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_x20SQ19xEey5t-mahoHmrg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x20SRF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_I_Dy833sEeyivuDeOiJBMg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_I_Dy9H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3cKxMl9xEey5t-mahoHmrg" name="getConsolProductInstance" bodyCondition="_3cKxNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3cKxNV9xEey5t-mahoHmrg" name="body" constrainedElement="_3cKxMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3cKxNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_N4NTMn3sEeyivuDeOiJBMg" name="getConsolProductInstance" bodyCondition="_N4NTNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_N4NTNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_N4NTMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_N4NTNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getParticipantRoles()->select(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(consol::ProductInstance))->asSequence()->any(true).oclAsType(consol::ProductInstance)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3cKxM19xEey5t-mahoHmrg" type="_2G2bUxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3cKxNF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_N4NTM33sEeyivuDeOiJBMg" type="_2G2bUxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_N4NTNH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -29159,50 +29159,50 @@ value.code = 'normal' or value.code = 'aborted' or value.code = 'active' or valu
       <ownedComment xmi:id="_Yh-f4OaHEeOmzetP5oaH3A">
         <body>This encounterParticipant is the attending physician and is usually different from the Physician Reading Study Performer defined in documentationOf/serviceEvent.</body>
       </ownedComment>
-      <ownedRule xmi:id="_x205UF9xEey5t-mahoHmrg" name="PhysicianofRecordParticipant2TemplateId" constrainedElement="_Ao2HkOaHEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x205UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I_Dy933sEeyivuDeOiJBMg" name="PhysicianofRecordParticipant2TemplateId" constrainedElement="_Ao2HkOaHEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I_EaAH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.6.2.2' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x3aIIF9xEey5t-mahoHmrg" name="PhysicianofRecordParticipantAssignedEntity" constrainedElement="_Ao2HkOaHEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x3aIIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_I_iUEH3sEeyivuDeOiJBMg" name="PhysicianofRecordParticipantAssignedEntity" constrainedElement="_Ao2HkOaHEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I_iUEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_78-C4F9xEey5t-mahoHmrg" name="PhysicianofRecordParticipant2AssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_Ao2HkOaHEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_78-C4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SG2d4H3sEeyivuDeOiJBMg" name="PhysicianofRecordParticipant2AssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent" constrainedElement="_Ao2HkOaHEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SG2d4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->excluding(null).assignedPerson->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject((getText(true)&lt;>'' and ( family->isEmpty() and given->isEmpty() and suffix->isEmpty() and prefix->isEmpty()   )   ) xor (getText(true)='' and (not family->isEmpty() and not given->isEmpty()  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_78-p8F9xEey5t-mahoHmrg" name="PhysicianofRecordParticipantAssignedEntityAssignedPersonName" constrainedElement="_Ao2HkOaHEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_78-p8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SG3E8H3sEeyivuDeOiJBMg" name="PhysicianofRecordParticipantAssignedEntityAssignedPersonName" constrainedElement="_Ao2HkOaHEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SG3E8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->excluding(null).assignedPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (name->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_79eZMF9xEey5t-mahoHmrg" name="PhysicianofRecordParticipant2AssignedEntityRepresentedOrganizationName" constrainedElement="_Ao2HkOaHEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_79eZMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SHTw4H3sEeyivuDeOiJBMg" name="PhysicianofRecordParticipant2AssignedEntityRepresentedOrganizationName" constrainedElement="_Ao2HkOaHEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SHUX8H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->excluding(null).representedOrganization->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_79eZMl9xEey5t-mahoHmrg" name="PhysicianofRecordParticipantAssignedEntityHasNationalProviderId" constrainedElement="_Ao2HkOaHEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_79eZM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SHUX8X3sEeyivuDeOiJBMg" name="PhysicianofRecordParticipantAssignedEntityHasNationalProviderId" constrainedElement="_Ao2HkOaHEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SHUX8n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->excluding(null)->reject(id->exists( root='2.16.840.1.113883.4.6' ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_79fAQF9xEey5t-mahoHmrg" name="PhysicianofRecordParticipantAssignedEntityAssignedPerson" constrainedElement="_Ao2HkOaHEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_79fAQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SHUX833sEeyivuDeOiJBMg" name="PhysicianofRecordParticipantAssignedEntityAssignedPerson" constrainedElement="_Ao2HkOaHEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SHUX9H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->excluding(null)->reject(assignedPerson->one(assignedPerson : cda::Person | not assignedPerson.oclIsUndefined() and assignedPerson.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_79fAQl9xEey5t-mahoHmrg" name="PhysicianofRecordParticipant2AssignedEntityRepresentedOrganization" constrainedElement="_Ao2HkOaHEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_79fAQ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SHU_AH3sEeyivuDeOiJBMg" name="PhysicianofRecordParticipant2AssignedEntityRepresentedOrganization" constrainedElement="_Ao2HkOaHEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SHU_AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedEntity->excluding(null)->reject(representedOrganization->one(representedOrganization : cda::Organization | not representedOrganization.oclIsUndefined() and representedOrganization.oclIsKindOf(cda::Organization)))</body>
         </specification>
@@ -29220,108 +29220,108 @@ The priority of the activity to the patient and provider is communicated through
           <body>(not code.oclIsUndefined() and code.isNullFlavorUndefined()) implies (code.codeSystem = '2.16.840.1.113883.6.1' or code.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x4ma8l9xEey5t-mahoHmrg" name="PlannedAct2TemplateId" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x4ma819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JAeIMH3sEeyivuDeOiJBMg" name="PlannedAct2TemplateId" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JAeIMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.39' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x4oQIF9xEey5t-mahoHmrg" name="PlanOfCareActivityActMoodCode" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x4oQIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JAfWUH3sEeyivuDeOiJBMg" name="PlanOfCareActivityActMoodCode" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JAfWUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentActMood) and 
 let value : vocab::x_DocumentActMood = self.moodCode.oclAsType(vocab::x_DocumentActMood) in 
 value = vocab::x_DocumentActMood::INT or value = vocab::x_DocumentActMood::ARQ or value = vocab::x_DocumentActMood::PRMS or value = vocab::x_DocumentActMood::PRP or value = vocab::x_DocumentActMood::RQO</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x5J0kF9xEey5t-mahoHmrg" name="PlannedAct2Code" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x5KboF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JA8CQH3sEeyivuDeOiJBMg" name="PlannedAct2Code" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JA8CQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x5LCsF9xEey5t-mahoHmrg" name="PlannedAct2StatusCode" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x5LCsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JA8pUH3sEeyivuDeOiJBMg" name="PlannedAct2StatusCode" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JA8pUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'active')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x5M34F9xEey5t-mahoHmrg" name="PlannedAct2StatusCodeP" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x5M34V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JA93cH3sEeyivuDeOiJBMg" name="PlannedAct2StatusCodeP" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JA93cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x5OGAF9xEey5t-mahoHmrg" name="PlannedAct2EffectiveTime" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x5OGAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JA_FkH3sEeyivuDeOiJBMg" name="PlannedAct2EffectiveTime" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JA_FkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x5t1QF9xEey5t-mahoHmrg" name="PlannedAct2Indication2" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x5t1QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JBdmsH3sEeyivuDeOiJBMg" name="PlannedAct2Indication2" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JBdmsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x6NkgF9xEey5t-mahoHmrg" name="PlannedAct2Instruction2" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x6NkgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JB9V8H3sEeyivuDeOiJBMg" name="PlannedAct2Instruction2" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JB9V8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instruction2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x6t60F9xEey5t-mahoHmrg" name="PlannedAct2AuthorParticipation" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x6t60V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JCZa0H3sEeyivuDeOiJBMg" name="PlannedAct2AuthorParticipation" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JCZa0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->one(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x7ORIF9xEey5t-mahoHmrg" name="PlannedAct2Performer" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x7ORIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JC3U4H3sEeyivuDeOiJBMg" name="PlannedAct2Performer" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JC3U4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->exists(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(rim::Participation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3crukF9xEey5t-mahoHmrg" name="PlannedAct2PriorityPreference" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3crukV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_N4uQkH3sEeyivuDeOiJBMg" name="PlannedAct2PriorityPreference" constrainedElement="_lLnRMOaYEeOmzetP5oaH3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_N4uQkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PriorityPreference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_lLn4QOaYEeOmzetP5oaH3A" general="_2NWE5xSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_x5t1Ql9xEey5t-mahoHmrg" name="getIndication2s" bodyCondition="_x5t1RV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_x5t1RV9xEey5t-mahoHmrg" name="body" constrainedElement="_x5t1Ql9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_x5t1Rl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JBdmsn3sEeyivuDeOiJBMg" name="getIndication2s" bodyCondition="_JBdmtX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JBdmtX3sEeyivuDeOiJBMg" name="body" constrainedElement="_JBdmsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JBeNwH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication2)).oclAsType(consol::Indication2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_x5t1Q19xEey5t-mahoHmrg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x5t1RF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JBdms33sEeyivuDeOiJBMg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JBdmtH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_x6Nkgl9xEey5t-mahoHmrg" name="getInstruction2s" bodyCondition="_x6NkhV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_x6NkhV9xEey5t-mahoHmrg" name="body" constrainedElement="_x6Nkgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_x6Nkhl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JB9V8n3sEeyivuDeOiJBMg" name="getInstruction2s" bodyCondition="_JB9V9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JB9V9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_JB9V8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JB9V9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instruction2)).oclAsType(consol::Instruction2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_x6Nkg19xEey5t-mahoHmrg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x6NkhF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JB9V833sEeyivuDeOiJBMg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JB9V9H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3crukl9xEey5t-mahoHmrg" name="getPriorityPreferences" bodyCondition="_3crulV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3crulV9xEey5t-mahoHmrg" name="body" constrainedElement="_3crukl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3crull9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_N4uQkn3sEeyivuDeOiJBMg" name="getPriorityPreferences" bodyCondition="_N4uQlX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_N4uQlX3sEeyivuDeOiJBMg" name="body" constrainedElement="_N4uQkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_N4uQln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PriorityPreference)).oclAsType(consol::PriorityPreference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3cruk19xEey5t-mahoHmrg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3crulF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_N4uQk33sEeyivuDeOiJBMg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_N4uQlH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -29335,122 +29335,122 @@ value.code = 'active')</body>
           <body>self.participant->select(par : cda::Participant2 | par.participantRole.oclIsTypeOf(consol::ServiceDeliveryLocation))->forAll(pars : cda::Participant2 | pars.typeCode=vocab::ParticipationType::LOC)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x7O4MF9xEey5t-mahoHmrg" name="PlannedEncounter2TemplateId" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x7O4MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JC3U4n3sEeyivuDeOiJBMg" name="PlannedEncounter2TemplateId" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JC3U433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.40' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x7QGUF9xEey5t-mahoHmrg" name="PlanOfCareActivityEncounterMoodCode" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x7QGUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JC4jAH3sEeyivuDeOiJBMg" name="PlanOfCareActivityEncounterMoodCode" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JC4jAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentEncounterMood) and 
 let value : vocab::x_DocumentEncounterMood = self.moodCode.oclAsType(vocab::x_DocumentEncounterMood) in 
 value = vocab::x_DocumentEncounterMood::INT or value = vocab::x_DocumentEncounterMood::ARQ or value = vocab::x_DocumentEncounterMood::PRMS or value = vocab::x_DocumentEncounterMood::PRP or value = vocab::x_DocumentEncounterMood::RQO or value = vocab::x_DocumentEncounterMood::APT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x8QL4F9xEey5t-mahoHmrg" name="PlannedEncounter2CodeP" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x8QL4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JDzJAH3sEeyivuDeOiJBMg" name="PlannedEncounter2CodeP" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JDzJAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x7wcoF9xEey5t-mahoHmrg" name="PlannedEncounter2Code" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x7wcoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JDV2AH3sEeyivuDeOiJBMg" name="PlannedEncounter2Code" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JDV2AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x8vUEF9xEey5t-mahoHmrg" name="PlannedEncounter2StatusCode" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x8vUEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JEPN4H3sEeyivuDeOiJBMg" name="PlannedEncounter2StatusCode" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JEPN4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'active')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x8wiMF9xEey5t-mahoHmrg" name="PlannedEncounter2StatusCodeP" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x8wiMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JEQcAH3sEeyivuDeOiJBMg" name="PlannedEncounter2StatusCodeP" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JEQcAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x8yXYF9xEey5t-mahoHmrg" name="PlannedEncounter2EffectiveTime" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x8yXYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JERqIH3sEeyivuDeOiJBMg" name="PlannedEncounter2EffectiveTime" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JERqIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x9Ui4F9xEey5t-mahoHmrg" name="PlannedEncounter2Performer" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x9Ui4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JEvkMH3sEeyivuDeOiJBMg" name="PlannedEncounter2Performer" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JEvkMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->exists(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x-UBYF9xEey5t-mahoHmrg" name="PlannedEncounter2ServiceDeliveryLocation" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x-UBYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JFrYUH3sEeyivuDeOiJBMg" name="PlannedEncounter2ServiceDeliveryLocation" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JFrYUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant2 | not participant.participantRole.oclIsUndefined() and participant.participantRole.oclIsKindOf(consol::ServiceDeliveryLocation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x-x7cF9xEey5t-mahoHmrg" name="PlannedEncounter2PriorityPreference" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x-x7cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JGIEQH3sEeyivuDeOiJBMg" name="PlannedEncounter2PriorityPreference" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JGIEQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PriorityPreference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x_P1gF9xEey5t-mahoHmrg" name="PlannedEncounter2Indication2" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x_P1gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JGhs4H3sEeyivuDeOiJBMg" name="PlannedEncounter2Indication2" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JGhs4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3dJooF9xEey5t-mahoHmrg" name="PlannedEncounter2AuthorParticipation" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3dJooV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_N5NYwH3sEeyivuDeOiJBMg" name="PlannedEncounter2AuthorParticipation" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_N5NYwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_79-vgF9xEey5t-mahoHmrg" name="PlannedEncounter2PerformerAssignedEntity" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_79-vgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SH7b8H3sEeyivuDeOiJBMg" name="PlannedEncounter2PerformerAssignedEntity" constrainedElement="_bDPFMOdXEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SH7b8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(rim::Role)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_bDRhcOdXEeOqBOMhgDlycQ" general="_2NWFBBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_x-UBYl9xEey5t-mahoHmrg" name="getServiceDeliveryLocations" bodyCondition="_x-UBZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_x-UBZV9xEey5t-mahoHmrg" name="body" constrainedElement="_x-UBYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_x-UBZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JFrYUn3sEeyivuDeOiJBMg" name="getServiceDeliveryLocations" bodyCondition="_JFrYVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JFrYVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_JFrYUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JFrYVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getParticipantRoles()->select(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(consol::ServiceDeliveryLocation)).oclAsType(consol::ServiceDeliveryLocation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_x-UBY19xEey5t-mahoHmrg" type="_2LiHABSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x-UBZF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JFrYU33sEeyivuDeOiJBMg" type="_2LiHABSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JFrYVH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_x-yigF9xEey5t-mahoHmrg" name="getPriorityPreference" bodyCondition="_x-yig19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_x-yig19xEey5t-mahoHmrg" name="body" constrainedElement="_x-yigF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_x-yihF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JGIEQn3sEeyivuDeOiJBMg" name="getPriorityPreference" bodyCondition="_JGIERX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JGIERX3sEeyivuDeOiJBMg" name="body" constrainedElement="_JGIEQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JGIERn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PriorityPreference))->asSequence()->any(true).oclAsType(consol::PriorityPreference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_x-yigV9xEey5t-mahoHmrg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x-yigl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_JGIEQ33sEeyivuDeOiJBMg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JGIERH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_x_QckF9xEey5t-mahoHmrg" name="getIndication2s" bodyCondition="_x_Qck19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_x_Qck19xEey5t-mahoHmrg" name="body" constrainedElement="_x_QckF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_x_QclF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JGiT8H3sEeyivuDeOiJBMg" name="getIndication2s" bodyCondition="_JGiT833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JGiT833sEeyivuDeOiJBMg" name="body" constrainedElement="_JGiT8H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JGiT9H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication2)).oclAsType(consol::Indication2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_x_QckV9xEey5t-mahoHmrg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x_Qckl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JGiT8X3sEeyivuDeOiJBMg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JGiT8n3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -29460,159 +29460,159 @@ value.code = 'active')</body>
 The importance of the planned observation to the patient and provider is communicated through Priority Preference. The effectiveTime indicates the time when the observation is intended to take place and authorTime indicates when the documentation of the plan occurred. &#xD;
 The Planned Observation template may also indicate the potential insurance coverage for the observation.</body>
       </ownedComment>
-      <ownedRule xmi:id="_x_QclV9xEey5t-mahoHmrg" name="PlannedObservation2TemplateId" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x_Qcll9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JGiT9X3sEeyivuDeOiJBMg" name="PlannedObservation2TemplateId" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JGiT9n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.44' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x_RqsF9xEey5t-mahoHmrg" name="PlanOfCareActivityObservationMoodCode" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x_RqsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JGjiEH3sEeyivuDeOiJBMg" name="PlanOfCareActivityObservationMoodCode" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JGjiEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_ActMoodDocumentObservation) and 
 let value : vocab::x_ActMoodDocumentObservation = self.moodCode.oclAsType(vocab::x_ActMoodDocumentObservation) in 
 value = vocab::x_ActMoodDocumentObservation::INT or value = vocab::x_ActMoodDocumentObservation::GOL or value = vocab::x_ActMoodDocumentObservation::PRMS or value = vocab::x_ActMoodDocumentObservation::PRP or value = vocab::x_ActMoodDocumentObservation::RQO</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x_0dQF9xEey5t-mahoHmrg" name="PlannedObservation2CodeP" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x_0dQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JG_m8H3sEeyivuDeOiJBMg" name="PlannedObservation2CodeP" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JG_m8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x_yoEF9xEey5t-mahoHmrg" name="PlannedObservation2Code" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x_yoEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JG-_4H3sEeyivuDeOiJBMg" name="PlannedObservation2Code" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JG-_4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x_1EUF9xEey5t-mahoHmrg" name="PlannedObservation2StatusCode" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x_1EUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JHA1EH3sEeyivuDeOiJBMg" name="PlannedObservation2StatusCode" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JHA1EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'active')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x_25gF9xEey5t-mahoHmrg" name="PlannedObservation2StatusCodeP" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x_25gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JHCDMH3sEeyivuDeOiJBMg" name="PlannedObservation2StatusCodeP" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JHCDMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x_4HoF9xEey5t-mahoHmrg" name="PlannedObservation2EffectiveTime" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x_4HoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JHDRUH3sEeyivuDeOiJBMg" name="PlannedObservation2EffectiveTime" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JHDRUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x_580F9xEey5t-mahoHmrg" name="PlannedObservation2Value" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x_580V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JHFGgH3sEeyivuDeOiJBMg" name="PlannedObservation2Value" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JHFGgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (( not self.value->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x_7K8F9xEey5t-mahoHmrg" name="PlannedObservation2MethodCode" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x_7K8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JHGUoH3sEeyivuDeOiJBMg" name="PlannedObservation2MethodCode" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JHGUoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.methodCode->isEmpty() or self.methodCode->exists(element | element.isNullFlavorUndefined())) implies (( not self.methodCode->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yAa6MF9xEey5t-mahoHmrg" name="PlannedObservation2TargetSiteCodeP" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yAa6MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JHiZgH3sEeyivuDeOiJBMg" name="PlannedObservation2TargetSiteCodeP" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JHiZgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (not self.targetSiteCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_x_8ZEF9xEey5t-mahoHmrg" name="PlannedObservation2TargetSiteCode" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_x_9AIF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JHG7sH3sEeyivuDeOiJBMg" name="PlannedObservation2TargetSiteCode" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JHG7sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (self.targetSiteCode->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yBaYsF9xEey5t-mahoHmrg" name="PlannedObservation2Performer" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yBaYsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JIc_gH3sEeyivuDeOiJBMg" name="PlannedObservation2Performer" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JIc_gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->exists(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(rim::Participation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yB6vAF9xEey5t-mahoHmrg" name="PlannedObservation2AuthorParticipation" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yB6vAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JI2oIH3sEeyivuDeOiJBMg" name="PlannedObservation2AuthorParticipation" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JI2oIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yCZ3MF9xEey5t-mahoHmrg" name="PlannedObservation2PriorityPreference" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yCZ3MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JJRe4H3sEeyivuDeOiJBMg" name="PlannedObservation2PriorityPreference" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JJRe4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PriorityPreference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yC4YUF9xEey5t-mahoHmrg" name="PlannedObservation2Indication2" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yC4YUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JJvY8H3sEeyivuDeOiJBMg" name="PlannedObservation2Indication2" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JJvY8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yDUdMF9xEey5t-mahoHmrg" name="PlannedObservation2Instruction2" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yDUdMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JKLd0H3sEeyivuDeOiJBMg" name="PlannedObservation2Instruction2" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JKLd0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instruction2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yD0zgF9xEey5t-mahoHmrg" name="PlannedObservation2PlannedCoverage" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yD0zgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JKkfYH3sEeyivuDeOiJBMg" name="PlannedObservation2PlannedCoverage" constrainedElement="_jKZssOdvEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JKlGcH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::PlannedCoverage) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_jKZssedvEeOqBOMhgDlycQ" general="_2NcLjhSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_yCZ3Ml9xEey5t-mahoHmrg" name="getPriorityPreferences" bodyCondition="_yCZ3NV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yCZ3NV9xEey5t-mahoHmrg" name="body" constrainedElement="_yCZ3Ml9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yCZ3Nl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JJRe4n3sEeyivuDeOiJBMg" name="getPriorityPreferences" bodyCondition="_JJRe5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JJRe5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_JJRe4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JJRe5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PriorityPreference)).oclAsType(consol::PriorityPreference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yCZ3M19xEey5t-mahoHmrg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yCZ3NF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JJRe433sEeyivuDeOiJBMg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JJRe5H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_yC4YUl9xEey5t-mahoHmrg" name="getIndication2s" bodyCondition="_yC4YVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yC4YVV9xEey5t-mahoHmrg" name="body" constrainedElement="_yC4YUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yC4YVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JJvY8n3sEeyivuDeOiJBMg" name="getIndication2s" bodyCondition="_JJvY9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JJvY9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_JJvY8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JJvY9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication2)).oclAsType(consol::Indication2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yC4YU19xEey5t-mahoHmrg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yC4YVF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JJvY833sEeyivuDeOiJBMg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JJvY9H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_yDUdMl9xEey5t-mahoHmrg" name="getInstruction2s" bodyCondition="_yDUdNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yDUdNV9xEey5t-mahoHmrg" name="body" constrainedElement="_yDUdMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yDUdNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JKLd0n3sEeyivuDeOiJBMg" name="getInstruction2s" bodyCondition="_JKME4X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JKME4X3sEeyivuDeOiJBMg" name="body" constrainedElement="_JKLd0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JKME4n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instruction2)).oclAsType(consol::Instruction2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yDUdM19xEey5t-mahoHmrg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yDUdNF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JKLd033sEeyivuDeOiJBMg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JKME4H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_yD0zgl9xEey5t-mahoHmrg" name="getPlannedCoverages" bodyCondition="_yD0zhV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yD0zhV9xEey5t-mahoHmrg" name="body" constrainedElement="_yD0zgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yD0zhl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JKlGcX3sEeyivuDeOiJBMg" name="getPlannedCoverages" bodyCondition="_JKlGdH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JKlGdH3sEeyivuDeOiJBMg" name="body" constrainedElement="_JKlGcX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JKlGdX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PlannedCoverage)).oclAsType(consol::PlannedCoverage)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yD0zg19xEey5t-mahoHmrg" type="_O2I3AI9DEeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yD0zhF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JKlGcn3sEeyivuDeOiJBMg" type="_O2I3AI9DEeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JKlGc33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -29638,145 +29638,145 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
           <body>self.entryRelationship->select(er : cda::EntryRelationship | er.act.oclIsTypeOf(consol::Instruction2))->forAll(ent : cda::EntryRelationship | ent.inversionInd=true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yD1akF9xEey5t-mahoHmrg" name="PlannedProcedure2TemplateId" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yD1akV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JKlGdn3sEeyivuDeOiJBMg" name="PlannedProcedure2TemplateId" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JKlGd33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.41' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yD2osF9xEey5t-mahoHmrg" name="PlanOfCareActivityProcedureMoodCode" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yD2osV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JKm7oH3sEeyivuDeOiJBMg" name="PlanOfCareActivityProcedureMoodCode" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JKm7oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentProcedureMood) and 
 let value : vocab::x_DocumentProcedureMood = self.moodCode.oclAsType(vocab::x_DocumentProcedureMood) in 
 value = vocab::x_DocumentProcedureMood::INT or value = vocab::x_DocumentProcedureMood::ARQ or value = vocab::x_DocumentProcedureMood::PRMS or value = vocab::x_DocumentProcedureMood::PRP or value = vocab::x_DocumentProcedureMood::RQO</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yEYNIF9xEey5t-mahoHmrg" name="PlannedProcedure2Code" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yEYNIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JLByYH3sEeyivuDeOiJBMg" name="PlannedProcedure2Code" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JLByYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yEZbQF9xEey5t-mahoHmrg" name="PlannedProcedure2StatusCode" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yEZbQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JLCZcH3sEeyivuDeOiJBMg" name="PlannedProcedure2StatusCode" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JLCZcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'active')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yEapYF9xEey5t-mahoHmrg" name="PlannedProcedure2StatusCodeP" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yEapYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JLDnkH3sEeyivuDeOiJBMg" name="PlannedProcedure2StatusCodeP" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JLDnkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yEcekF9xEey5t-mahoHmrg" name="PlannedProcedure2EffectiveTime" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yEcekV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JLE1sH3sEeyivuDeOiJBMg" name="PlannedProcedure2EffectiveTime" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JLE1sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yEdssF9xEey5t-mahoHmrg" name="PlannedProcedure2MethodCode" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yEdssV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JLGD0H3sEeyivuDeOiJBMg" name="PlannedProcedure2MethodCode" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JLGD0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.methodCode->isEmpty() or self.methodCode->exists(element | element.isNullFlavorUndefined())) implies (not self.methodCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yE-qEF9xEey5t-mahoHmrg" name="PlannedProcedure2TargetSiteCodeP" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yE-qEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JLivwH3sEeyivuDeOiJBMg" name="PlannedProcedure2TargetSiteCodeP" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JLivwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (not self.targetSiteCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yEe60F9xEey5t-mahoHmrg" name="PlannedProcedure2TargetSiteCode" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yEe60V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JLHR8H3sEeyivuDeOiJBMg" name="PlannedProcedure2TargetSiteCode" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JLHR8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (self.targetSiteCode->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yF_9wF9xEey5t-mahoHmrg" name="PlannedProcedure2Performer" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yF_9wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JMYdQH3sEeyivuDeOiJBMg" name="PlannedProcedure2Performer" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JMYdQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->exists(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(rim::Participation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yGee4F9xEey5t-mahoHmrg" name="PlannedProcedure2AuthorParticipation" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yGee4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JM5aoH3sEeyivuDeOiJBMg" name="PlannedProcedure2AuthorParticipation" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JM5aoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->one(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yG-OIF9xEey5t-mahoHmrg" name="PlannedProcedure2PriorityPreference" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yG-OIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JNU4cH3sEeyivuDeOiJBMg" name="PlannedProcedure2PriorityPreference" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JNU4cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PriorityPreference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yHcvQF9xEey5t-mahoHmrg" name="PlannedProcedure2Indication2" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yHcvQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JNxkYH3sEeyivuDeOiJBMg" name="PlannedProcedure2Indication2" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JNxkYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yH8egF9xEey5t-mahoHmrg" name="PlannedProcedure2Instruction2" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yH8egV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JOO3YH3sEeyivuDeOiJBMg" name="PlannedProcedure2Instruction2" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JOO3YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instruction2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yInM4F9xEey5t-mahoHmrg" name="PlannedProcedure2PlannedCoverage" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yInM4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JOpuIH3sEeyivuDeOiJBMg" name="PlannedProcedure2PlannedCoverage" constrainedElement="_cs0YsOeEEeOqBOMhgDlycQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JOpuIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::PlannedCoverage) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_cs0YseeEEeOqBOMhgDlycQ" general="_2NiSKhSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_yG-OIl9xEey5t-mahoHmrg" name="getPriorityPreferences" bodyCondition="_yG-OJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yG-OJV9xEey5t-mahoHmrg" name="body" constrainedElement="_yG-OIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yG-OJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JNU4cn3sEeyivuDeOiJBMg" name="getPriorityPreferences" bodyCondition="_JNU4dX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JNU4dX3sEeyivuDeOiJBMg" name="body" constrainedElement="_JNU4cn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JNU4dn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PriorityPreference)).oclAsType(consol::PriorityPreference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yG-OI19xEey5t-mahoHmrg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yG-OJF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JNU4c33sEeyivuDeOiJBMg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JNU4dH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_yHcvQl9xEey5t-mahoHmrg" name="getIndication2s" bodyCondition="_yHcvRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yHcvRV9xEey5t-mahoHmrg" name="body" constrainedElement="_yHcvQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yHcvRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JNyLcH3sEeyivuDeOiJBMg" name="getIndication2s" bodyCondition="_JNyLc33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JNyLc33sEeyivuDeOiJBMg" name="body" constrainedElement="_JNyLcH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JNyLdH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication2)).oclAsType(consol::Indication2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yHcvQ19xEey5t-mahoHmrg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yHcvRF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JNyLcX3sEeyivuDeOiJBMg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JNyLcn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_yH9FkF9xEey5t-mahoHmrg" name="getInstruction2s" bodyCondition="_yH9Fk19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yH9Fk19xEey5t-mahoHmrg" name="body" constrainedElement="_yH9FkF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yH9FlF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JOO3Yn3sEeyivuDeOiJBMg" name="getInstruction2s" bodyCondition="_JOO3ZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JOO3ZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_JOO3Yn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JOO3Zn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instruction2)).oclAsType(consol::Instruction2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yH9FkV9xEey5t-mahoHmrg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yH9Fkl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JOO3Y33sEeyivuDeOiJBMg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JOO3ZH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_yInM4l9xEey5t-mahoHmrg" name="getPlannedCoverages" bodyCondition="_yInM5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yInM5V9xEey5t-mahoHmrg" name="body" constrainedElement="_yInM4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yInM5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JOqVMH3sEeyivuDeOiJBMg" name="getPlannedCoverages" bodyCondition="_JOqVM33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JOqVM33sEeyivuDeOiJBMg" name="body" constrainedElement="_JOqVMH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JOqVNH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PlannedCoverage)).oclAsType(consol::PlannedCoverage)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yInM419xEey5t-mahoHmrg" type="_O2I3AI9DEeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yInM5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JOqVMX3sEeyivuDeOiJBMg" type="_O2I3AI9DEeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JOqVMn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -29826,218 +29826,218 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
           <body>self.effectiveTime->select(ef | ef.oclIsTypeOf(datatypes::PIVL_TS) or ef.oclIsTypeOf(datatypes::EIVL_TS))->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yInz8F9xEey5t-mahoHmrg" name="PlannedMedicationActivity2TemplateId" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yInz8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JOq8QH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2TemplateId" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JOq8QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.42' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yIppIF9xEey5t-mahoHmrg" name="PlanOfCareActivitySubstanceAdministrationMoodCode" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yIppIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JOtYgH3sEeyivuDeOiJBMg" name="PlanOfCareActivitySubstanceAdministrationMoodCode" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JOtYgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentSubstanceMood) and 
 let value : vocab::x_DocumentSubstanceMood = self.moodCode.oclAsType(vocab::x_DocumentSubstanceMood) in 
 value = vocab::x_DocumentSubstanceMood::INT or value = vocab::x_DocumentSubstanceMood::PRMS or value = vocab::x_DocumentSubstanceMood::PRP or value = vocab::x_DocumentSubstanceMood::RQO</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yJKmgF9xEey5t-mahoHmrg" name="PlannedMedicationActivity2StatusCode" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yJKmgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JPJdYH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2StatusCode" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JPJdYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'active')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yJMbsF9xEey5t-mahoHmrg" name="PlannedMedicationActivity2StatusCodeP" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yJMbsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JPKrgH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2StatusCodeP" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JPKrgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yJNp0F9xEey5t-mahoHmrg" name="PlannedMedicationActivity2RepeatNumber" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yJNp0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JPL5oH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2RepeatNumber" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JPL5oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.repeatNumber.oclIsUndefined() or self.repeatNumber.isNullFlavorUndefined()) implies (not self.repeatNumber.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yJv1UF9xEey5t-mahoHmrg" name="PlannedMedicationActivity2RouteCodeP" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yJv1UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JPro4H3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2RouteCodeP" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JPro4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.routeCode.oclIsUndefined() or self.routeCode.isNullFlavorUndefined()) implies (not self.routeCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yJO38F9xEey5t-mahoHmrg" name="PlannedMedicationActivity2RouteCode" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yJO38V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JPNHwH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2RouteCode" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JPNHwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.routeCode.oclIsUndefined() or self.routeCode.isNullFlavorUndefined()) implies (not self.routeCode.oclIsUndefined() and self.routeCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.routeCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.3.26.1.1' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yKvT0F9xEey5t-mahoHmrg" name="PlannedMedicationActivity2ApproachSiteCodeP" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yKvT0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JQikgH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2ApproachSiteCodeP" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JQikgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.approachSiteCode->isEmpty() or self.approachSiteCode->exists(element | element.isNullFlavorUndefined())) implies (not self.approachSiteCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yKNIUF9xEey5t-mahoHmrg" name="PlannedMedicationActivity2ApproachSiteCode" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yKNIUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JQF4kH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2ApproachSiteCode" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JQF4kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.approachSiteCode->isEmpty() or self.approachSiteCode->exists(element | element.isNullFlavorUndefined())) implies (self.approachSiteCode->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yLQRMF9xEey5t-mahoHmrg" name="PlannedMedicationActivity2DoseQuantity" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yLQRMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JQ-pYH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2DoseQuantity" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JQ-pYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.doseQuantity.oclIsUndefined() or self.doseQuantity.isNullFlavorUndefined()) implies (not self.doseQuantity.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yLRfUF9xEey5t-mahoHmrg" name="PlannedMedicationActivity2RateQuantity" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yLRfUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JQ_QcH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2RateQuantity" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JQ_QcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.rateQuantity.oclIsUndefined() or self.rateQuantity.isNullFlavorUndefined()) implies (not self.rateQuantity.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yLSGYF9xEey5t-mahoHmrg" name="PlannedMedicationActivity2MaxDoseQuantity" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yLSGYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JQ_3gH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2MaxDoseQuantity" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JQ_3gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.maxDoseQuantity.oclIsUndefined() or self.maxDoseQuantity.isNullFlavorUndefined()) implies (not self.maxDoseQuantity.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yL0R4F9xEey5t-mahoHmrg" name="PlannedMedicationActivity2AdministrationUnitCodeP" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yL0R4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JRb8YH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2AdministrationUnitCodeP" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JRb8YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.administrationUnitCode.oclIsUndefined() or self.administrationUnitCode.isNullFlavorUndefined()) implies (not self.administrationUnitCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yLTUgF9xEey5t-mahoHmrg" name="PlannedMedicationActivity2AdministrationUnitCode" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yLTUgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JRBFoH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2AdministrationUnitCode" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JRBFoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.administrationUnitCode.oclIsUndefined() or self.administrationUnitCode.isNullFlavorUndefined()) implies (not self.administrationUnitCode.oclIsUndefined() and self.administrationUnitCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.administrationUnitCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.85' and (value.code = 'APPFUL' or value.code = 'DROP' or value.code = 'NDROP' or value.code = 'OPDROP' or value.code = 'ORDROP' or value.code = 'OTDROP' or value.code = 'PUFF' or value.code = 'SCOOP' or value.code = 'SPRY'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yNz18F9xEey5t-mahoHmrg" name="PlannedMedicationActivity2Performer" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yNz18V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JTQhUH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2Performer" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JTQhUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->exists(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(rim::Participation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yORwAF9xEey5t-mahoHmrg" name="PlannedMedicationActivity2AuthorParticipation" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yORwAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JTpi4H3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2AuthorParticipation" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JTqJ8H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->one(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yOw4MF9xEey5t-mahoHmrg" name="PlannedMedicationActivity2PriorityPreference" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yOw4MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JUDLgH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2PriorityPreference" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JUDLgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PriorityPreference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yPM9EF9xEey5t-mahoHmrg" name="PlannedMedicationActivity2Indication2" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yPM9EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JUc0IH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2Indication2" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JUc0IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yPssUF9xEey5t-mahoHmrg" name="PlannedMedicationActivity2Instruction2" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yPssUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JU2cwH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2Instruction2" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JU2cwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instruction2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yQJ_UF9xEey5t-mahoHmrg" name="PlannedMedicationActivity2Consumable" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yQJ_UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JVQscH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2Consumable" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JVQscX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.consumable->one(consumable : cda::Consumable | not consumable.oclIsUndefined() and consumable.oclIsKindOf(cda::Consumable))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_26gOkF9xEey5t-mahoHmrg" name="PlannedMedicationActivity2Precondition" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_26gOkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Na2BwH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2Precondition" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Na2BwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.precondition->exists(precondition : cda::Precondition | not precondition.oclIsUndefined() and precondition.oclIsKindOf(cda::Precondition))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7-fs4F9xEey5t-mahoHmrg" name="PlannedMedicationActivity2CETranslationP" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7-fs4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SIh44H3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2CETranslationP" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SIh44X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.priorityCode->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (not translation->isEmpty()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7-gT8F9xEey5t-mahoHmrg" name="PlannedMedicationActivity2CETranslation" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7-gT8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SIif8H3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2CETranslation" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SIif8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.priorityCode->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7-g7AF9xEey5t-mahoHmrg" name="PlannedMedicationActivity2IVLPQdoseQuantityUnit" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7-g7AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SIif8n3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2IVLPQdoseQuantityUnit" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SIif833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.doseQuantity->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not unit.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7-g7Al9xEey5t-mahoHmrg" name="PlannedMedicationActivity2IVLPQrateQuantityUnit" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7-g7A19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SIjHAH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2IVLPQrateQuantityUnit" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SIjHAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.doseQuantity->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not unit.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7_BRUF9xEey5t-mahoHmrg" name="PlannedMedicationActivity2ConsumableMedicationInformation2" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7_BRUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SJNOUH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2ConsumableMedicationInformation2" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SJNOUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.consumable->excluding(null)->reject(manufacturedProduct->one(manufacturedProduct : cda::ManufacturedProduct | not manufacturedProduct.oclIsUndefined() and manufacturedProduct.oclIsKindOf(consol::MedicationInformation2)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7_hnoF9xEey5t-mahoHmrg" name="PlannedMedicationActivity2PreconditionTypeCode" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7_hnoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SJydIH3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2PreconditionTypeCode" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SJydIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.precondition->excluding(null)->reject(isDefined('typeCode') and typeCode=vocab::ActRelationshipType::PRCN)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_7_hnol9xEey5t-mahoHmrg" name="PlannedMedicationActivity2PreconditionPreconditionForSubstanceAdministration2" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_7_hno19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SJydIn3sEeyivuDeOiJBMg" name="PlannedMedicationActivity2PreconditionPreconditionForSubstanceAdministration2" constrainedElement="_Yj45YOgREeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SJydI33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.precondition->excluding(null)->reject(criterion->one(criterion : cda::Criterion | not criterion.oclIsUndefined() and criterion.oclIsKindOf(consol::PreconditionForSubstanceAdministration2)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_Yj5gcOgREeO-iJTuAv7BKQ" general="_2NoYwxSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_yOw4Ml9xEey5t-mahoHmrg" name="getPriorityPreferences" bodyCondition="_yOw4NV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yOw4NV9xEey5t-mahoHmrg" name="body" constrainedElement="_yOw4Ml9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yOw4Nl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JUDLgn3sEeyivuDeOiJBMg" name="getPriorityPreferences" bodyCondition="_JUDLhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JUDLhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_JUDLgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JUDLhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PriorityPreference)).oclAsType(consol::PriorityPreference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yOw4M19xEey5t-mahoHmrg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yOw4NF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JUDLg33sEeyivuDeOiJBMg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JUDLhH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_yPNkIF9xEey5t-mahoHmrg" name="getIndication2s" bodyCondition="_yPNkI19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yPNkI19xEey5t-mahoHmrg" name="body" constrainedElement="_yPNkIF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yPNkJF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JUc0In3sEeyivuDeOiJBMg" name="getIndication2s" bodyCondition="_JUc0JX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JUc0JX3sEeyivuDeOiJBMg" name="body" constrainedElement="_JUc0In3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JUc0Jn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication2)).oclAsType(consol::Indication2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yPNkIV9xEey5t-mahoHmrg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yPNkIl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JUc0I33sEeyivuDeOiJBMg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JUc0JH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_yPssUl9xEey5t-mahoHmrg" name="getInstruction2s" bodyCondition="_yPssVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yPssVV9xEey5t-mahoHmrg" name="body" constrainedElement="_yPssUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yPssVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JU2cwn3sEeyivuDeOiJBMg" name="getInstruction2s" bodyCondition="_JU2cxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JU2cxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_JU2cwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JU2cxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instruction2)).oclAsType(consol::Instruction2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yPssU19xEey5t-mahoHmrg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yPssVF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JU2cw33sEeyivuDeOiJBMg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JU2cxH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -30053,172 +30053,172 @@ Depending on the type of supply, the product or participant will be either a Med
           <body>( (not product.oclIsUndefined() or participant->size() > 0) and ( (product.manufacturedProduct.oclIsTypeOf(consol::MedicationInformation2)) or (product.manufacturedProduct.oclIsTypeOf(consol::ImmunizationMedicationInformation2)) or (participant.participantRole->select(oclIsTypeOf(consol::ProductInstance))->size() = 1) )) implies ( (product.manufacturedProduct.oclIsTypeOf(consol::MedicationInformation2)) xor (product.manufacturedProduct.oclIsTypeOf(consol::ImmunizationMedicationInformation2)) xor (participant.participantRole->select(oclIsTypeOf(consol::ProductInstance))->size() = 1) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yQKmYF9xEey5t-mahoHmrg" name="PlannedSupply2TemplateId" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yQKmYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JVRTgH3sEeyivuDeOiJBMg" name="PlannedSupply2TemplateId" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JVRTgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.43' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yQL0gF9xEey5t-mahoHmrg" name="PlanOfCareActivitySupplyMoodCode" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yQL0gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JVShoH3sEeyivuDeOiJBMg" name="PlanOfCareActivitySupplyMoodCode" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JVShoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentSubstanceMood) and 
 let value : vocab::x_DocumentSubstanceMood = self.moodCode.oclAsType(vocab::x_DocumentSubstanceMood) in 
 value = vocab::x_DocumentSubstanceMood::INT or value = vocab::x_DocumentSubstanceMood::PRMS or value = vocab::x_DocumentSubstanceMood::PRP or value = vocab::x_DocumentSubstanceMood::RQO</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yQsK0F9xEey5t-mahoHmrg" name="PlannedSupply2StatusCode" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yQsK0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JVxp0H3sEeyivuDeOiJBMg" name="PlannedSupply2StatusCode" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JVxp0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'active')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yQuAAF9xEey5t-mahoHmrg" name="PlannedSupply2StatusCodeP" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yQuAAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JVy38H3sEeyivuDeOiJBMg" name="PlannedSupply2StatusCodeP" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JVy38X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yQvOIF9xEey5t-mahoHmrg" name="PlannedSupply2EffectiveTime" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yQvOIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JV0tIH3sEeyivuDeOiJBMg" name="PlannedSupply2EffectiveTime" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JV0tIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime->isEmpty() or self.effectiveTime->exists(element | element.isNullFlavorUndefined())) implies (( not self.effectiveTime->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yQxDUF9xEey5t-mahoHmrg" name="PlannedSupply2RepeatNumber" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yQxDUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JV17QH3sEeyivuDeOiJBMg" name="PlannedSupply2RepeatNumber" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JV17QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.repeatNumber.oclIsUndefined() or self.repeatNumber.isNullFlavorUndefined()) implies (not self.repeatNumber.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yQyRcF9xEey5t-mahoHmrg" name="PlannedSupply2Quantity" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yQyRcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JV3wcH3sEeyivuDeOiJBMg" name="PlannedSupply2Quantity" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JV3wcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.quantity.oclIsUndefined() or self.quantity.isNullFlavorUndefined()) implies (not self.quantity.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yRTO0F9xEey5t-mahoHmrg" name="PlannedSupply2Product" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yRTO0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JWVDcH3sEeyivuDeOiJBMg" name="PlannedSupply2Product" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JWVDcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.product->one(product : cda::Product | not product.oclIsUndefined() and product.oclIsKindOf(cda::Product))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ySVJkF9xEey5t-mahoHmrg" name="PlannedSupply2Performer" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ySVJkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JXN0QH3sEeyivuDeOiJBMg" name="PlannedSupply2Performer" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JXN0QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->exists(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(rim::Participation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yS040F9xEey5t-mahoHmrg" name="PlannedSupply2AuthorParticipation" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yS1f4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JXoD8H3sEeyivuDeOiJBMg" name="PlannedSupply2AuthorParticipation" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JXorAH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->one(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yTTZ8F9xEey5t-mahoHmrg" name="PlannedSupply2ProductInstance" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yTTZ8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JYDhwH3sEeyivuDeOiJBMg" name="PlannedSupply2ProductInstance" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JYDhwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->one(participant : cda::Participant2 | not participant.participantRole.oclIsUndefined() and participant.participantRole.oclIsKindOf(consol::ProductInstance))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yTx7EF9xEey5t-mahoHmrg" name="PlannedSupply2PriorityPreference" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yTx7EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JYeYgH3sEeyivuDeOiJBMg" name="PlannedSupply2PriorityPreference" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JYeYgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PriorityPreference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yUNY4F9xEey5t-mahoHmrg" name="PlannedSupply2Indication2" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yUNY4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JY4oMH3sEeyivuDeOiJBMg" name="PlannedSupply2Indication2" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JY4oMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yUshEF9xEey5t-mahoHmrg" name="PlannedSupply2Instruction2" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yUshEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JZSQ0H3sEeyivuDeOiJBMg" name="PlannedSupply2Instruction2" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JZSQ0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instruction2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yVH-4F9xEey5t-mahoHmrg" name="PlannedSupply2PlannedCoverage" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yVH-4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JZwx8H3sEeyivuDeOiJBMg" name="PlannedSupply2PlannedCoverage" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JZwx8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::PlannedCoverage) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3drNEF9xEey5t-mahoHmrg" name="PlannedSupply2ProductRecommended" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3drNEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_N5vkQH3sEeyivuDeOiJBMg" name="PlannedSupply2ProductRecommended" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_N5vkQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.product->one(product : cda::Product | not product.oclIsUndefined() and product.oclIsKindOf(rim::Participation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Af4AF9xEey5t-mahoHmrg" name="PlannedSupply2ProductManufacturedProductMedInfo2XorImmunMedInfo2" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Af4AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SK0-8H3sEeyivuDeOiJBMg" name="PlannedSupply2ProductManufacturedProductMedInfo2XorImmunMedInfo2" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SK0-8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.product->excluding(null).manufacturedProduct->excluding(null)->reject(oclIsTypeOf(consol::MedicationInformation2) xor oclIsTypeOf(consol::ImmunizationMedicationInformation2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Af4Al9xEey5t-mahoHmrg" name="PlannedSupply2ProductManufacturedProduct" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Af4A19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SK0-8n3sEeyivuDeOiJBMg" name="PlannedSupply2ProductManufacturedProduct" constrainedElement="_vEd1cOg0EeO-iJTuAv7BKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SK0-833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.product->excluding(null)->reject(manufacturedProduct->one(manufacturedProduct : cda::ManufacturedProduct | not manufacturedProduct.oclIsUndefined() and manufacturedProduct.oclIsKindOf(cda::ManufacturedProduct)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_vEecgOg0EeO-iJTuAv7BKQ" general="_2NoY5BSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_yTTZ8l9xEey5t-mahoHmrg" name="getProductInstance" bodyCondition="_yTTZ9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yTTZ9V9xEey5t-mahoHmrg" name="body" constrainedElement="_yTTZ8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yTTZ9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JYDhwn3sEeyivuDeOiJBMg" name="getProductInstance" bodyCondition="_JYDhxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JYDhxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_JYDhwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JYDhxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getParticipantRoles()->select(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(consol::ProductInstance))->asSequence()->any(true).oclAsType(consol::ProductInstance)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yTTZ819xEey5t-mahoHmrg" type="_2G2bUxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yTTZ9F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_JYDhw33sEeyivuDeOiJBMg" type="_2G2bUxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JYDhxH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_yTx7El9xEey5t-mahoHmrg" name="getPriorityPreferences" bodyCondition="_yTx7FV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yTx7FV9xEey5t-mahoHmrg" name="body" constrainedElement="_yTx7El9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yTx7Fl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JYe_kH3sEeyivuDeOiJBMg" name="getPriorityPreferences" bodyCondition="_JYe_k33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JYe_k33sEeyivuDeOiJBMg" name="body" constrainedElement="_JYe_kH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JYe_lH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PriorityPreference)).oclAsType(consol::PriorityPreference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yTx7E19xEey5t-mahoHmrg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yTx7FF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JYe_kX3sEeyivuDeOiJBMg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JYe_kn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_yUNY4l9xEey5t-mahoHmrg" name="getIndication2s" bodyCondition="_yUNY5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yUNY5V9xEey5t-mahoHmrg" name="body" constrainedElement="_yUNY4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yUNY5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JY4oMn3sEeyivuDeOiJBMg" name="getIndication2s" bodyCondition="_JY4oNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JY4oNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_JY4oMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JY4oNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication2)).oclAsType(consol::Indication2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yUNY419xEey5t-mahoHmrg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yUNY5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JY4oM33sEeyivuDeOiJBMg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JY4oNH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_yUshEl9xEey5t-mahoHmrg" name="getInstruction2s" bodyCondition="_yUshFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yUshFV9xEey5t-mahoHmrg" name="body" constrainedElement="_yUshEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yUshFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JZSQ0n3sEeyivuDeOiJBMg" name="getInstruction2s" bodyCondition="_JZS34n3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JZS34n3sEeyivuDeOiJBMg" name="body" constrainedElement="_JZSQ0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JZS3433sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instruction2)).oclAsType(consol::Instruction2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yUshE19xEey5t-mahoHmrg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yUshFF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JZS34H3sEeyivuDeOiJBMg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JZS34X3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_yVH-4l9xEey5t-mahoHmrg" name="getPlannedCoverages" bodyCondition="_yVH-5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yVH-5V9xEey5t-mahoHmrg" name="body" constrainedElement="_yVH-4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yVH-5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JZwx8n3sEeyivuDeOiJBMg" name="getPlannedCoverages" bodyCondition="_JZwx9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JZwx9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_JZwx8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JZwx9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PlannedCoverage)).oclAsType(consol::PlannedCoverage)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yVH-419xEey5t-mahoHmrg" type="_O2I3AI9DEeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yVH-5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JZwx833sEeyivuDeOiJBMg" type="_O2I3AI9DEeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JZwx9H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -30226,302 +30226,302 @@ value.code = 'active')</body>
       <ownedComment xmi:id="_eTN_UOwlEeOqa975IP2wug">
         <body>A policy activity represents the policy or program providing the coverage. The person for whom payment is being provided (i.e., the patient) is the covered party. The subscriber of the policy or program is represented as a participant that is the holder of the coverage. The payer is represented as the performer of the policy activity.</body>
       </ownedComment>
-      <ownedRule xmi:id="_yVIl8F9xEey5t-mahoHmrg" name="PolicyActivity2TemplateId" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yVIl8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JZxZAH3sEeyivuDeOiJBMg" name="PolicyActivity2TemplateId" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JZxZAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.61' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yVqKYF9xEey5t-mahoHmrg" name="PolicyActivityCodeP" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yVqKYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JaNd4H3sEeyivuDeOiJBMg" name="PolicyActivityCodeP" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JaNd4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yVKbIF9xEey5t-mahoHmrg" name="PolicyActivityCode" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yVKbIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JZynIH3sEeyivuDeOiJBMg" name="PolicyActivityCode" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JZynIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '12' or value.code = '13' or value.code = '14' or value.code = '15' or value.code = '16' or value.code = '41' or value.code = '42' or value.code = '43' or value.code = '47' or value.code = 'AP' or value.code = 'C1' or value.code = 'CO' or value.code = 'CP' or value.code = 'D' or value.code = 'DB' or value.code = 'EP' or value.code = 'FF' or value.code = 'GP' or value.code = 'HM' or value.code = 'HN' or value.code = 'HS' or value.code = 'IN' or value.code = 'IP' or value.code = 'LC' or value.code = 'LD' or value.code = 'LI' or value.code = 'LT' or value.code = 'MA' or value.code = 'MB' or value.code = 'MC' or value.code = 'MH' or value.code = 'MI' or value.code = 'MP' or value.code = 'OT' or value.code = 'PE' or value.code = 'PL' or value.code = 'PP' or value.code = 'PR' or value.code = 'PS' or value.code = 'QM' or value.code = 'RP' or value.code = 'SP' or value.code = 'TF' or value.code = 'WC' or value.code = 'WU')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yWMV4F9xEey5t-mahoHmrg" name="PolicyActivityStatusCodeP" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yWMV4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jao7sH3sEeyivuDeOiJBMg" name="PolicyActivityStatusCodeP" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jao7sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yWKgsF9xEey5t-mahoHmrg" name="PolicyActivityStatusCode" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yWKgsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JantkH3sEeyivuDeOiJBMg" name="PolicyActivityStatusCode" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JantkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yX93gF9xEey5t-mahoHmrg" name="PolicyActivityPayer" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yX93gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JcO3IH3sEeyivuDeOiJBMg" name="PolicyActivityPayer" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JcO3IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->select(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer2))->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87'))->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yZHuEF9xEey5t-mahoHmrg" name="PolicyActivityGuarantor" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yZHuEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JdDWgH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantor" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JdDWgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->select(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer2))->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88'))->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yaGlgF9xEey5t-mahoHmrg" name="PolicyActivityCoverage" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yaGlgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jd7gQH3sEeyivuDeOiJBMg" name="PolicyActivityCoverage" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jd7gQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->select(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))->select(typeCode=vocab::ParticipationType::COV)->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Bf9kF9xEey5t-mahoHmrg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Bf9kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SLuW0H3sEeyivuDeOiJBMg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SLuW0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ( streetAddressLine->size() >=1 and streetAddressLine->size() &lt;=4))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8BgkoF9xEey5t-mahoHmrg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8BgkoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SLuW0n3sEeyivuDeOiJBMg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SLuW033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies state->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8BhLsF9xEey5t-mahoHmrg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8BhLsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SLu94H3sEeyivuDeOiJBMg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SLu94X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies postalCode->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8BhLsl9xEey5t-mahoHmrg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8BhLs19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SLu94n3sEeyivuDeOiJBMg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SLvk8H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::PostalAddressUse) and 
 let value : vocab::PostalAddressUse = element.oclAsType(vocab::PostalAddressUse) in 
 value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or value = vocab::PostalAddressUse::H or value = vocab::PostalAddressUse::HP or value = vocab::PostalAddressUse::HV or value = vocab::PostalAddressUse::PHYS or value = vocab::PostalAddressUse::PST or value = vocab::PostalAddressUse::PUB or value = vocab::PostalAddressUse::TMP or value = vocab::PostalAddressUse::WP) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8BhywF9xEey5t-mahoHmrg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8BhywV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SLvk8X3sEeyivuDeOiJBMg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SLvk8n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Bhywl9xEey5t-mahoHmrg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Bhyw19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SLvk833sEeyivuDeOiJBMg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SLvk9H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((country->isEmpty() or country->exists(element | element.isNullFlavorUndefined())) implies (( not country->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8BiZ0F9xEey5t-mahoHmrg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8BiZ0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SLwMAH3sEeyivuDeOiJBMg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SLwMAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((state->isEmpty() or state->exists(element | element.isNullFlavorUndefined())) implies (( not state->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8BiZ0l9xEey5t-mahoHmrg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8BiZ019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SLwMAn3sEeyivuDeOiJBMg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SLwMA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((city->isEmpty() or city->exists(element | element.isNullFlavorUndefined())) implies (city->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8BjA4F9xEey5t-mahoHmrg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8BjA4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SLwzEH3sEeyivuDeOiJBMg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SLwzEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((postalCode->isEmpty() or postalCode->exists(element | element.isNullFlavorUndefined())) implies (( not postalCode->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8BjA4l9xEey5t-mahoHmrg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8BjA419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SLwzEn3sEeyivuDeOiJBMg" name="PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SLwzE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((streetAddressLine->isEmpty() or streetAddressLine->exists(element | element.isNullFlavorUndefined())) implies (( not streetAddressLine->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Bjn8F9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityAddr" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Bjn8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SLxaIH3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityAddr" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SLxaIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (not addr->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Bjn8l9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntityTelecom" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Bjn819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SLxaIn3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntityTelecom" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SLxaI33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87')).assignedEntity->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8BkPAF9xEey5t-mahoHmrg" name="PolicyActivityPayerTemplateId" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8BkPAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SLxaJH3sEeyivuDeOiJBMg" name="PolicyActivityPayerTemplateId" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SLxaJX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87'))->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87'))->reject(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8BkPAl9xEey5t-mahoHmrg" name="PolicyActivityPayerPayerAssignedEntity" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8BkPA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SLyBMH3sEeyivuDeOiJBMg" name="PolicyActivityPayerPayerAssignedEntity" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SLyBMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87'))->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.87'))->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Ck7oF9xEey5t-mahoHmrg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Ck7oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SMucYH3sEeyivuDeOiJBMg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SMucYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ( streetAddressLine->size() >=1 and streetAddressLine->size() &lt;=4))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Ck7ol9xEey5t-mahoHmrg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Ck7o19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SMvDcH3sEeyivuDeOiJBMg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SMvDcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies state->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8ClisF9xEey5t-mahoHmrg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8ClisV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SMvDcn3sEeyivuDeOiJBMg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SMvDc33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() and country->exists(c : datatypes::ADXP | c.getText() = 'US') implies postalCode->size() >= 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Clisl9xEey5t-mahoHmrg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8CmJwF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SMvqgH3sEeyivuDeOiJBMg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SMvqgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (use->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(vocab::PostalAddressUse) and 
 let value : vocab::PostalAddressUse = element.oclAsType(vocab::PostalAddressUse) in 
 value = vocab::PostalAddressUse::BAD or value = vocab::PostalAddressUse::DIR or value = vocab::PostalAddressUse::H or value = vocab::PostalAddressUse::HP or value = vocab::PostalAddressUse::HV or value = vocab::PostalAddressUse::PHYS or value = vocab::PostalAddressUse::PST or value = vocab::PostalAddressUse::PUB or value = vocab::PostalAddressUse::TMP or value = vocab::PostalAddressUse::WP) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8CmJwV9xEey5t-mahoHmrg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8CmJwl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SMvqgn3sEeyivuDeOiJBMg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SMvqg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (( not use->isEmpty())  )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Cmw0F9xEey5t-mahoHmrg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Cmw0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SMwRkH3sEeyivuDeOiJBMg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SMwRkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((country->isEmpty() or country->exists(element | element.isNullFlavorUndefined())) implies (( not country->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Cmw0l9xEey5t-mahoHmrg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Cmw019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SMwRkn3sEeyivuDeOiJBMg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressState" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SMwRk33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((state->isEmpty() or state->exists(element | element.isNullFlavorUndefined())) implies (( not state->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8CnX4F9xEey5t-mahoHmrg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8CnX4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SMw4oH3sEeyivuDeOiJBMg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SMw4oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((city->isEmpty() or city->exists(element | element.isNullFlavorUndefined())) implies (city->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8CnX4l9xEey5t-mahoHmrg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8CnX419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SMw4on3sEeyivuDeOiJBMg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SMw4o33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((postalCode->isEmpty() or postalCode->exists(element | element.isNullFlavorUndefined())) implies (( not postalCode->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Cn-8F9xEey5t-mahoHmrg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Cn-8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SMxfsH3sEeyivuDeOiJBMg" name="PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SMxfsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null).addr->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((streetAddressLine->isEmpty() or streetAddressLine->exists(element | element.isNullFlavorUndefined())) implies (( not streetAddressLine->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Cn-8l9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityCodeP" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Cn-819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SMxfsn3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityCodeP" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SMxfs33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8ComAF9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityCode" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8ComAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SMxftH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityCode" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SMxftX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.code = 'GUAR' and value.codeSystem = '2.16.840.1.113883.5.110'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8ComAl9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityAddr" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8ComA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SMyGwH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityAddr" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SMyGwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (not addr->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8CpNEF9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntityTelecom" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8CpNEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SMyGwn3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntityTelecom" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SMyGw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88')).assignedEntity->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8CpNEl9xEey5t-mahoHmrg" name="PolicyActivityGuarantorTemplateId" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8CpNE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SMyGxH3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorTemplateId" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SMyGxX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88'))->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88'))->reject(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Cp0IF9xEey5t-mahoHmrg" name="PolicyActivityGuarantorTypeCode" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Cp0IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SMyt0H3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorTypeCode" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SMyt0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88'))->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88'))->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Cp0Il9xEey5t-mahoHmrg" name="PolicyActivityGuarantorGuarantorAssignedEntity" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Cp0I19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SMyt0n3sEeyivuDeOiJBMg" name="PolicyActivityGuarantorGuarantorAssignedEntity" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SMyt033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88'))->select(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.88'))->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8EK3EF9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleCoveragePlayingEntityDateOfBirthInSDTCbirthTime" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8EK3EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SOJ_wH3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleCoveragePlayingEntityDateOfBirthInSDTCbirthTime" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SOJ_wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null).playingEntity->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8ELeIF9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleCoveragePlayingEntityName" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8ELeIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SOJ_wn3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleCoveragePlayingEntityName" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SOJ_w33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null).playingEntity->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8ELeIl9xEey5t-mahoHmrg" name="PolicyActivity2CoverageCoverageRoleCoveragePlayingEntitySDTCBirthTime" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8ELeI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SOKm0H3sEeyivuDeOiJBMg" name="PolicyActivity2CoverageCoverageRoleCoveragePlayingEntitySDTCBirthTime" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SOKm0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null).playingEntity->excluding(null)->reject((sDTCBirthTime.oclIsUndefined() or sDTCBirthTime.isNullFlavorUndefined()) implies (not sDTCBirthTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8EMFMF9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleId" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8EMFMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SOKm0n3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleId" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SOKm033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8EMFMl9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRoleCoveragePlayingEntity" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8EMFM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SOKm1H3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRoleCoveragePlayingEntity" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SOKm1X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV).participantRole->excluding(null)->reject(playingEntity->one(playingEntity : cda::PlayingEntity | not playingEntity.oclIsUndefined() and playingEntity.oclIsKindOf(cda::PlayingEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8EMsQF9xEey5t-mahoHmrg" name="PolicyActivityCoverageTemplateId" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8EMsQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SOLN4H3sEeyivuDeOiJBMg" name="PolicyActivityCoverageTemplateId" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SOLN4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV)->select(typeCode=vocab::ParticipationType::COV)->reject(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.89'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8EMsQl9xEey5t-mahoHmrg" name="PolicyActivityCoverageCoverageRole" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8EMsQ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SOLN4n3sEeyivuDeOiJBMg" name="PolicyActivityCoverageCoverageRole" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SOLN433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode=vocab::ParticipationType::COV)->select(typeCode=vocab::ParticipationType::COV)->reject(participantRole->one(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(cda::ParticipantRole)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8EtCkF9xEey5t-mahoHmrg" name="PolicyActivity2CDTranslation" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8EtCkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SOmrsH3sEeyivuDeOiJBMg" name="PolicyActivity2CDTranslation" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SOmrsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (not translation->isEmpty() and translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.3.221.5' and not value.code.oclIsUndefined())) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8EtCkl9xEey5t-mahoHmrg" name="PolicyActivity2CDTranslationP" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8EtCk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SOmrsn3sEeyivuDeOiJBMg" name="PolicyActivity2CDTranslationP" constrainedElement="_Q0ODkOwlEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SOmrs33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (( not translation->isEmpty()) ) )))</body>
         </specification>
@@ -30532,42 +30532,42 @@ value.codeSystem = '2.16.840.1.113883.3.221.5' and not value.code.oclIsUndefined
       <ownedComment xmi:id="_Lz0gQOwvEeOqa975IP2wug">
         <body>This template represents the diagnosis or diagnoses discovered or confirmed during the procedure. They may be the same as preprocedure diagnoses or indications.</body>
       </ownedComment>
-      <ownedRule xmi:id="_ybFc8l9xEey5t-mahoHmrg" name="PostprocedureDiagnosis2TemplateId" constrainedElement="__SgUwOwuEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ybFc819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JewmsH3sEeyivuDeOiJBMg" name="PostprocedureDiagnosis2TemplateId" constrainedElement="__SgUwOwuEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JewmsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.51' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ybH5MF9xEey5t-mahoHmrg" name="PostprocedureDiagnosisCodeP" constrainedElement="__SgUwOwuEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ybH5MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JezC8H3sEeyivuDeOiJBMg" name="PostprocedureDiagnosisCodeP" constrainedElement="__SgUwOwuEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JezC8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ybGEAV9xEey5t-mahoHmrg" name="PostprocedureDiagnosisCode" constrainedElement="__SgUwOwuEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ybGEAl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jex00H3sEeyivuDeOiJBMg" name="PostprocedureDiagnosisCode" constrainedElement="__SgUwOwuEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jex00X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '59769-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zLJA4F9xEey5t-mahoHmrg" name="PostprocedureDiagnosisProblemObservation" constrainedElement="__SgUwOwuEeOqa975IP2wug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zLJn8F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KIYygH3sEeyivuDeOiJBMg" name="PostprocedureDiagnosisProblemObservation" constrainedElement="__SgUwOwuEeOqa975IP2wug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KIYygX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="__SgUwewuEeOqa975IP2wug" general="_0fjXAEEvEeGdmoWy_aLP0Q"/>
-      <ownedOperation xmi:id="_zLJn8V9xEey5t-mahoHmrg" name="getConsolProblemObservation2s" bodyCondition="_zLJn9F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zLJn9F9xEey5t-mahoHmrg" name="body" constrainedElement="_zLJn8V9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zLJn9V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KIZZkH3sEeyivuDeOiJBMg" name="getConsolProblemObservation2s" bodyCondition="_KIZZk33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KIZZk33sEeyivuDeOiJBMg" name="body" constrainedElement="_KIZZkH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KIZZlH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation2)).oclAsType(consol::ProblemObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zLJn8l9xEey5t-mahoHmrg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zLJn819xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KIZZkX3sEeyivuDeOiJBMg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KIZZkn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -30575,42 +30575,42 @@ value.code = '59769-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_JXHzEOzZEeOnE-G4kptBiw">
         <body>This template represents the surgical diagnosis or diagnoses assigned to the patient before the surgical procedure and is the reason for the surgery. The preoperative diagnosis is, in the opinion of the surgeon, the diagnosis that will be confirmed during surgery.</body>
       </ownedComment>
-      <ownedRule xmi:id="_ybJHUF9xEey5t-mahoHmrg" name="PreoperativeDiagnosis2TemplateId" constrainedElement="_5l3g0OzYEeOnE-G4kptBiw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ybJHUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JezqAH3sEeyivuDeOiJBMg" name="PreoperativeDiagnosis2TemplateId" constrainedElement="_5l3g0OzYEeOnE-G4kptBiw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JezqAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.65' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ybK8gF9xEey5t-mahoHmrg" name="PreoperativeDiagnosisCodeP" constrainedElement="_5l3g0OzYEeOnE-G4kptBiw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ybK8gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Je1fMH3sEeyivuDeOiJBMg" name="PreoperativeDiagnosisCodeP" constrainedElement="_5l3g0OzYEeOnE-G4kptBiw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Je1fMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ybJuYF9xEey5t-mahoHmrg" name="PreoperativeDiagnosisCode" constrainedElement="_5l3g0OzYEeOnE-G4kptBiw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ybJuYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Je0REX3sEeyivuDeOiJBMg" name="PreoperativeDiagnosisCode" constrainedElement="_5l3g0OzYEeOnE-G4kptBiw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Je0REn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '10219-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zLqlUF9xEey5t-mahoHmrg" name="PreoperativeDiagnosisProblemObservation" constrainedElement="_5l3g0OzYEeOnE-G4kptBiw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zLqlUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KIybIH3sEeyivuDeOiJBMg" name="PreoperativeDiagnosisProblemObservation" constrainedElement="_5l3g0OzYEeOnE-G4kptBiw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KIybIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_5l4H4OzYEeOnE-G4kptBiw" general="_0baBYEEwEeGdmoWy_aLP0Q"/>
-      <ownedOperation xmi:id="_zLqlUl9xEey5t-mahoHmrg" name="getConsolProblemObservation2s" bodyCondition="_zLrMYF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zLrMYF9xEey5t-mahoHmrg" name="body" constrainedElement="_zLqlUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zLrMYV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KIybIn3sEeyivuDeOiJBMg" name="getConsolProblemObservation2s" bodyCondition="_KIybJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KIybJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KIybIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KIybJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation2)).oclAsType(consol::ProblemObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zLqlU19xEey5t-mahoHmrg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zLqlVF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KIybI33sEeyivuDeOiJBMg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KIybJH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -30663,85 +30663,85 @@ Many systems display the nested Problem Observation with the most recent author
           <body>not self.effectiveTime.high.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ybMKoF9xEey5t-mahoHmrg" name="ProblemConcernAct2TemplateId" constrainedElement="_y5C8IOzbEeOnE-G4kptBiw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ybMKoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Je2tUH3sEeyivuDeOiJBMg" name="ProblemConcernAct2TemplateId" constrainedElement="_y5C8IOzbEeOnE-G4kptBiw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Je2tUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.3' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ybu9MF9xEey5t-mahoHmrg" name="ProblemConcernActStatusCodeP" constrainedElement="_y5C8IOzbEeOnE-G4kptBiw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ybu9MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JfSLIH3sEeyivuDeOiJBMg" name="ProblemConcernActStatusCodeP" constrainedElement="_y5C8IOzbEeOnE-G4kptBiw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JfSLIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ybNYwF9xEey5t-mahoHmrg" name="ProblemConcernActStatusCode" constrainedElement="_y5C8IOzbEeOnE-G4kptBiw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ybNYwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Je37cH3sEeyivuDeOiJBMg" name="ProblemConcernActStatusCode" constrainedElement="_y5C8IOzbEeOnE-G4kptBiw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Je37cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'active' or value.code = 'suspended' or value.code = 'aborted' or value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ycS94F9xEey5t-mahoHmrg" name="ProblemConcernActEffectiveTime" constrainedElement="_y5C8IOzbEeOnE-G4kptBiw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ycS94V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jfu3EH3sEeyivuDeOiJBMg" name="ProblemConcernActEffectiveTime" constrainedElement="_y5C8IOzbEeOnE-G4kptBiw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jfu3EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ycWoQF9xEey5t-mahoHmrg" name="ProblemConcernActCodeP" constrainedElement="_y5C8IOzbEeOnE-G4kptBiw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ycWoQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jfx6YH3sEeyivuDeOiJBMg" name="ProblemConcernActCodeP" constrainedElement="_y5C8IOzbEeOnE-G4kptBiw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jfx6YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ycUMAF9xEey5t-mahoHmrg" name="ProblemConcernActCode" constrainedElement="_y5C8IOzbEeOnE-G4kptBiw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ycUMAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JfwFMH3sEeyivuDeOiJBMg" name="ProblemConcernActCode" constrainedElement="_y5C8IOzbEeOnE-G4kptBiw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JfwFMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'CONC' and value.codeSystem = '2.16.840.1.113883.5.6')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yc6B4F9xEey5t-mahoHmrg" name="ProblemConcernAct2AuthorParticipation" constrainedElement="_y5C8IOzbEeOnE-G4kptBiw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yc6B4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JgNYMH3sEeyivuDeOiJBMg" name="ProblemConcernAct2AuthorParticipation" constrainedElement="_y5C8IOzbEeOnE-G4kptBiw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JgNYMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yda_QF9xEey5t-mahoHmrg" name="ProblemConcernAct2PriorityPreference" constrainedElement="_y5C8IOzbEeOnE-G4kptBiw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yda_QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JgpdEH3sEeyivuDeOiJBMg" name="ProblemConcernAct2PriorityPreference" constrainedElement="_y5C8IOzbEeOnE-G4kptBiw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JgpdEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PriorityPreference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zMJGcF9xEey5t-mahoHmrg" name="ProblemConcernActProblemObservation" constrainedElement="_y5C8IOzbEeOnE-G4kptBiw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zMJtgF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KJNR4H3sEeyivuDeOiJBMg" name="ProblemConcernActProblemObservation" constrainedElement="_y5C8IOzbEeOnE-G4kptBiw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KJNR4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_y5C8IezbEeOnE-G4kptBiw" general="_2H6yUBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_yda_Ql9xEey5t-mahoHmrg" name="getPriorityPreferences" bodyCondition="_yda_RV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yda_RV9xEey5t-mahoHmrg" name="body" constrainedElement="_yda_Ql9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yda_Rl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JgpdEn3sEeyivuDeOiJBMg" name="getPriorityPreferences" bodyCondition="_JgpdFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JgpdFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_JgpdEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JgpdFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PriorityPreference)).oclAsType(consol::PriorityPreference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yda_Q19xEey5t-mahoHmrg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yda_RF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JgpdE33sEeyivuDeOiJBMg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JgpdFH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zMJtgV9xEey5t-mahoHmrg" name="getConsolProblemObservation2s" bodyCondition="_zMJthF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zMJthF9xEey5t-mahoHmrg" name="body" constrainedElement="_zMJtgV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zMJthV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KJNR4n3sEeyivuDeOiJBMg" name="getConsolProblemObservation2s" bodyCondition="_KJN48H3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KJN48H3sEeyivuDeOiJBMg" name="body" constrainedElement="_KJNR4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KJN48X3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation2)).oclAsType(consol::ProblemObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zMJtgl9xEey5t-mahoHmrg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zMJtg19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KJNR433sEeyivuDeOiJBMg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KJNR5H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -30814,171 +30814,171 @@ The effectiveTime of the Problem Observation is the definitive indication of whe
           <body>code.codeSystem = '2.16.840.1.113883.6.96' and code.translation->size() >= 1 implies code.translation->forAll(trans : datatypes::CD | trans.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yeZ2sl9xEey5t-mahoHmrg" name="ProblemObservation2TemplateId" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yeadwF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JhiN4H3sEeyivuDeOiJBMg" name="ProblemObservation2TemplateId" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JhiN4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.4' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yedhEF9xEey5t-mahoHmrg" name="ProblemObservationNegationInd" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yedhEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JhlRMH3sEeyivuDeOiJBMg" name="ProblemObservationNegationInd" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JhlRMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.negationInd.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yefWQF9xEey5t-mahoHmrg" name="ProblemObservationEffectiveTime" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yefWQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JhnGYH3sEeyivuDeOiJBMg" name="ProblemObservationEffectiveTime" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JhnGYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ye-ecF9xEey5t-mahoHmrg" name="ProblemObservationValueP" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ye-ecV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JiJR4H3sEeyivuDeOiJBMg" name="ProblemObservationValueP" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JiJR4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (not self.value->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yegkYF9xEey5t-mahoHmrg" name="ProblemObservationValue" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yegkYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jho7kH3sEeyivuDeOiJBMg" name="ProblemObservationValue" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jho7kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ygBnUF9xEey5t-mahoHmrg" name="ProblemObservationCodeP" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ygBnUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JjBboH3sEeyivuDeOiJBMg" name="ProblemObservationCodeP" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JjBboX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yfgC4F9xEey5t-mahoHmrg" name="ProblemObservationCode" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yfgC4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jimk4H3sEeyivuDeOiJBMg" name="ProblemObservationCode" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jimk4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '404684003' or value.code = '409586006' or value.code = '282291009' or value.code = '64572001' or value.code = '248536006' or value.code = '418799008' or value.code = '55607006' or value.code = '373930000'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ygjy0F9xEey5t-mahoHmrg" name="ProblemObservationText" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ygjy0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JjdggH3sEeyivuDeOiJBMg" name="ProblemObservationText" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JjdggX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ygm2IF9xEey5t-mahoHmrg" name="ProblemObservationStatusCodeP" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ygm2IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jjf8wH3sEeyivuDeOiJBMg" name="ProblemObservationStatusCodeP" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jjf8wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yglA8F9xEey5t-mahoHmrg" name="ProblemObservationStatusCode" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yglA8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JjeuoH3sEeyivuDeOiJBMg" name="ProblemObservationStatusCode" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JjeuoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yiHSAF9xEey5t-mahoHmrg" name="ProblemObservation2PrognosisObservation" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yiHSAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JkzkUH3sEeyivuDeOiJBMg" name="ProblemObservation2PrognosisObservation" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JkzkUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PrognosisObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yinBQF9xEey5t-mahoHmrg" name="ProblemObservation2PriorityPreference" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yinBQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JlObEH3sEeyivuDeOiJBMg" name="ProblemObservation2PriorityPreference" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JlObEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PriorityPreference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yjGJcF9xEey5t-mahoHmrg" name="ProblemObservation2AuthorParticipation" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yjGJcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JlrHAH3sEeyivuDeOiJBMg" name="ProblemObservation2AuthorParticipation" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JlrHAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yjl4sF9xEey5t-mahoHmrg" name="ProblemObservationHealthStatusObservation" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yjl4sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JmHy8H3sEeyivuDeOiJBMg" name="ProblemObservationHealthStatusObservation" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JmHy8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3eKVQF9xEey5t-mahoHmrg" name="ProblemObservationProblemStatus" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3eKVQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_N6UMAH3sEeyivuDeOiJBMg" name="ProblemObservationProblemStatus" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_N6UMAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemStatus2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8FTfgF9xEey5t-mahoHmrg" name="ProblemObservation2CDQualifier" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8FTfgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SPJeQH3sEeyivuDeOiJBMg" name="ProblemObservation2CDQualifier" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SPJeQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((qualifier->isEmpty() or qualifier->exists(element | element.isNullFlavorUndefined())) implies (not qualifier->isEmpty()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8FUGkF9xEey5t-mahoHmrg" name="ProblemObservation2CDCode" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8FUGkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SPKFUH3sEeyivuDeOiJBMg" name="ProblemObservation2CDCode" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SPKFUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not code.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8F0c4F9xEey5t-mahoHmrg" name="ProblemObservation2CDCodeTranslation" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8F0c4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SPmxQH3sEeyivuDeOiJBMg" name="ProblemObservation2CDCodeTranslation" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SPmxQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (not translation->isEmpty() and translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 not value.codeSystem.oclIsUndefined() or not value.codeSystemName.oclIsUndefined())) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8F0c4l9xEey5t-mahoHmrg" name="ProblemObservation2CDCodeTranslationP" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8F0c419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SPnYUH3sEeyivuDeOiJBMg" name="ProblemObservation2CDCodeTranslationP" constrainedElement="_prDAkPDCEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SPnYUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (( not translation->isEmpty()) ) )))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_prGD4PDCEeOKPKE9au0oug" general="_5Ha7ABUyEeGbmN_W114JUw"/>
-      <ownedOperation xmi:id="_yiHSAl9xEey5t-mahoHmrg" name="getPrognosisObservation" bodyCondition="_yiHSBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yiHSBV9xEey5t-mahoHmrg" name="body" constrainedElement="_yiHSAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yiHSBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JkzkUn3sEeyivuDeOiJBMg" name="getPrognosisObservation" bodyCondition="_Jk0LYn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Jk0LYn3sEeyivuDeOiJBMg" name="body" constrainedElement="_JkzkUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jk0LY33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PrognosisObservation))->asSequence()->any(true).oclAsType(consol::PrognosisObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yiHSA19xEey5t-mahoHmrg" type="_GXlxYJmLEeOeSLwbllPCyw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yiHSBF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Jk0LYH3sEeyivuDeOiJBMg" type="_GXlxYJmLEeOeSLwbllPCyw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Jk0LYX3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_yinBQl9xEey5t-mahoHmrg" name="getPriorityPreferences" bodyCondition="_yinoUl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yinoUl9xEey5t-mahoHmrg" name="body" constrainedElement="_yinBQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yinoU19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JlObEn3sEeyivuDeOiJBMg" name="getPriorityPreferences" bodyCondition="_JlObFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JlObFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_JlObEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JlObFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PriorityPreference)).oclAsType(consol::PriorityPreference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yinoUF9xEey5t-mahoHmrg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yinoUV9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JlObE33sEeyivuDeOiJBMg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JlObFH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_yjmfwF9xEey5t-mahoHmrg" name="getConsolHealthStatusObservation" bodyCondition="_yjmfw19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yjmfw19xEey5t-mahoHmrg" name="body" constrainedElement="_yjmfwF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yjmfxF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JmHy8n3sEeyivuDeOiJBMg" name="getConsolHealthStatusObservation" bodyCondition="_JmHy9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JmHy9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_JmHy8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JmHy9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::HealthStatusObservation))->asSequence()->any(true).oclAsType(consol::HealthStatusObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yjmfwV9xEey5t-mahoHmrg" type="_2ExXsBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yjmfwl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_JmHy833sEeyivuDeOiJBMg" type="_2ExXsBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JmHy9H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3eKVQl9xEey5t-mahoHmrg" name="getConsolProblemStatus" bodyCondition="_3eKVRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3eKVRV9xEey5t-mahoHmrg" name="body" constrainedElement="_3eKVQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3eKVRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_N6UMAn3sEeyivuDeOiJBMg" name="getConsolProblemStatus" bodyCondition="_N6UMBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_N6UMBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_N6UMAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_N6UMBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemStatus2))->asSequence()->any(true).oclAsType(consol::ProblemStatus2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3eKVQ19xEey5t-mahoHmrg" type="_vyb38EfNEeiFfJtNAawVHw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3eKVRF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_N6UMA33sEeyivuDeOiJBMg" type="_vyb38EfNEeiFfJtNAawVHw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_N6UMBH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -30999,130 +30999,130 @@ The common notion of &quot;procedure&quot; is broader than that specified by the
           <body>not code.oclIsUndefined() and self.code.isNullFlavorUndefined() implies self.code.codeSystem = '2.16.840.1.113883.6.12' or self.code.codeSystem = '2.16.840.1.113883.6.4' or self.code.codeSystem = '2.16.840.1.113883.6.13'</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yjmfxV9xEey5t-mahoHmrg" name="ProcedureActivityAct2TemplateId" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yjmfxl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JmIaAH3sEeyivuDeOiJBMg" name="ProcedureActivityAct2TemplateId" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JmIaAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.12' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yjoU8F9xEey5t-mahoHmrg" name="ProcedureActivityActMoodCode" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yjoU8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JmKPMH3sEeyivuDeOiJBMg" name="ProcedureActivityActMoodCode" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JmKPMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ykNjwF9xEey5t-mahoHmrg" name="ProcedureActivityActStatusCodeP" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ykOK0F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JmoJQH3sEeyivuDeOiJBMg" name="ProcedureActivityActStatusCodeP" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JmowUH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yjqKIF9xEey5t-mahoHmrg" name="ProcedureActivityActStatusCode" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yjqKIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JmLdUH3sEeyivuDeOiJBMg" name="ProcedureActivityActStatusCode" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JmLdUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed' or value.code = 'active' or value.code = 'aborted' or value.code = 'cancelled')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ykvvQF9xEey5t-mahoHmrg" name="ProcedureActivityActEffectiveTime" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ykvvQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JnHRcH3sEeyivuDeOiJBMg" name="ProcedureActivityActEffectiveTime" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JnHRcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ylWMMF9xEey5t-mahoHmrg" name="ProcedureActivityActInstructions" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ylWMMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JnnAsH3sEeyivuDeOiJBMg" name="ProcedureActivityActInstructions" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JnnAsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instruction2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yl3JkF9xEey5t-mahoHmrg" name="ProcedureActivityActIndication" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yl3JkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JoCegH3sEeyivuDeOiJBMg" name="ProcedureActivityActIndication" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JoCegX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ymW40F9xEey5t-mahoHmrg" name="ProcedureActivityActMedicationActivity" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ymW40V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JofKcH3sEeyivuDeOiJBMg" name="ProcedureActivityActMedicationActivity" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JofKcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::MedicationActivity2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3erSoF9xEey5t-mahoHmrg" name="ProcedureActivityActPerformer" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3erSoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_N61wcH3sEeyivuDeOiJBMg" name="ProcedureActivityActPerformer" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_N61wcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->exists(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3gZw8F9xEey5t-mahoHmrg" name="ProcedureActivityAct2AuthorParticipation" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3gZw8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_N8LNMH3sEeyivuDeOiJBMg" name="ProcedureActivityAct2AuthorParticipation" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_N8LNMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8HVf0F9xEey5t-mahoHmrg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationTelecom" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8HVf0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SRMssH3sEeyivuDeOiJBMg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationTelecom" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SRMssX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).representedOrganization->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8HWG4F9xEey5t-mahoHmrg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationAddr" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8HWG4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SRMssn3sEeyivuDeOiJBMg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationAddr" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SRMss33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null).representedOrganization->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (( not addr->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8HWG4l9xEey5t-mahoHmrg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityTelecom" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8HWG419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SRMstH3sEeyivuDeOiJBMg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityTelecom" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SRMstX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8HWG5F9xEey5t-mahoHmrg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityRepresentedOrganization" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8HWG5V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SRNTwH3sEeyivuDeOiJBMg" name="ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityRepresentedOrganization" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SRNTwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject(representedOrganization->one(representedOrganization : cda::Organization | not representedOrganization.oclIsUndefined() and representedOrganization.oclIsKindOf(cda::Organization)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8HWt8F9xEey5t-mahoHmrg" name="ProcedureActivityActProcedureActPerformerAssignedEntity" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8HWt8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SRNTwn3sEeyivuDeOiJBMg" name="ProcedureActivityActProcedureActPerformerAssignedEntity" constrainedElement="_CFMuYPDbEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SRNTw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_CFMuYfDbEeOKPKE9au0oug" general="_awdH4Bg4EeGs5a462vYX5Q"/>
-      <ownedOperation xmi:id="_ylWzQF9xEey5t-mahoHmrg" name="getConsolInstruction2" bodyCondition="_ylWzQ19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ylWzQ19xEey5t-mahoHmrg" name="body" constrainedElement="_ylWzQF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ylWzRF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JnnAsn3sEeyivuDeOiJBMg" name="getConsolInstruction2" bodyCondition="_JnnAtX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JnnAtX3sEeyivuDeOiJBMg" name="body" constrainedElement="_JnnAsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JnnAtn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instruction2))->asSequence()->any(true).oclAsType(consol::Instruction2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ylWzQV9xEey5t-mahoHmrg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ylWzQl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_JnnAs33sEeyivuDeOiJBMg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JnnAtH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_yl3Jkl9xEey5t-mahoHmrg" name="getConsolIndication2s" bodyCondition="_yl3JlV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yl3JlV9xEey5t-mahoHmrg" name="body" constrainedElement="_yl3Jkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yl3Jll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JoDFkH3sEeyivuDeOiJBMg" name="getConsolIndication2s" bodyCondition="_JoDFk33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JoDFk33sEeyivuDeOiJBMg" name="body" constrainedElement="_JoDFkH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JoDFlH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication2)).oclAsType(consol::Indication2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yl3Jk19xEey5t-mahoHmrg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yl3JlF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JoDFkX3sEeyivuDeOiJBMg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JoDFkn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_ymXf4F9xEey5t-mahoHmrg" name="getConsolMedicationActivity2s" bodyCondition="_ymXf419xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ymXf419xEey5t-mahoHmrg" name="body" constrainedElement="_ymXf4F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ymXf5F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JofKcn3sEeyivuDeOiJBMg" name="getConsolMedicationActivity2s" bodyCondition="_JofKdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JofKdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_JofKcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JofKdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity2)).oclAsType(consol::MedicationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ymXf4V9xEey5t-mahoHmrg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ymXf4l9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JofKc33sEeyivuDeOiJBMg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JofKdH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -31149,155 +31149,155 @@ This template represents procedures that result in new information about the pat
           <body>not code.oclIsUndefined() and self.code.isNullFlavorUndefined() implies self.code.codeSystem = '2.16.840.1.113883.6.12' or self.code.codeSystem = '2.16.840.1.113883.6.4' or self.code.codeSystem = '2.16.840.1.113883.6.13'</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ymXf5V9xEey5t-mahoHmrg" name="ProcedureActivityObservation2TemplateId" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ymXf5l9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JofxgH3sEeyivuDeOiJBMg" name="ProcedureActivityObservation2TemplateId" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JofxgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.13' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ym5EUF9xEey5t-mahoHmrg" name="ProcedureActivityObservationTargetSiteCodeP" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ym5EUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jo72YH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationTargetSiteCodeP" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jo72YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (not self.targetSiteCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ymZVEF9xEey5t-mahoHmrg" name="ProcedureActivityObservationTargetSiteCode" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ymZVEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jog_oH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationTargetSiteCode" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jog_oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (self.targetSiteCode->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ynaBsF9xEey5t-mahoHmrg" name="ProcedureActivityObservationMoodCode" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ynaBsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JpX7QH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationMoodCode" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JpX7QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yn6_EF9xEey5t-mahoHmrg" name="ProcedureActivityObservationStatusCodeP" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yn6_EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jp4RkH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationStatusCodeP" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jp4RkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ynb24F9xEey5t-mahoHmrg" name="ProcedureActivityObservationStatusCode" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ynb24V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JpZwcH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationStatusCode" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JpZwcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed' or value.code = 'active' or value.code = 'aborted' or value.code = 'cancelled')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yodKkF9xEey5t-mahoHmrg" name="ProcedureActivityObservationValue" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yodKkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JqWysH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationValue" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JqWysX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (not self.value->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ypGq0F9xEey5t-mahoHmrg" name="ProcedureActivityObservationIndication" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ypHR4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jq1T0H3sEeyivuDeOiJBMg" name="ProcedureActivityObservationIndication" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jq164H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ypo2UF9xEey5t-mahoHmrg" name="ProcedureActivityObservationMedicationActivity" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ypo2UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JrRYsH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationMedicationActivity" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JrRYsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::MedicationActivity2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yqIlkF9xEey5t-mahoHmrg" name="ProcedureActivityObservationInstructions" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yqJMoF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JrrBUH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationInstructions" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JrrBUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instruction2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3g6HQF9xEey5t-mahoHmrg" name="ProcedureActivityObservationPerformer" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3g6HQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_N8q8cH3sEeyivuDeOiJBMg" name="ProcedureActivityObservationPerformer" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_N8q8cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->exists(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3h6z4F9xEey5t-mahoHmrg" name="ProcedureActivityObservation2AuthorParticipation" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3h6z4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_N9ifIH3sEeyivuDeOiJBMg" name="ProcedureActivityObservation2AuthorParticipation" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_N9ifIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3ibKMF9xEey5t-mahoHmrg" name="ProcedureActivityObservation2ReactionObservation2" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3ibKMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_N99V4H3sEeyivuDeOiJBMg" name="ProcedureActivityObservation2ReactionObservation2" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_N99V4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ReactionObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8HX8EF9xEey5t-mahoHmrg" name="ProcedureActivityObservation2ANYNullFlavor" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8HX8EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SRPwAH3sEeyivuDeOiJBMg" name="ProcedureActivityObservation2ANYNullFlavor" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SRPwAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.value->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (isDefined('nullFlavor') )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8IU-UF9xEey5t-mahoHmrg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityAddr" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8IU-UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SScC0H3sEeyivuDeOiJBMg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityAddr" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SScC0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (( not addr->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8IU-Ul9xEey5t-mahoHmrg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityTelecom" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8IU-U19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SScC0n3sEeyivuDeOiJBMg" name="ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityTelecom" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SScC033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8IVlYF9xEey5t-mahoHmrg" name="ProcedureActivityObservationProcedureObservationPerformerAssignedEntity" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8IVlYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SScp4H3sEeyivuDeOiJBMg" name="ProcedureActivityObservationProcedureObservationPerformerAssignedEntity" constrainedElement="_QoLWAPDjEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SScp4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_QoLWAfDjEeOKPKE9au0oug" general="_Aj7JkBg4EeGs5a462vYX5Q"/>
-      <ownedOperation xmi:id="_ypHR4V9xEey5t-mahoHmrg" name="getConsolIndication2s" bodyCondition="_ypHR5F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ypHR5F9xEey5t-mahoHmrg" name="body" constrainedElement="_ypHR4V9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ypHR5V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Jq164X3sEeyivuDeOiJBMg" name="getConsolIndication2s" bodyCondition="_Jq165H3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Jq165H3sEeyivuDeOiJBMg" name="body" constrainedElement="_Jq164X3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jq165X3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication2)).oclAsType(consol::Indication2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ypHR4l9xEey5t-mahoHmrg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ypHR419xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Jq164n3sEeyivuDeOiJBMg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Jq16433sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_yppdYF9xEey5t-mahoHmrg" name="getConsolMedicationActivity2s" bodyCondition="_yppdY19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yppdY19xEey5t-mahoHmrg" name="body" constrainedElement="_yppdYF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yppdZF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JrRYsn3sEeyivuDeOiJBMg" name="getConsolMedicationActivity2s" bodyCondition="_JrRYtX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JrRYtX3sEeyivuDeOiJBMg" name="body" constrainedElement="_JrRYsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JrRYtn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity2)).oclAsType(consol::MedicationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yppdYV9xEey5t-mahoHmrg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yppdYl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JrRYs33sEeyivuDeOiJBMg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JrRYtH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_yqJMoV9xEey5t-mahoHmrg" name="getConsolInstruction2" bodyCondition="_yqJMpF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yqJMpF9xEey5t-mahoHmrg" name="body" constrainedElement="_yqJMoV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yqJMpV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JrroYH3sEeyivuDeOiJBMg" name="getConsolInstruction2" bodyCondition="_JrroY33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JrroY33sEeyivuDeOiJBMg" name="body" constrainedElement="_JrroYH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JrroZH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instruction2))->asSequence()->any(true).oclAsType(consol::Instruction2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yqJMol9xEey5t-mahoHmrg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yqJMo19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_JrroYX3sEeyivuDeOiJBMg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JrroYn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3ibxQF9xEey5t-mahoHmrg" name="getReactionObservation2s" bodyCondition="_3ibxQ19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3ibxQ19xEey5t-mahoHmrg" name="body" constrainedElement="_3ibxQF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3ibxRF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_N99V4n3sEeyivuDeOiJBMg" name="getReactionObservation2s" bodyCondition="_N99V5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_N99V5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_N99V4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_N99V5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ReactionObservation2)).oclAsType(consol::ReactionObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3ibxQV9xEey5t-mahoHmrg" type="_U3yosPDxEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3ibxQl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_N99V433sEeyivuDeOiJBMg" type="_U3yosPDxEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_N99V5H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -31331,149 +31331,149 @@ This template can be used with a contained Product Instance template to represen
           <body>self.participant->select(par : cda::Participant2 | par.participantRole.oclIsKindOf(consol::ServiceDeliveryLocation))->forAll(p : cda::Participant2 | p.typeCode=vocab::ParticipationType::LOC)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yqJMpl9xEey5t-mahoHmrg" name="ProcedureActivityProcedure2TemplateId" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yqJzsF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JrroZX3sEeyivuDeOiJBMg" name="ProcedureActivityProcedure2TemplateId" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JrroZn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.14' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yqqKAF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureTargetSiteCodeP" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yqqKAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JsJicH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureTargetSiteCodeP" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JsJicX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (not self.targetSiteCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yqLo4F9xEey5t-mahoHmrg" name="ProcedureActivityProcedureTargetSiteCode" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yqLo4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JrtdkH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureTargetSiteCode" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JrtdkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (self.targetSiteCode->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yrMVgF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureMoodCode" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yrMVgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JsmOYH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureMoodCode" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JsmOYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentProcedureMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yrvvIF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureStatusCodeP" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yrvvIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JtEvgH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureStatusCodeP" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JtEvgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yrNjoF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureStatusCode" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yrNjoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JsoDkH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureStatusCode" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JsoDkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed' or value.code = 'active' or value.code = 'aborted' or value.code = 'cancelled')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ys0tMF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureIndication" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ys0tMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JuBKsH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureIndication" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JuBKsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::Indication2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ytVDgF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureMedicationActivity" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ytVDgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JudPkH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureMedicationActivity" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jud2oH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::MedicationActivity2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ytyWgF9xEey5t-mahoHmrg" name="ProcedureActivityProcedurePatientInstruction" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ytyWgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ju4GUH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedurePatientInstruction" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ju4GUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instruction2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yuResF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureSpecimen" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yuSFwF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JvS9EH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureSpecimen" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JvS9EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.specimen->exists(specimen : cda::Specimen | not specimen.oclIsUndefined() and specimen.oclIsKindOf(cda::Specimen))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3i8HkF9xEey5t-mahoHmrg" name="ProcedureActivityProcedurePerformer" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3i8HkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_N-YzsH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedurePerformer" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_N-YzsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->exists(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3j-CUF9xEey5t-mahoHmrg" name="ProcedureActivityProcedure2AuthorParticipation" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3j-CUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_N_N6IH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedure2AuthorParticipation" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_N_N6IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3keYoF9xEey5t-mahoHmrg" name="ProcedureActivityProcedure2ReactionObservation2" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3keYoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_N_oJ0H3sEeyivuDeOiJBMg" name="ProcedureActivityProcedure2ReactionObservation2" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_N_oJ0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ReactionObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8JwhsF9xEey5t-mahoHmrg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityAddr" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8JxIwF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ST8esH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityAddr" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ST8esX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (( not addr->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8JxIwV9xEey5t-mahoHmrg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityTelecom" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8JxIwl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ST9FwH3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityTelecom" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ST9FwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null).assignedEntity->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8JxIw19xEey5t-mahoHmrg" name="ProcedureActivityProcedureProcedureActivityPerformerAssignedEntity" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8JxIxF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ST9Fwn3sEeyivuDeOiJBMg" name="ProcedureActivityProcedureProcedureActivityPerformerAssignedEntity" constrainedElement="_fCVOQPDqEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ST9Fw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_fCV1UPDqEeOKPKE9au0oug" general="_2OG58RSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_ys0tMl9xEey5t-mahoHmrg" name="getConsolIndication2s" bodyCondition="_ys0tNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ys0tNV9xEey5t-mahoHmrg" name="body" constrainedElement="_ys0tMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ys0tNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JuBxwH3sEeyivuDeOiJBMg" name="getConsolIndication2s" bodyCondition="_JuBxw33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JuBxw33sEeyivuDeOiJBMg" name="body" constrainedElement="_JuBxwH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JuBxxH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication2)).oclAsType(consol::Indication2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ys0tM19xEey5t-mahoHmrg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ys0tNF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JuBxwX3sEeyivuDeOiJBMg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JuBxwn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_ytVDgl9xEey5t-mahoHmrg" name="getConsolMedicationActivity2s" bodyCondition="_ytVDhV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ytVDhV9xEey5t-mahoHmrg" name="body" constrainedElement="_ytVDgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ytVDhl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Jud2oX3sEeyivuDeOiJBMg" name="getConsolMedicationActivity2s" bodyCondition="_Jud2pH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Jud2pH3sEeyivuDeOiJBMg" name="body" constrainedElement="_Jud2oX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jud2pX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity2)).oclAsType(consol::MedicationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ytVDg19xEey5t-mahoHmrg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ytVDhF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Jud2on3sEeyivuDeOiJBMg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Jud2o33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_ytyWgl9xEey5t-mahoHmrg" name="getConsolInstruction2" bodyCondition="_ytyWhV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ytyWhV9xEey5t-mahoHmrg" name="body" constrainedElement="_ytyWgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ytyWhl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ju4tYH3sEeyivuDeOiJBMg" name="getConsolInstruction2" bodyCondition="_Ju4tY33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ju4tY33sEeyivuDeOiJBMg" name="body" constrainedElement="_Ju4tYH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ju4tZH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instruction2))->asSequence()->any(true).oclAsType(consol::Instruction2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ytyWg19xEey5t-mahoHmrg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ytyWhF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Ju4tYX3sEeyivuDeOiJBMg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ju4tYn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3keYol9xEey5t-mahoHmrg" name="getReactionObservation2s" bodyCondition="_3keYpV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3keYpV9xEey5t-mahoHmrg" name="body" constrainedElement="_3keYol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3keYpl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_N_oJ0n3sEeyivuDeOiJBMg" name="getReactionObservation2s" bodyCondition="_N_oJ1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_N_oJ1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_N_oJ0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_N_oJ1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ReactionObservation2)).oclAsType(consol::ReactionObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3keYo19xEey5t-mahoHmrg" type="_U3yosPDxEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3keYpF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_N_oJ033sEeyivuDeOiJBMg" type="_U3yosPDxEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_N_oJ1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -31523,116 +31523,116 @@ value.code = 'completed' or value.code = 'active' or value.code = 'aborted' or v
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yuSFwV9xEey5t-mahoHmrg" name="ReactionObservation2TemplateId" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yuSFwl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JvTkIH3sEeyivuDeOiJBMg" name="ReactionObservation2TemplateId" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JvTkIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.9' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yuVwIF9xEey5t-mahoHmrg" name="ReactionObservationCodeP" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yuVwIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JvX1kH3sEeyivuDeOiJBMg" name="ReactionObservationCodeP" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JvX1kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yuUiAF9xEey5t-mahoHmrg" name="ReactionObservationCode" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yuUiAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JvWncH3sEeyivuDeOiJBMg" name="ReactionObservationCode" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JvWncX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yuXlUF9xEey5t-mahoHmrg" name="ReactionObservationId" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yuXlUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JvZDsH3sEeyivuDeOiJBMg" name="ReactionObservationId" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JvZDsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yuZagF9xEey5t-mahoHmrg" name="ReactionObservationText" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yuZagV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JvaR0H3sEeyivuDeOiJBMg" name="ReactionObservationText" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JvaR0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yub2wF9xEey5t-mahoHmrg" name="ReactionObservationStatusCodeP" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yub2wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JvcuEH3sEeyivuDeOiJBMg" name="ReactionObservationStatusCodeP" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JvcuEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yuaBkF9xEey5t-mahoHmrg" name="ReactionObservationStatusCode" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yuaBkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jvbf8H3sEeyivuDeOiJBMg" name="ReactionObservationStatusCode" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jvbf8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yu6-8F9xEey5t-mahoHmrg" name="ReactionObservationValueP" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yu6-8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jv5aAH3sEeyivuDeOiJBMg" name="ReactionObservationValueP" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jv5aAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (not self.value->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yudE4F9xEey5t-mahoHmrg" name="ReactionObservationValue" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yudE4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jvd8MH3sEeyivuDeOiJBMg" name="ReactionObservationValue" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jvd8MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yv7EgF9xEey5t-mahoHmrg" name="ReactionObservationProcedureActivityProcedure" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yv7rkF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jw0nEH3sEeyivuDeOiJBMg" name="ReactionObservationProcedureActivityProcedure" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jw0nEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.procedure.oclIsUndefined() and entryRelationship.procedure.oclIsKindOf(consol::ProcedureActivityProcedure2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yweeIF9xEey5t-mahoHmrg" name="ReactionObservationMedicationActivity" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yweeIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JxQr8H3sEeyivuDeOiJBMg" name="ReactionObservationMedicationActivity" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JxQr8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::MedicationActivity2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zMqD0F9xEey5t-mahoHmrg" name="ReactionObservationSeverityObservation" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zMqD0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KJoIoH3sEeyivuDeOiJBMg" name="ReactionObservationSeverityObservation" constrainedElement="_U3yosPDxEeOKPKE9au0oug">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KJoIoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SeverityObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_U3yosfDxEeOKPKE9au0oug" general="_2E_aIRSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_yv7rkV9xEey5t-mahoHmrg" name="getConsolProcedureActivityProcedure2s" bodyCondition="_yv7rlF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yv7rlF9xEey5t-mahoHmrg" name="body" constrainedElement="_yv7rkV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yv7rlV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Jw1OIH3sEeyivuDeOiJBMg" name="getConsolProcedureActivityProcedure2s" bodyCondition="_Jw1OI33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Jw1OI33sEeyivuDeOiJBMg" name="body" constrainedElement="_Jw1OIH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jw1OJH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getProcedures()->select(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::ProcedureActivityProcedure2)).oclAsType(consol::ProcedureActivityProcedure2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yv7rkl9xEey5t-mahoHmrg" type="_fCVOQPDqEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yv7rk19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Jw1OIX3sEeyivuDeOiJBMg" type="_fCVOQPDqEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Jw1OIn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_yweeIl9xEey5t-mahoHmrg" name="getConsolMedicationActivity2s" bodyCondition="_yweeJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yweeJV9xEey5t-mahoHmrg" name="body" constrainedElement="_yweeIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yweeJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JxRTAH3sEeyivuDeOiJBMg" name="getConsolMedicationActivity2s" bodyCondition="_JxRTA33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JxRTA33sEeyivuDeOiJBMg" name="body" constrainedElement="_JxRTAH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JxRTBH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity2)).oclAsType(consol::MedicationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yweeI19xEey5t-mahoHmrg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yweeJF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JxRTAX3sEeyivuDeOiJBMg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JxRTAn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zMqq4F9xEey5t-mahoHmrg" name="getConsolSeverityObservation2" bodyCondition="_zMqq419xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zMqq419xEey5t-mahoHmrg" name="body" constrainedElement="_zMqq4F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zMqq5F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KJoIon3sEeyivuDeOiJBMg" name="getConsolSeverityObservation2" bodyCondition="_KJoIpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KJoIpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KJoIon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KJoIpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SeverityObservation2))->asSequence()->any(true).oclAsType(consol::SeverityObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zMqq4V9xEey5t-mahoHmrg" type="_B0oKYPJdEeO2NaSiicarcg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zMqq4l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_KJoIo33sEeyivuDeOiJBMg" type="_B0oKYPJdEeO2NaSiicarcg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KJoIpH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -31681,84 +31681,84 @@ The result observation includes a statusCode to allow recording the status of an
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yweeJ19xEey5t-mahoHmrg" name="ResultObservation2TemplateId" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ywfFMF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JxRTBX3sEeyivuDeOiJBMg" name="ResultObservation2TemplateId" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JxRTBn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.2' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ywhhcF9xEey5t-mahoHmrg" name="ResultObservationEffectiveTime" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ywhhcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JxTvQH3sEeyivuDeOiJBMg" name="ResultObservationEffectiveTime" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JxTvQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ywjWoF9xEey5t-mahoHmrg" name="ResultObservationText" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ywjWoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JxVkcH3sEeyivuDeOiJBMg" name="ResultObservationText" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JxVkcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ywmZ8F9xEey5t-mahoHmrg" name="ResultObservationCodeP" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ywmZ8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JxYAsH3sEeyivuDeOiJBMg" name="ResultObservationCodeP" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JxYAsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ywlL0F9xEey5t-mahoHmrg" name="ResultObservationCode" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ywlL0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JxWykH3sEeyivuDeOiJBMg" name="ResultObservationCode" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JxWykX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ywoPIF9xEey5t-mahoHmrg" name="ResultObservationValue" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ywoPIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JxZ14H3sEeyivuDeOiJBMg" name="ResultObservationValue" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JxZ14X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (not self.value->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yxKaoF9xEey5t-mahoHmrg" name="ResultObservationInterpretationCodeP" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yxKaoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jx2h0H3sEeyivuDeOiJBMg" name="ResultObservationInterpretationCodeP" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jx2h0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.interpretationCode->isEmpty() or self.interpretationCode->exists(element | element.isNullFlavorUndefined())) implies (not self.interpretationCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ywqEUF9xEey5t-mahoHmrg" name="ResultObservationInterpretationCode" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ywqEUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JxbEAH3sEeyivuDeOiJBMg" name="ResultObservationInterpretationCode" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JxbEAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.interpretationCode->isEmpty() or self.interpretationCode->exists(element | element.isNullFlavorUndefined())) implies (self.interpretationCode->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = element.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.83' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yyMVYF9xEey5t-mahoHmrg" name="ResultObservation2AuthorParticipation" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yyM8cF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jy2nYH3sEeyivuDeOiJBMg" name="ResultObservation2AuthorParticipation" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jy2nYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3k-H4F9xEey5t-mahoHmrg" name="ResultObservation2ReferenceRange" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3k-H4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OADAkH3sEeyivuDeOiJBMg" name="ResultObservation2ReferenceRange" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OADnoH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->exists(referenceRange : cda::ReferenceRange | not referenceRange.oclIsUndefined() and referenceRange.oclIsKindOf(cda::ReferenceRange))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Kx1YF9xEey5t-mahoHmrg" name="ResultObservation2ReferenceRangeObservationRangeValue" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Kx1YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SUzaUH3sEeyivuDeOiJBMg" name="ResultObservation2ReferenceRangeObservationRangeValue" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SUzaUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->excluding(null).observationRange->excluding(null)->reject((value.oclIsUndefined() or value.isNullFlavorUndefined()) implies (not value.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Kx1Yl9xEey5t-mahoHmrg" name="ResultObservation2ReferenceRangeObservationRangeCode" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Kx1Y19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SUzaUn3sEeyivuDeOiJBMg" name="ResultObservation2ReferenceRangeObservationRangeCode" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SUzaU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->excluding(null).observationRange->excluding(null)->reject(code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Kx1ZF9xEey5t-mahoHmrg" name="ResultObservation2ReferenceRangeObservationRange" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Kx1ZV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SUzaVH3sEeyivuDeOiJBMg" name="ResultObservation2ReferenceRangeObservationRange" constrainedElement="_H85E0PF7EeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SUzaVX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->excluding(null)->reject(observationRange->one(observationRange : cda::ObservationRange | not observationRange.oclIsUndefined() and observationRange.oclIsKindOf(cda::ObservationRange)))</body>
         </specification>
@@ -31786,52 +31786,52 @@ If any Result Observation within the organizer has a statusCode of &quot;active&
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yyM8cV9xEey5t-mahoHmrg" name="ResultOrganizer2TemplateId" constrainedElement="_gU40UPGEEeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yyM8cl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jy3OcH3sEeyivuDeOiJBMg" name="ResultOrganizer2TemplateId" constrainedElement="_gU40UPGEEeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jy3OcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.1' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yyPYsF9xEey5t-mahoHmrg" name="ResultOrganizer2EffectiveTime" constrainedElement="_gU40UPGEEeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yyPYsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jy5DoH3sEeyivuDeOiJBMg" name="ResultOrganizer2EffectiveTime" constrainedElement="_gU40UPGEEeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jy5DoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yyyyUF9xEey5t-mahoHmrg" name="ResultOrganizerResultObservation" constrainedElement="_gU40UPGEEeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yyyyUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_JzaBAH3sEeyivuDeOiJBMg" name="ResultOrganizerResultObservation" constrainedElement="_gU40UPGEEeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_JzaBAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->exists(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::ResultObservation2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yzTIoF9xEey5t-mahoHmrg" name="ResultOrganizer2AuthorParticipation" constrainedElement="_gU40UPGEEeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yzTIoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jz37EH3sEeyivuDeOiJBMg" name="ResultOrganizer2AuthorParticipation" constrainedElement="_gU40UPGEEeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jz37EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8KzDgF9xEey5t-mahoHmrg" name="ResultOrganizer2IVLTSLow" constrainedElement="_gU40UPGEEeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8KzDgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SU0ocH3sEeyivuDeOiJBMg" name="ResultOrganizer2IVLTSLow" constrainedElement="_gU40UPGEEeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SU0ocX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((low.oclIsUndefined() or low.isNullFlavorUndefined()) implies (not low.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8KzqkF9xEey5t-mahoHmrg" name="ResultOrganizer2IVLTSHigh" constrainedElement="_gU40UPGEEeOmsLWmq5fnqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8KzqkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SU0ocn3sEeyivuDeOiJBMg" name="ResultOrganizer2IVLTSHigh" constrainedElement="_gU40UPGEEeOmsLWmq5fnqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SU0oc33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((high.oclIsUndefined() or high.isNullFlavorUndefined()) implies (not high.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_gU40UfGEEeOmsLWmq5fnqQ" general="_2JxzgBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_yyyyUl9xEey5t-mahoHmrg" name="getConsolResultObservation2s" bodyCondition="_yyyyVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_yyyyVV9xEey5t-mahoHmrg" name="body" constrainedElement="_yyyyUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_yyyyVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_JzaoEH3sEeyivuDeOiJBMg" name="getConsolResultObservation2s" bodyCondition="_JzaoE33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_JzaoE33sEeyivuDeOiJBMg" name="body" constrainedElement="_JzaoEH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_JzaoFH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ResultObservation2)).oclAsType(consol::ResultObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_yyyyU19xEey5t-mahoHmrg" type="_H85E0PF7EeOmsLWmq5fnqQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yyyyVF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_JzaoEX3sEeyivuDeOiJBMg" type="_H85E0PF7EeOmsLWmq5fnqQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JzaoEn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -31862,54 +31862,54 @@ NOTE -- the severity observation is no longer associated with the allergy and in
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yzTvsF9xEey5t-mahoHmrg" name="SeverityObservation2TemplateId" constrainedElement="_B0oKYPJdEeO2NaSiicarcg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yzTvsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jz4iIH3sEeyivuDeOiJBMg" name="SeverityObservation2TemplateId" constrainedElement="_B0oKYPJdEeO2NaSiicarcg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jz4iIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.8' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yzWzAF9xEey5t-mahoHmrg" name="SeverityObservationCodeP" constrainedElement="_B0oKYPJdEeO2NaSiicarcg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yzWzAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jz7lcH3sEeyivuDeOiJBMg" name="SeverityObservationCodeP" constrainedElement="_B0oKYPJdEeO2NaSiicarcg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jz7lcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yzU90F9xEey5t-mahoHmrg" name="SeverityObservationCode" constrainedElement="_B0oKYPJdEeO2NaSiicarcg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yzU90V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jz6XUH3sEeyivuDeOiJBMg" name="SeverityObservationCode" constrainedElement="_B0oKYPJdEeO2NaSiicarcg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jz6XUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'SEV' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yzYBIF9xEey5t-mahoHmrg" name="SeverityObservationText" constrainedElement="_B0oKYPJdEeO2NaSiicarcg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yzYBIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jz9aoH3sEeyivuDeOiJBMg" name="SeverityObservationText" constrainedElement="_B0oKYPJdEeO2NaSiicarcg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jz9aoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yzbEcF9xEey5t-mahoHmrg" name="SeverityObservationStatusCodeP" constrainedElement="_B0oKYPJdEeO2NaSiicarcg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yzbEcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jz_24H3sEeyivuDeOiJBMg" name="SeverityObservationStatusCodeP" constrainedElement="_B0oKYPJdEeO2NaSiicarcg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jz_24X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yzZPQF9xEey5t-mahoHmrg" name="SeverityObservationStatusCode" constrainedElement="_B0oKYPJdEeO2NaSiicarcg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yzZPQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Jz-BsH3sEeyivuDeOiJBMg" name="SeverityObservationStatusCode" constrainedElement="_B0oKYPJdEeO2NaSiicarcg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Jz-BsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yz93AF9xEey5t-mahoHmrg" name="SeverityObservationValueP" constrainedElement="_B0oKYPJdEeO2NaSiicarcg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yz93AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J0eYAH3sEeyivuDeOiJBMg" name="SeverityObservationValueP" constrainedElement="_B0oKYPJdEeO2NaSiicarcg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J0eYAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (not self.value->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_yzcSkF9xEey5t-mahoHmrg" name="SeverityObservationValue" constrainedElement="_B0oKYPJdEeO2NaSiicarcg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_yzcSkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J0BFAH3sEeyivuDeOiJBMg" name="SeverityObservationValue" constrainedElement="_B0oKYPJdEeO2NaSiicarcg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J0BFAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
@@ -31940,68 +31940,68 @@ value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '24484000' or valu
           <body>code.codeSystem &lt;> '2.16.840.1.113883.6.1' and code.translation->size() >= 1 implies code.translation->forAll(trans : datatypes::CD | trans.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y0e0YF9xEey5t-mahoHmrg" name="SocialHistoryObservation2TemplateId" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y0e0YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J085IH3sEeyivuDeOiJBMg" name="SocialHistoryObservation2TemplateId" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J085IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.38' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y0gpkF9xEey5t-mahoHmrg" name="SocialHistoryObservationCode" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y0gpkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J0-uUH3sEeyivuDeOiJBMg" name="SocialHistoryObservationCode" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J0-uUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '229819007' or value.code = '256235009' or value.code = '160573003' or value.code = '364393001' or value.code = '364703007' or value.code = '425400000' or value.code = '363908000' or value.code = '228272008' or value.code = '105421008'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y1COAF9xEey5t-mahoHmrg" name="SocialHistoryObservationCodeP" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y1COAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J1dPcH3sEeyivuDeOiJBMg" name="SocialHistoryObservationCodeP" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J1dPcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y1mOsF9xEey5t-mahoHmrg" name="SocialHistoryObservationStatusCodeP" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y1mOsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J18-sH3sEeyivuDeOiJBMg" name="SocialHistoryObservationStatusCodeP" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J18-sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y1kZgF9xEey5t-mahoHmrg" name="SocialHistoryObservationStatusCode" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y1kZgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J17JgH3sEeyivuDeOiJBMg" name="SocialHistoryObservationStatusCode" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J17JgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y1nc0F9xEey5t-mahoHmrg" name="SocialHistoryObservation2EffectiveTime" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y1nc0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J1-M0H3sEeyivuDeOiJBMg" name="SocialHistoryObservation2EffectiveTime" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J1-M0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y1pSAF9xEey5t-mahoHmrg" name="SocialHistoryObservationValue" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y1pSAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J1_a8H3sEeyivuDeOiJBMg" name="SocialHistoryObservationValue" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J1_a8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (not self.value->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y2NSsF9xEey5t-mahoHmrg" name="SocialHistoryObservation2AuthorParticipation" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y2NSsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J2gYUH3sEeyivuDeOiJBMg" name="SocialHistoryObservation2AuthorParticipation" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J2gYUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8LSywF9xEey5t-mahoHmrg" name="SocialHistoryObservation2CDTranslation" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8LSywV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SVUXsH3sEeyivuDeOiJBMg" name="SocialHistoryObservation2CDTranslation" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SVUXsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (not translation->isEmpty() and translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 not value.codeSystem.oclIsUndefined() or not value.codeSystemName.oclIsUndefined())) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8LTZ0F9xEey5t-mahoHmrg" name="SocialHistoryObservation2CDTranslationP" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8LTZ0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SVUXsn3sEeyivuDeOiJBMg" name="SocialHistoryObservation2CDTranslationP" constrainedElement="_b_iGIPJfEeO2NaSiicarcg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SVUXs33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (( not translation->isEmpty()) ) )))</body>
         </specification>
@@ -32043,203 +32043,203 @@ The effectiveTime of the Substance or Device Allergy - Intolerance Observation i
           <body>self.entryRelationship->select(er : cda::EntryRelationship | er.observation.oclIsTypeOf(consol::AllergyStatusObservation2))->forAll(ent : cda::EntryRelationship | ent.inversionInd=true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y2N5wF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservation2TemplateId" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y2N5wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J2g_YH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservation2TemplateId" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J2g_YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.24.3.90' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y2Pu8F9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationEffectiveTime" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y2Pu8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J2jboH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationEffectiveTime" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J2jboX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y2zvoF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationValueP" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y2zvoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J3FnIH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationValueP" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J3FnIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (not self.value->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y2RkIF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationValue" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y2RkIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J2kpwH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationValue" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J2kpwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '420134006' or value.code = '418038007' or value.code = '419511003' or value.code = '418471000' or value.code = '419199007' or value.code = '416098002' or value.code = '414285001' or value.code = '59037007' or value.code = '235719002' or value.code = '232347008' or value.code = '426232007')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y22L4F9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationCodeP" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y22L4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J3HcUH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationCodeP" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J3HcUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y20WsF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationCode" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y20WsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J3GOMH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationCode" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J3GOMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y3fsIF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipant" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y3fsIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J3tSMH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipant" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J3tSMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y5AvEF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationReactionObservation" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y5AvEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J5CH4H3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationReactionObservation" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J5CH4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ReactionObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::MFST)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y5BWIF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationSeverityObservation" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y5BWIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J5Cu8H3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationSeverityObservation" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J5Cu8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SeverityObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y5hFYF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservation2AuthorParticipation" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y5hFYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J5eMwH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservation2AuthorParticipation" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J5eMwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4h9UkF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservation2CriticalityObservation" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4h9UkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OyWAMH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservation2CriticalityObservation" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OyWAMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::CriticalityObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4ld7kF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationAllergyStatusObservation" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4ld7kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O04W0H3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationAllergyStatusObservation" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O04W0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AllergyStatusObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8LUn8F9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservation2IVLTSLow" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8LUn8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SVVl0H3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservation2IVLTSLow" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SVVl0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((low.oclIsUndefined() or low.isNullFlavorUndefined()) implies (not low.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8LUn8l9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservation2IVLTSHigh" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8LUn819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SVVl0n3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservation2IVLTSHigh" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SVWM4H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((high.oclIsUndefined() or high.isNullFlavorUndefined()) implies (not high.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8NH-wF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8NH-wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SWv7EH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SWv7EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null).code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((originalText.oclIsUndefined() or originalText.isNullFlavorUndefined()) implies (true) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8NIl0F9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCETranslation" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8NIl0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SWwiIH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCETranslation" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SWwiIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null).code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (true) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8NIl0l9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityAllergySpecificMedication" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8NIl019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SWwiIn3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityAllergySpecificMedication" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SWwiI33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8NJM4F9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8NJM4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SWwiJH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SWxJMH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8NJM4l9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityReferenceValue" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8NJM419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SWxJMX3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityReferenceValue" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SWxJMn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8NJM5F9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8NJM5V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SWxJM33sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SWxJNH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8NJz8F9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityAllergyClassMedication" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8NJz8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SWxJNX3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityAllergyClassMedication" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SWxJNn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8NJz8l9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityAllergyFoodOtherSubstance" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8NJz819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SWxwQH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityAllergyFoodOtherSubstance" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SWxwQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8NKbAF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCode" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8NKbAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SWxwQn3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCode" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SWxwQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null).playingEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8NKbAl9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntity" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8NKbA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SWxwRH3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntity" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SWyXUH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).participantRole->excluding(null)->reject(playingEntity->one(playingEntity : cda::PlayingEntity | not playingEntity.oclIsUndefined() and playingEntity.oclIsKindOf(cda::PlayingEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8NLCEF9xEey5t-mahoHmrg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRole" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8NLCEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SWyXUX3sEeyivuDeOiJBMg" name="SubstanceOrDeviceAllergyObservationParticipantParticipantRole" constrainedElement="_K3M6IPKJEeOn7bMsPcStOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SWyXUn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(participantRole->one(participantRole : cda::ParticipantRole | not participantRole.oclIsUndefined() and participantRole.oclIsKindOf(cda::ParticipantRole)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_K3PWYPKJEeOn7bMsPcStOw" general="_mgny4NF8EeOHUokOVP95oQ"/>
-      <ownedOperation xmi:id="_y5AvEl9xEey5t-mahoHmrg" name="getConsolReactionObservation2s" bodyCondition="_y5AvFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_y5AvFV9xEey5t-mahoHmrg" name="body" constrainedElement="_y5AvEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_y5AvFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_J5CH4n3sEeyivuDeOiJBMg" name="getConsolReactionObservation2s" bodyCondition="_J5CH5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_J5CH5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_J5CH4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_J5CH5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ReactionObservation2)).oclAsType(consol::ReactionObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_y5AvE19xEey5t-mahoHmrg" type="_U3yosPDxEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y5AvFF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_J5CH433sEeyivuDeOiJBMg" type="_U3yosPDxEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J5CH5H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_y5BWIl9xEey5t-mahoHmrg" name="getConsolSeverityObservation2" bodyCondition="_y5BWJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_y5BWJV9xEey5t-mahoHmrg" name="body" constrainedElement="_y5BWIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_y5BWJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_J5Cu8n3sEeyivuDeOiJBMg" name="getConsolSeverityObservation2" bodyCondition="_J5Cu9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_J5Cu9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_J5Cu8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_J5Cu9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SeverityObservation2))->asSequence()->any(true).oclAsType(consol::SeverityObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_y5BWI19xEey5t-mahoHmrg" type="_B0oKYPJdEeO2NaSiicarcg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y5BWJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_J5Cu833sEeyivuDeOiJBMg" type="_B0oKYPJdEeO2NaSiicarcg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J5Cu9H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4h9Ukl9xEey5t-mahoHmrg" name="getCriticalityObservation" bodyCondition="_4h9UlV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4h9UlV9xEey5t-mahoHmrg" name="body" constrainedElement="_4h9Ukl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4h9Ull9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OyWAMn3sEeyivuDeOiJBMg" name="getCriticalityObservation" bodyCondition="_OyWnQn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OyWnQn3sEeyivuDeOiJBMg" name="body" constrainedElement="_OyWAMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OyWnQ33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CriticalityObservation))->asSequence()->any(true).oclAsType(consol::CriticalityObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4h9Uk19xEey5t-mahoHmrg" type="_LspMELDzEeafNo3UpQoAYw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4h9UlF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_OyWnQH3sEeyivuDeOiJBMg" type="_LspMELDzEeafNo3UpQoAYw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OyWnQX3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4ld7kl9xEey5t-mahoHmrg" name="getConsolAllergyStatusObservation2" bodyCondition="_4ld7lV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4ld7lV9xEey5t-mahoHmrg" name="body" constrainedElement="_4ld7kl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4ld7ll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_O04W0n3sEeyivuDeOiJBMg" name="getConsolAllergyStatusObservation2" bodyCondition="_O04W1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_O04W1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_O04W0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_O04W1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AllergyStatusObservation2))->asSequence()->any(true).oclAsType(consol::AllergyStatusObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4ld7k19xEey5t-mahoHmrg" type="_W5MCgEc1EeiFfJtNAawVHw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4ld7lF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_O04W033sEeyivuDeOiJBMg" type="_W5MCgEc1EeiFfJtNAawVHw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_O04W1H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -32249,52 +32249,52 @@ value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
 All the types of tobacco use are represented using the codes from the tobacco use and exposure-finding hierarchy in SNOMED CT, including codes required for recording smoking status in Meaningful Use Stage 2. &#xD;
 The effectiveTime element is used to describe dates associated with the patient's tobacco use. Whereas the Smoking Status - Meaningful Use (V2) template (2.16.840.1.113883.10.20.22.4.78:2014-06-09) represents a &quot;snapshot in time&quot; observation, simply reflecting what the patient's current smoking status is at the time of the observation, this Tobacco Use template uses effectiveTime to represent the biologically relevant time of the observation. Thus, to record a former smoker, an observation of &quot;cigarette smoker&quot; will have an effectiveTime/low defining the time the patient started to smoke cigarettes and an effectiveTime/high defining the time the patient ceased to smoke cigarettes. To record a current smoker, the effectiveTime/low will define the time the patient started smoking and will have no effectiveTime/high to indicated that the patient is still smoking.</body>
       </ownedComment>
-      <ownedRule xmi:id="_y5hscF9xEey5t-mahoHmrg" name="TobaccoUse2TemplateId" constrainedElement="_qHUXwPMxEeOUvapeh9bVvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y5hscV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J5eMwn3sEeyivuDeOiJBMg" name="TobaccoUse2TemplateId" constrainedElement="_qHUXwPMxEeOUvapeh9bVvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J5eMw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.85' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y5i6kF9xEey5t-mahoHmrg" name="TobaccoUse2Id" constrainedElement="_qHUXwPMxEeOUvapeh9bVvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y5i6kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J5fa4H3sEeyivuDeOiJBMg" name="TobaccoUse2Id" constrainedElement="_qHUXwPMxEeOUvapeh9bVvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J5fa4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y5l94F9xEey5t-mahoHmrg" name="TobaccoUseCodeP" constrainedElement="_qHUXwPMxEeOUvapeh9bVvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y5l94V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J5ieMH3sEeyivuDeOiJBMg" name="TobaccoUseCodeP" constrainedElement="_qHUXwPMxEeOUvapeh9bVvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J5ieMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y5kvwF9xEey5t-mahoHmrg" name="TobaccoUseCode" constrainedElement="_qHUXwPMxEeOUvapeh9bVvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y5kvwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J5gpAH3sEeyivuDeOiJBMg" name="TobaccoUseCode" constrainedElement="_qHUXwPMxEeOUvapeh9bVvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J5gpAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '11367-0')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y5nzEF9xEey5t-mahoHmrg" name="TobaccoUseEffectiveTime" constrainedElement="_qHUXwPMxEeOUvapeh9bVvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y5nzEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J5jsUH3sEeyivuDeOiJBMg" name="TobaccoUseEffectiveTime" constrainedElement="_qHUXwPMxEeOUvapeh9bVvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J5jsUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y6IJYF9xEey5t-mahoHmrg" name="TobaccoUse2AuthorParticipation" constrainedElement="_qHUXwPMxEeOUvapeh9bVvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y6IJYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J6CNcH3sEeyivuDeOiJBMg" name="TobaccoUse2AuthorParticipation" constrainedElement="_qHUXwPMxEeOUvapeh9bVvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J6CNcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8NNeUF9xEey5t-mahoHmrg" name="TobaccoUse2CDCodeTermAssertionOrLoinc" constrainedElement="_qHUXwPMxEeOUvapeh9bVvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8NNeUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SW0MgH3sEeyivuDeOiJBMg" name="TobaccoUse2CDCodeTermAssertionOrLoinc" constrainedElement="_qHUXwPMxEeOUvapeh9bVvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SW0MgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8NOscF9xEey5t-mahoHmrg" name="TobaccoUse2IVLTSHigh" constrainedElement="_qHUXwPMxEeOUvapeh9bVvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8NOscV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SW1aoH3sEeyivuDeOiJBMg" name="TobaccoUse2IVLTSHigh" constrainedElement="_qHUXwPMxEeOUvapeh9bVvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SW1aoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((high.oclIsUndefined() or high.isNullFlavorUndefined()) implies (not high.oclIsUndefined()) )))</body>
         </specification>
@@ -32323,52 +32323,52 @@ value.code = '11367-0')</body>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y6IJYl9xEey5t-mahoHmrg" name="VitalSignObservation2TemplateId" constrainedElement="__zeTcPM3EeOUvapeh9bVvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y6IJY19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J6C0gH3sEeyivuDeOiJBMg" name="VitalSignObservation2TemplateId" constrainedElement="__zeTcPM3EeOUvapeh9bVvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J6C0gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.27' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y6KloF9xEey5t-mahoHmrg" name="VitalSignObservationEffectiveTime" constrainedElement="__zeTcPM3EeOUvapeh9bVvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y6KloV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J6EpsH3sEeyivuDeOiJBMg" name="VitalSignObservationEffectiveTime" constrainedElement="__zeTcPM3EeOUvapeh9bVvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J6EpsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y6LzwF9xEey5t-mahoHmrg" name="VitalSignObservationValue" constrainedElement="__zeTcPM3EeOUvapeh9bVvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y6LzwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J6F30H3sEeyivuDeOiJBMg" name="VitalSignObservationValue" constrainedElement="__zeTcPM3EeOUvapeh9bVvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J6F30X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (not self.value->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y6No8F9xEey5t-mahoHmrg" name="VitalSignObservationText" constrainedElement="__zeTcPM3EeOUvapeh9bVvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y6No8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J6HtAH3sEeyivuDeOiJBMg" name="VitalSignObservationText" constrainedElement="__zeTcPM3EeOUvapeh9bVvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J6HtAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y66MgF9xEey5t-mahoHmrg" name="VitalSignObservationInterpretationCodeP" constrainedElement="__zeTcPM3EeOUvapeh9bVvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y66MgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J6oDUH3sEeyivuDeOiJBMg" name="VitalSignObservationInterpretationCodeP" constrainedElement="__zeTcPM3EeOUvapeh9bVvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J6oDUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.interpretationCode->isEmpty() or self.interpretationCode->exists(element | element.isNullFlavorUndefined())) implies (not self.interpretationCode->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y6O3EF9xEey5t-mahoHmrg" name="VitalSignObservationInterpretationCode" constrainedElement="__zeTcPM3EeOUvapeh9bVvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y6PeIF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J6JiMH3sEeyivuDeOiJBMg" name="VitalSignObservationInterpretationCode" constrainedElement="__zeTcPM3EeOUvapeh9bVvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J6JiMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.interpretationCode->isEmpty() or self.interpretationCode->exists(element | element.isNullFlavorUndefined())) implies (self.interpretationCode->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = element.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.83' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y78HQF9xEey5t-mahoHmrg" name="VitalSignObservation2AuthorParticipation" constrainedElement="__zeTcPM3EeOUvapeh9bVvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y78HQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J7mTsH3sEeyivuDeOiJBMg" name="VitalSignObservation2AuthorParticipation" constrainedElement="__zeTcPM3EeOUvapeh9bVvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J7mTsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y8dEoF9xEey5t-mahoHmrg" name="VitalSignObservationAuthor" constrainedElement="__zeTcPM3EeOUvapeh9bVvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y8dEoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J8ENwH3sEeyivuDeOiJBMg" name="VitalSignObservationAuthor" constrainedElement="__zeTcPM3EeOUvapeh9bVvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J8ENwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
@@ -32379,68 +32379,68 @@ value.codeSystem = '2.16.840.1.113883.5.83' and not value.code.oclIsUndefined())
       <ownedComment xmi:id="_jK-7wPV2EeONioZkBKP8eQ">
         <body>This template provides a mechanism for grouping vital signs (e.g., grouping systolic blood pressure and diastolic blood pressure).</body>
       </ownedComment>
-      <ownedRule xmi:id="_y8drsF9xEey5t-mahoHmrg" name="VitalSignsOrganizer2TemplateId" constrainedElement="_dDupoPV2EeONioZkBKP8eQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y8drsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J8E00H3sEeyivuDeOiJBMg" name="VitalSignsOrganizer2TemplateId" constrainedElement="_dDupoPV2EeONioZkBKP8eQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J8E00X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.26' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y8gH8F9xEey5t-mahoHmrg" name="VitalSignsOrganizerCodeP" constrainedElement="_dDupoPV2EeONioZkBKP8eQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y8gH8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J8GqAH3sEeyivuDeOiJBMg" name="VitalSignsOrganizerCodeP" constrainedElement="_dDupoPV2EeONioZkBKP8eQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J8HREH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y8eSwF9xEey5t-mahoHmrg" name="VitalSignsOrganizerCode" constrainedElement="_dDupoPV2EeONioZkBKP8eQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y8eSwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J8Fb4H3sEeyivuDeOiJBMg" name="VitalSignsOrganizerCode" constrainedElement="_dDupoPV2EeONioZkBKP8eQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J8Fb4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '46680005' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y8h9IF9xEey5t-mahoHmrg" name="VitalSignsOrganizerEffectiveTime" constrainedElement="_dDupoPV2EeONioZkBKP8eQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y8h9IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J8IfMH3sEeyivuDeOiJBMg" name="VitalSignsOrganizerEffectiveTime" constrainedElement="_dDupoPV2EeONioZkBKP8eQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J8IfMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y9FWwF9xEey5t-mahoHmrg" name="VitalSignsOrganizerVitalSignObservation" constrainedElement="_dDupoPV2EeONioZkBKP8eQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y9FWwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J8mZQH3sEeyivuDeOiJBMg" name="VitalSignsOrganizerVitalSignObservation" constrainedElement="_dDupoPV2EeONioZkBKP8eQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J8mZQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->exists(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::VitalSignObservation2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_y9ltEF9xEey5t-mahoHmrg" name="VitalSignsOrganizer2AuthorParticipation" constrainedElement="_dDupoPV2EeONioZkBKP8eQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_y9ltEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_J9CeIH3sEeyivuDeOiJBMg" name="VitalSignsOrganizer2AuthorParticipation" constrainedElement="_dDupoPV2EeONioZkBKP8eQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_J9CeIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8NP6kF9xEey5t-mahoHmrg" name="VitalSignsOrganizer2CDTranslation" constrainedElement="_dDupoPV2EeONioZkBKP8eQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8NP6kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SW2owH3sEeyivuDeOiJBMg" name="VitalSignsOrganizer2CDTranslation" constrainedElement="_dDupoPV2EeONioZkBKP8eQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SW2owX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->size() = 1 and translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.code = '74728-7' and value.codeSystem = '2.16.840.1.113883.6.1')) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8NQhoF9xEey5t-mahoHmrg" name="VitalSignsOrganizer2CDTranslationP" constrainedElement="_dDupoPV2EeONioZkBKP8eQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8NQhoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SW2own3sEeyivuDeOiJBMg" name="VitalSignsOrganizer2CDTranslationP" constrainedElement="_dDupoPV2EeONioZkBKP8eQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SW2ow33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->size() =  1) )))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_dDxF4PV2EeONioZkBKP8eQ" general="_2OlbCRSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_y9F90F9xEey5t-mahoHmrg" name="getConsolVitalSignObservation2s" bodyCondition="_y9F9019xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_y9F9019xEey5t-mahoHmrg" name="body" constrainedElement="_y9F90F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_y9F91F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_J8mZQn3sEeyivuDeOiJBMg" name="getConsolVitalSignObservation2s" bodyCondition="_J8mZRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_J8mZRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_J8mZQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_J8mZRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::VitalSignObservation2)).oclAsType(consol::VitalSignObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_y9F90V9xEey5t-mahoHmrg" type="__zeTcPM3EeOUvapeh9bVvQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y9F90l9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_J8mZQ33sEeyivuDeOiJBMg" type="__zeTcPM3EeOUvapeh9bVvQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J8mZRH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -32490,188 +32490,188 @@ value.code = '74728-7' and value.codeSystem = '2.16.840.1.113883.6.1')) )))</bod
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zMqq5V9xEey5t-mahoHmrg" name="MentalStatusObservation2TemplateId" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zMrR8F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KJovsH3sEeyivuDeOiJBMg" name="MentalStatusObservation2TemplateId" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KJovsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.74' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zMuVQF9xEey5t-mahoHmrg" name="ResultObservationClassCode" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zMuVQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KJrL8H3sEeyivuDeOiJBMg" name="ResultObservationClassCode" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KJrL8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zMxYkF9xEey5t-mahoHmrg" name="ResultObservationMoodCode" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zMxYkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KJtoMH3sEeyivuDeOiJBMg" name="ResultObservationMoodCode" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KJtoMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zMz00F9xEey5t-mahoHmrg" name="ResultObservationId" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zMz00V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KJvdYH3sEeyivuDeOiJBMg" name="ResultObservationId" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KJvdYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (not self.id->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zM3fMF9xEey5t-mahoHmrg" name="ResultObservationCodeP" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zM3fMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KJzHwH3sEeyivuDeOiJBMg" name="ResultObservationCodeP" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KJzHwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zM1qAF9xEey5t-mahoHmrg" name="ResultObservationCode" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zM1qAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KJwrgH3sEeyivuDeOiJBMg" name="ResultObservationCode" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KJwrgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '373930000' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zM7woF9xEey5t-mahoHmrg" name="ResultObservationStatusCodeP" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zM7woV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KJ3ZMH3sEeyivuDeOiJBMg" name="ResultObservationStatusCodeP" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KJ3ZMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zM5UYF9xEey5t-mahoHmrg" name="ResultObservationStatusCode" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zM5UYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KJ1kAH3sEeyivuDeOiJBMg" name="ResultObservationStatusCode" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KJ1kAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zM9l0F9xEey5t-mahoHmrg" name="ResultObservationEffectiveTime" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zM9l0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KJ51cH3sEeyivuDeOiJBMg" name="ResultObservationEffectiveTime" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KJ51cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zNACEF9xEey5t-mahoHmrg" name="ResultObservationValue" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zNACEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KJ7qoH3sEeyivuDeOiJBMg" name="ResultObservationValue" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KJ7qoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (not self.value->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zNCeUF9xEey5t-mahoHmrg" name="ResultObservationText" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zNCeUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KJ-G4H3sEeyivuDeOiJBMg" name="ResultObservationText" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KJ-G4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zNE6kF9xEey5t-mahoHmrg" name="ResultObservationInterpretationCode" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zNE6kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KJ_8EH3sEeyivuDeOiJBMg" name="ResultObservationInterpretationCode" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KJ_8EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.interpretationCode->isEmpty() or self.interpretationCode->exists(element | element.isNullFlavorUndefined())) implies (true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zNHW0F9xEey5t-mahoHmrg" name="ResultObservationMethodCode" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zNHW0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KKBxQH3sEeyivuDeOiJBMg" name="ResultObservationMethodCode" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KKBxQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.methodCode->isEmpty() or self.methodCode->exists(element | element.isNullFlavorUndefined())) implies (true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zNJMAF9xEey5t-mahoHmrg" name="ResultObservationTargetSiteCode" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zNJMAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KKENgH3sEeyivuDeOiJBMg" name="ResultObservationTargetSiteCode" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KKENgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.targetSiteCode->isEmpty() or self.targetSiteCode->exists(element | element.isNullFlavorUndefined())) implies (true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zNua0F9xEey5t-mahoHmrg" name="MentalStatusObservation2AuthorParticipation" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zNua0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KKnAEH3sEeyivuDeOiJBMg" name="MentalStatusObservation2AuthorParticipation" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KKnAEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zOPYMF9xEey5t-mahoHmrg" name="CognitiveStatusResultObservationAssessmentScaleObservation" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zOPYMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KLE6IH3sEeyivuDeOiJBMg" name="CognitiveStatusResultObservationAssessmentScaleObservation" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KLE6IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AssessmentScaleObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zOxjsF9xEey5t-mahoHmrg" name="CognitiveStatusResultObservationReferenceRange" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zOxjsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KLmekH3sEeyivuDeOiJBMg" name="CognitiveStatusResultObservationReferenceRange" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KLmekX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->exists(referenceRange : cda::ReferenceRange | not referenceRange.oclIsUndefined() and referenceRange.oclIsKindOf(cda::ReferenceRange))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4ikYkF9xEey5t-mahoHmrg" name="CognitiveStatusResultObservationAuthor" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4ikYkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OyxeAH3sEeyivuDeOiJBMg" name="CognitiveStatusResultObservationAuthor" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OyxeAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4jF9AF9xEey5t-mahoHmrg" name="CognitiveStatusResultObservationNonMedicinalSupplyActivity" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4jF9AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OzLtsH3sEeyivuDeOiJBMg" name="CognitiveStatusResultObservationNonMedicinalSupplyActivity" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OzLtsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4ju2MF9xEey5t-mahoHmrg" name="CognitiveStatusResultObservationCaregiverCharacteristics" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4ju2MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ozl9YH3sEeyivuDeOiJBMg" name="CognitiveStatusResultObservationCaregiverCharacteristics" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ozl9YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8NSW0F9xEey5t-mahoHmrg" name="MentalStatusObservation2CDTranslation" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8NSW0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SW4d8H3sEeyivuDeOiJBMg" name="MentalStatusObservation2CDTranslation" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SW4d8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->size() = 1 and translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.code = '75275-8' and value.codeSystem = '2.16.840.1.113883.6.1')) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8NSW0l9xEey5t-mahoHmrg" name="MentalStatusObservation2CDTranslationP" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8NSW019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SW4d8n3sEeyivuDeOiJBMg" name="MentalStatusObservation2CDTranslationP" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SW4d833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8OTDcF9xEey5t-mahoHmrg" name="CognitiveStatusResultObservationReferenceRangeObservationRangeNoCode" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8OTDcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SXwnsH3sEeyivuDeOiJBMg" name="CognitiveStatusResultObservationReferenceRangeObservationRangeNoCode" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SXwnsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->excluding(null).observationRange->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8OTDcl9xEey5t-mahoHmrg" name="CognitiveStatusResultObservationReferenceRangeObservationRange" constrainedElement="_ze150PitEeOXlK95I8tUew">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8OTqgF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SXxOwH3sEeyivuDeOiJBMg" name="CognitiveStatusResultObservationReferenceRangeObservationRange" constrainedElement="_ze150PitEeOXlK95I8tUew">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SXxOwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.referenceRange->excluding(null)->reject(true)</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_ze150fitEeOXlK95I8tUew" general="_gkBM0OZbEeGINOJ_SD9_dA"/>
-      <ownedOperation xmi:id="_zOPYMl9xEey5t-mahoHmrg" name="getConsolAssessmentScaleObservations" bodyCondition="_zOPYNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zOPYNV9xEey5t-mahoHmrg" name="body" constrainedElement="_zOPYMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zOPYNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KLE6In3sEeyivuDeOiJBMg" name="getConsolAssessmentScaleObservations" bodyCondition="_KLE6JX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KLE6JX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KLE6In3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KLE6Jn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AssessmentScaleObservation)).oclAsType(consol::AssessmentScaleObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zOPYM19xEey5t-mahoHmrg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zOPYNF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KLE6I33sEeyivuDeOiJBMg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KLE6JH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4jGkEF9xEey5t-mahoHmrg" name="getConsolNonMedicinalSupplyActivities" bodyCondition="_4jGkE19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4jGkE19xEey5t-mahoHmrg" name="body" constrainedElement="_4jGkEF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4jGkFF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OzLtsn3sEeyivuDeOiJBMg" name="getConsolNonMedicinalSupplyActivities" bodyCondition="_OzLttX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OzLttX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OzLtsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OzLttn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::NonMedicinalSupplyActivity)).oclAsType(consol::NonMedicinalSupplyActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4jGkEV9xEey5t-mahoHmrg" type="_2HIvMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4jGkEl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OzLts33sEeyivuDeOiJBMg" type="_2HIvMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OzLttH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4ju2Ml9xEey5t-mahoHmrg" name="getConsolCaregiverCharacteristicss" bodyCondition="_4ju2NV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4ju2NV9xEey5t-mahoHmrg" name="body" constrainedElement="_4ju2Ml9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4ju2Nl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ozl9Yn3sEeyivuDeOiJBMg" name="getConsolCaregiverCharacteristicss" bodyCondition="_Ozl9ZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ozl9ZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ozl9Yn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ozl9Zn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CaregiverCharacteristics)).oclAsType(consol::CaregiverCharacteristics)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4ju2M19xEey5t-mahoHmrg" type="__pNCUOY-EeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4ju2NF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Ozl9Y33sEeyivuDeOiJBMg" type="__pNCUOY-EeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ozl9ZH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -32679,59 +32679,59 @@ value.code = '75275-8' and value.codeSystem = '2.16.840.1.113883.6.1')) )))</bod
       <ownedComment xmi:id="_n-ZDQPu_EeOyiMEKhdqMGA">
         <body>The Anesthesia Section records the type of anesthesia (e.g., general or local) and may state the actual agent used. This may be a subsection of the Procedure Description Section. The full details of anesthesia are usually found in a separate Anesthesia Note.</body>
       </ownedComment>
-      <ownedRule xmi:id="_zRBmc19xEey5t-mahoHmrg" name="AnesthesiaSection2TemplateId" constrainedElement="_aetyEPu_EeOyiMEKhdqMGA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zRCNgF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KNXZI33sEeyivuDeOiJBMg" name="AnesthesiaSection2TemplateId" constrainedElement="_aetyEPu_EeOyiMEKhdqMGA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KNYAMH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.25' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zREpwF9xEey5t-mahoHmrg" name="AnesthesiaSectionCodeP" constrainedElement="_aetyEPu_EeOyiMEKhdqMGA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zREpwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KNZ1YH3sEeyivuDeOiJBMg" name="AnesthesiaSectionCodeP" constrainedElement="_aetyEPu_EeOyiMEKhdqMGA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KNZ1YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zRC0kF9xEey5t-mahoHmrg" name="AnesthesiaSectionCode" constrainedElement="_aetyEPu_EeOyiMEKhdqMGA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zRC0kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KNYnQH3sEeyivuDeOiJBMg" name="AnesthesiaSectionCode" constrainedElement="_aetyEPu_EeOyiMEKhdqMGA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KNYnQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '59774-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zRlnIF9xEey5t-mahoHmrg" name="AnesthesiaSectionProcedureActivityProcedure" constrainedElement="_aetyEPu_EeOyiMEKhdqMGA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zRlnIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KNzeAH3sEeyivuDeOiJBMg" name="AnesthesiaSectionProcedureActivityProcedure" constrainedElement="_aetyEPu_EeOyiMEKhdqMGA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KNzeAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.procedure.oclIsUndefined() and entry.procedure.oclIsKindOf(consol::ProcedureActivityProcedure2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zSF9cF9xEey5t-mahoHmrg" name="AnesthesiaSectionMedicationActivity" constrainedElement="_aetyEPu_EeOyiMEKhdqMGA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zSF9cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KOO70H3sEeyivuDeOiJBMg" name="AnesthesiaSectionMedicationActivity" constrainedElement="_aetyEPu_EeOyiMEKhdqMGA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KOO70X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.substanceAdministration.oclIsUndefined() and entry.substanceAdministration.oclIsKindOf(consol::MedicationActivity2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_aevnQPu_EeOyiMEKhdqMGA" general="_OA_Q0DVyEeGaW4kr-GbV8Q"/>
-      <ownedOperation xmi:id="_zRmOMF9xEey5t-mahoHmrg" name="getConsolProcedureActivityProcedure2s" bodyCondition="_zRmOM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zRmOM19xEey5t-mahoHmrg" name="body" constrainedElement="_zRmOMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zRmONF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KNzeAn3sEeyivuDeOiJBMg" name="getConsolProcedureActivityProcedure2s" bodyCondition="_KNzeBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KNzeBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KNzeAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KNzeBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getProcedures()->select(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::ProcedureActivityProcedure2)).oclAsType(consol::ProcedureActivityProcedure2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zRmOMV9xEey5t-mahoHmrg" type="_fCVOQPDqEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zRmOMl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KNzeA33sEeyivuDeOiJBMg" type="_fCVOQPDqEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KNzeBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zSF9cl9xEey5t-mahoHmrg" name="getConsolMedicationActivity2s" bodyCondition="_zSF9dV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zSF9dV9xEey5t-mahoHmrg" name="body" constrainedElement="_zSF9cl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zSF9dl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KOPi4H3sEeyivuDeOiJBMg" name="getConsolMedicationActivity2s" bodyCondition="_KOPi433sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KOPi433sEeyivuDeOiJBMg" name="body" constrainedElement="_KOPi4H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KOPi5H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity2)).oclAsType(consol::MedicationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zSF9c19xEey5t-mahoHmrg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zSF9dF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KOPi4X3sEeyivuDeOiJBMg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KOPi4n3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -32740,42 +32740,42 @@ value.code = '59774-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         <body>This section represents the clinician's conclusions and working assumptions that will guide treatment of the patient. The Assessment and Plan Section may be combined or separated to meet local policy requirements.&#xD;
 See also the Assessment Section: templateId 2.16.840.1.113883.10.20.22.2.8 and Plan of Treatment Section (V2): templateId 2.16.840.1.113883.10.20.22.2.10:2014-06-09</body>
       </ownedComment>
-      <ownedRule xmi:id="_zSGkgF9xEey5t-mahoHmrg" name="AssessmentAndPlanSection2TemplateId" constrainedElement="_q_8twPvVEeOvZJBdQKQrqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zSGkgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KOPi5X3sEeyivuDeOiJBMg" name="AssessmentAndPlanSection2TemplateId" constrainedElement="_q_8twPvVEeOvZJBdQKQrqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KOPi5n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.9' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zSJAwF9xEey5t-mahoHmrg" name="AssessmentAndPlanSectionCodeP" constrainedElement="_q_8twPvVEeOvZJBdQKQrqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zSJAwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KORYEH3sEeyivuDeOiJBMg" name="AssessmentAndPlanSectionCodeP" constrainedElement="_q_8twPvVEeOvZJBdQKQrqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KORYEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zSHLkF9xEey5t-mahoHmrg" name="AssessmentAndPlanSectionCode" constrainedElement="_q_8twPvVEeOvZJBdQKQrqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zSHLkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KOQJ8X3sEeyivuDeOiJBMg" name="AssessmentAndPlanSectionCode" constrainedElement="_q_8twPvVEeOvZJBdQKQrqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KOQJ8n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '51847-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zSowAF9xEey5t-mahoHmrg" name="AssessmentAndPlanSectionPlanOfCareActivityAct" constrainedElement="_q_8twPvVEeOvZJBdQKQrqQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zSpXEF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KOtc8H3sEeyivuDeOiJBMg" name="AssessmentAndPlanSectionPlanOfCareActivityAct" constrainedElement="_q_8twPvVEeOvZJBdQKQrqQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KOtc8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::PlannedAct2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_q__KAPvVEeOvZJBdQKQrqQ" general="_2Rwq0BSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_zSpXEV9xEey5t-mahoHmrg" name="getConsolPlannedAct2s" bodyCondition="_zSpXFF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zSpXFF9xEey5t-mahoHmrg" name="body" constrainedElement="_zSpXEV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zSpXFV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KOtc8n3sEeyivuDeOiJBMg" name="getConsolPlannedAct2s" bodyCondition="_KOtc9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KOtc9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_KOtc8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KOtc9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PlannedAct2)).oclAsType(consol::PlannedAct2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zSpXEl9xEey5t-mahoHmrg" type="_lLnRMOaYEeOmzetP5oaH3A" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zSpXE19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KOtc833sEeyivuDeOiJBMg" type="_lLnRMOaYEeOmzetP5oaH3A" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KOtc9H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -32792,42 +32792,42 @@ value.code = '51847-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zSpXFl9xEey5t-mahoHmrg" name="ComplicationsSection2TemplateId" constrainedElement="_6M-msPvXEeOes-3T-2HryA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zSp-IF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KOuEAH3sEeyivuDeOiJBMg" name="ComplicationsSection2TemplateId" constrainedElement="_6M-msPvXEeOes-3T-2HryA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KOuEAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.37' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zSsaYF9xEey5t-mahoHmrg" name="ComplicationsSectionCodeP" constrainedElement="_6M-msPvXEeOes-3T-2HryA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zSsaYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KOv5MH3sEeyivuDeOiJBMg" name="ComplicationsSectionCodeP" constrainedElement="_6M-msPvXEeOes-3T-2HryA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KOv5MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zSrMQF9xEey5t-mahoHmrg" name="ComplicationsSectionCode" constrainedElement="_6M-msPvXEeOes-3T-2HryA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zSrMQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KOurEH3sEeyivuDeOiJBMg" name="ComplicationsSectionCode" constrainedElement="_6M-msPvXEeOes-3T-2HryA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KOurEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '55109-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zTN-0F9xEey5t-mahoHmrg" name="ComplicationsSectionProblemObservation" constrainedElement="_6M-msPvXEeOes-3T-2HryA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zTN-0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KPMlIH3sEeyivuDeOiJBMg" name="ComplicationsSectionProblemObservation" constrainedElement="_6M-msPvXEeOes-3T-2HryA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KPMlIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::ProblemObservation2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_6NBC8PvXEeOes-3T-2HryA" general="_R1OXcDVyEeGaW4kr-GbV8Q"/>
-      <ownedOperation xmi:id="_zTN-0l9xEey5t-mahoHmrg" name="getConsolProblemObservation2s" bodyCondition="_zTN-1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zTN-1V9xEey5t-mahoHmrg" name="body" constrainedElement="_zTN-0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zTN-1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KPMlIn3sEeyivuDeOiJBMg" name="getConsolProblemObservation2s" bodyCondition="_KPNMMX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KPNMMX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KPMlIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KPNMMn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation2)).oclAsType(consol::ProblemObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zTN-019xEey5t-mahoHmrg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zTN-1F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KPMlI33sEeyivuDeOiJBMg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KPNMMH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -32835,42 +32835,42 @@ value.code = '55109-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_-E3hcPvbEeOJwYDYIUCQDg">
         <body>This section lists and describes any healthcare encounters pertinent to the patient's current health status or historical health history. An encounter is an interaction, regardless of the setting, between a patient and a practitioner who is vested with primary responsibility for diagnosing, evaluating, or treating the patient's condition. It may include visits, appointments, or non-face-to-face interactions. It is also a contact between a patient and a practitioner who has primary responsibility (exercising independent judgment) for assessing and treating the patient at a given contact. This section may contain all encounters for the time period being summarized, but should include notable encounters.</body>
       </ownedComment>
-      <ownedRule xmi:id="_zTOl4F9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalTemplateId" constrainedElement="_kgM0YPvbEeOJwYDYIUCQDg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zTOl4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KPNMM33sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalTemplateId" constrainedElement="_kgM0YPvbEeOJwYDYIUCQDg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KPNMNH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.22' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zTRCIF9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalCodeP" constrainedElement="_kgM0YPvbEeOJwYDYIUCQDg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zTRCIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KPPocH3sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalCodeP" constrainedElement="_kgM0YPvbEeOJwYDYIUCQDg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KPPocX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zTPM8F9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalCode" constrainedElement="_kgM0YPvbEeOJwYDYIUCQDg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zTPM8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KPNzQH3sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalCode" constrainedElement="_kgM0YPvbEeOJwYDYIUCQDg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KPNzQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '46240-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zTx_gF9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalEncounterActivities" constrainedElement="_kgM0YPvbEeOJwYDYIUCQDg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zTymkF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KPybAH3sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalEncounterActivities" constrainedElement="_kgM0YPvbEeOJwYDYIUCQDg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KPybAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.encounter.oclIsUndefined() and entry.encounter.oclIsKindOf(consol::EncounterActivity2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_kgOpkPvbEeOJwYDYIUCQDg" general="_4yj2wBVdEeGQCvUGzi1kDQ"/>
-      <ownedOperation xmi:id="_zTymkV9xEey5t-mahoHmrg" name="getConsolEncounterActivity2s" bodyCondition="_zTymlF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zTymlF9xEey5t-mahoHmrg" name="body" constrainedElement="_zTymkV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zTymlV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KPybAn3sEeyivuDeOiJBMg" name="getConsolEncounterActivity2s" bodyCondition="_KPybBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KPybBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KPybAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KPzCEH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getEncounters()->select(encounter : cda::Encounter | not encounter.oclIsUndefined() and encounter.oclIsKindOf(consol::EncounterActivity2)).oclAsType(consol::EncounterActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zTymkl9xEey5t-mahoHmrg" type="_RGU34MzDEeO93sHu8pHB2g" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zTymk19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KPybA33sEeyivuDeOiJBMg" type="_RGU34MzDEeO93sHu8pHB2g" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KPybBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -32878,178 +32878,178 @@ value.code = '46240-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_vTMUQPyIEeOozpLKXSm5NA">
         <body>The Functional Status Section contains observations and assessments of a patient's physical abilities. A patient's functional status may include information regarding the patient's ability to perform Activities of Daily Living (ADLs) in areas such as Mobility (e.g., ambulation), Self-Care (e.g., bathing, dressing, feeding, grooming) or Instrumental Activities of Daily Living (IADLs) (e.g., shopping, using a telephone, balancing a check book). Problems that impact function (e.g., dyspnea, dysphagia) can be contained in the section.</body>
       </ownedComment>
-      <ownedRule xmi:id="_zTymll9xEey5t-mahoHmrg" name="FunctionalStatusSection2TemplateId" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zTzNoF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KPzCEX3sEeyivuDeOiJBMg" name="FunctionalStatusSection2TemplateId" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KPzCEn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.14' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zT1p4F9xEey5t-mahoHmrg" name="FunctionalStatusSectionCodeP" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zT1p4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KP1eUH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionCodeP" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KP1eUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zTz0sF9xEey5t-mahoHmrg" name="FunctionalStatusSectionCode" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zTz0sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KPzpIH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionCode" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KPzpIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '47420-5' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zUZqkF9xEey5t-mahoHmrg" name="FunctionalStatusSectionFunctionalStatusResultOrganizer" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zUZqkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KQTYYH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionFunctionalStatusResultOrganizer" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KQTYYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.organizer.oclIsUndefined() and entry.organizer.oclIsKindOf(consol::FunctionalStatusOrganizer2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zU7PAF9xEey5t-mahoHmrg" name="FunctionalStatusSectionFunctionalStatusResultObservation" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zU7PAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KQwrYH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionFunctionalStatusResultObservation" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KQwrYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::FunctionalStatusObservation2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zVczcF9xEey5t-mahoHmrg" name="FunctionalStatusSectionCognitiveStatusResultOrganizer" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zVczcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KRMwQH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionCognitiveStatusResultOrganizer" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KRMwQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zV9w0F9xEey5t-mahoHmrg" name="FunctionalStatusSectionCognitiveStatusResultObservation" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zV9w0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KRqqUH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionCognitiveStatusResultObservation" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KRqqUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zWbD0F9xEey5t-mahoHmrg" name="FunctionalStatusSectionNonMedicinalSupplyActivity" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zWbD0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KSGIIH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionNonMedicinalSupplyActivity" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KSGIIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.supply.oclIsUndefined() and entry.supply.oclIsKindOf(consol::NonMedicinalSupplyActivity2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zW5k8F9xEey5t-mahoHmrg" name="FunctionalStatusSectionNumberOfPressureUlcersObservation" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zW5k8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KSg-4H3sEeyivuDeOiJBMg" name="FunctionalStatusSectionNumberOfPressureUlcersObservation" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KSg-4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zXYtIF9xEey5t-mahoHmrg" name="FunctionalStatusSectionHighestPressureUlcerStage" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zXYtIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KS8csH3sEeyivuDeOiJBMg" name="FunctionalStatusSectionHighestPressureUlcerStage" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KS9DwH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zX31UF9xEey5t-mahoHmrg" name="FunctionalStatusSection2SelfCareActivities" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zX31UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KTXTcH3sEeyivuDeOiJBMg" name="FunctionalStatusSection2SelfCareActivities" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KTXTcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::SelfCareActivities))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zYUhQF9xEey5t-mahoHmrg" name="FunctionalStatusSection2SensoryAndSpeechStatus" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zYUhQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KT2boH3sEeyivuDeOiJBMg" name="FunctionalStatusSection2SensoryAndSpeechStatus" constrainedElement="_8rMFkPyHEeOozpLKXSm5NA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KT2boX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::SensoryStatus))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_8rQXAPyHEeOozpLKXSm5NA" general="_2KKOBhSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_zUaRoF9xEey5t-mahoHmrg" name="getConsolFunctionalStatusOrganizer2s" bodyCondition="_zUaRo19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zUaRo19xEey5t-mahoHmrg" name="body" constrainedElement="_zUaRoF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zUaRpF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KQTYYn3sEeyivuDeOiJBMg" name="getConsolFunctionalStatusOrganizer2s" bodyCondition="_KQTYZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KQTYZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KQTYYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KQTYZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::FunctionalStatusOrganizer2)).oclAsType(consol::FunctionalStatusOrganizer2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zUaRoV9xEey5t-mahoHmrg" type="_yU2tgOD0EeOmBMTtnrPqww" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zUaRol9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KQTYY33sEeyivuDeOiJBMg" type="_yU2tgOD0EeOmBMTtnrPqww" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KQTYZH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zU72EF9xEey5t-mahoHmrg" name="getConsolFunctionalStatusObservation2s" bodyCondition="_zU72E19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zU72E19xEey5t-mahoHmrg" name="body" constrainedElement="_zU72EF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zU72FF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KQwrYn3sEeyivuDeOiJBMg" name="getConsolFunctionalStatusObservation2s" bodyCondition="_KQwrZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KQwrZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KQwrYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KQwrZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::FunctionalStatusObservation2)).oclAsType(consol::FunctionalStatusObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zU72EV9xEey5t-mahoHmrg" type="_3WqogMzSEeO93sHu8pHB2g" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zU72El9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KQwrY33sEeyivuDeOiJBMg" type="_3WqogMzSEeO93sHu8pHB2g" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KQwrZH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zVdagF9xEey5t-mahoHmrg" name="getConsolCognitiveStatusResultOrganizers" bodyCondition="_zVdag19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zVdag19xEey5t-mahoHmrg" name="body" constrainedElement="_zVdagF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zVdahF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KRMwQn3sEeyivuDeOiJBMg" name="getConsolCognitiveStatusResultOrganizers" bodyCondition="_KRNXUn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KRNXUn3sEeyivuDeOiJBMg" name="body" constrainedElement="_KRMwQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KRNXU33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::CognitiveStatusResultOrganizer)).oclAsType(consol::CognitiveStatusResultOrganizer)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zVdagV9xEey5t-mahoHmrg" type="_jfoCUOZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zVdagl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KRNXUH3sEeyivuDeOiJBMg" type="_jfoCUOZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KRNXUX3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zV9w0l9xEey5t-mahoHmrg" name="getConsolCognitiveStatusResultObservations" bodyCondition="_zV9w1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zV9w1V9xEey5t-mahoHmrg" name="body" constrainedElement="_zV9w0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zV9w1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KRqqUn3sEeyivuDeOiJBMg" name="getConsolCognitiveStatusResultObservations" bodyCondition="_KRqqVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KRqqVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KRqqUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KRqqVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CognitiveStatusResultObservation)).oclAsType(consol::CognitiveStatusResultObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zV9w019xEey5t-mahoHmrg" type="_gkBM0OZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zV9w1F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KRqqU33sEeyivuDeOiJBMg" type="_gkBM0OZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KRqqVH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zWbD0l9xEey5t-mahoHmrg" name="getConsolNonMedicinalSupplyActivity2s" bodyCondition="_zWbD1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zWbD1V9xEey5t-mahoHmrg" name="body" constrainedElement="_zWbD0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zWbD1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KSGIIn3sEeyivuDeOiJBMg" name="getConsolNonMedicinalSupplyActivity2s" bodyCondition="_KSGIJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KSGIJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KSGIIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KSGIJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::NonMedicinalSupplyActivity2)).oclAsType(consol::NonMedicinalSupplyActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zWbD019xEey5t-mahoHmrg" type="_k_C20OaCEeOmzetP5oaH3A" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zWbD1F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KSGII33sEeyivuDeOiJBMg" type="_k_C20OaCEeOmzetP5oaH3A" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KSGIJH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zW6MAF9xEey5t-mahoHmrg" name="getConsolNumberOfPressureUlcersObservations" bodyCondition="_zW6MA19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zW6MA19xEey5t-mahoHmrg" name="body" constrainedElement="_zW6MAF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zW6MBF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KSg-4n3sEeyivuDeOiJBMg" name="getConsolNumberOfPressureUlcersObservations" bodyCondition="_KSg-5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KSg-5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_KSg-4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KSg-5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::NumberOfPressureUlcersObservation)).oclAsType(consol::NumberOfPressureUlcersObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zW6MAV9xEey5t-mahoHmrg" type="_7c4ssOZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zW6MAl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KSg-433sEeyivuDeOiJBMg" type="_7c4ssOZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KSg-5H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zXZUMF9xEey5t-mahoHmrg" name="getConsolHighestPressureUlcerStages" bodyCondition="_zXZUM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zXZUM19xEey5t-mahoHmrg" name="body" constrainedElement="_zXZUMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zXZUNF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KS9DwX3sEeyivuDeOiJBMg" name="getConsolHighestPressureUlcerStages" bodyCondition="_KS9DxH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KS9DxH3sEeyivuDeOiJBMg" name="body" constrainedElement="_KS9DwX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KS9DxX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::HighestPressureUlcerStage)).oclAsType(consol::HighestPressureUlcerStage)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zXZUMV9xEey5t-mahoHmrg" type="_4YgVsOZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zXZUMl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KS9Dwn3sEeyivuDeOiJBMg" type="_4YgVsOZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KS9Dw33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zX31Ul9xEey5t-mahoHmrg" name="getSelfCareActivitiess" bodyCondition="_zX31VV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zX31VV9xEey5t-mahoHmrg" name="body" constrainedElement="_zX31Ul9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zX31Vl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KTX6gH3sEeyivuDeOiJBMg" name="getSelfCareActivitiess" bodyCondition="_KTX6g33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KTX6g33sEeyivuDeOiJBMg" name="body" constrainedElement="_KTX6gH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KTX6hH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SelfCareActivities)).oclAsType(consol::SelfCareActivities)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zX31U19xEey5t-mahoHmrg" type="_nC0xUJmzEeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zX31VF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KTX6gX3sEeyivuDeOiJBMg" type="_nC0xUJmzEeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KTX6gn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zYVIUF9xEey5t-mahoHmrg" name="getSensoryAndSpeechStatuss" bodyCondition="_zYVIU19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zYVIU19xEey5t-mahoHmrg" name="body" constrainedElement="_zYVIUF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zYVIVF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KT2bon3sEeyivuDeOiJBMg" name="getSensoryAndSpeechStatuss" bodyCondition="_KT2bpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KT2bpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KT2bon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KT2bpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SensoryStatus)).oclAsType(consol::SensoryStatus)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zYVIUV9xEey5t-mahoHmrg" type="_kyeGAJm4EeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zYVIUl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KT2bo33sEeyivuDeOiJBMg" type="_kyeGAJm4EeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KT2bpH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -33057,42 +33057,42 @@ value.code = '47420-5' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_9w3VYPyhEeOC19UEcu7MOw">
         <body>This section contains a record of the patient's past complaints, problems, and diagnoses. It contains data from the patient's past up to the patient's current complaint or reason for seeking medical care.</body>
       </ownedComment>
-      <ownedRule xmi:id="_zYVIVV9xEey5t-mahoHmrg" name="HistoryOfPastIllnessSection2TemplateId" constrainedElement="_sZlggPyhEeOC19UEcu7MOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zYVIVl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KT3CsH3sEeyivuDeOiJBMg" name="HistoryOfPastIllnessSection2TemplateId" constrainedElement="_sZlggPyhEeOC19UEcu7MOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KT3CsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.20' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zYYLoF9xEey5t-mahoHmrg" name="HistoryOfPastIllnessSectionCodeP" constrainedElement="_sZlggPyhEeOC19UEcu7MOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zYYLoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KT434H3sEeyivuDeOiJBMg" name="HistoryOfPastIllnessSectionCodeP" constrainedElement="_sZlggPyhEeOC19UEcu7MOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KT434X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zYWWcF9xEey5t-mahoHmrg" name="HistoryOfPastIllnessSectionCode" constrainedElement="_sZlggPyhEeOC19UEcu7MOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zYWWcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KT3pwH3sEeyivuDeOiJBMg" name="HistoryOfPastIllnessSectionCode" constrainedElement="_sZlggPyhEeOC19UEcu7MOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KT3pwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '11348-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zY5JAF9xEey5t-mahoHmrg" name="HistoryOfPastIllnessSectionProblemObservation" constrainedElement="_sZlggPyhEeOC19UEcu7MOw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zY5JAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KUVj0H3sEeyivuDeOiJBMg" name="HistoryOfPastIllnessSectionProblemObservation" constrainedElement="_sZlggPyhEeOC19UEcu7MOw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KUVj0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::ProblemObservation2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_sZn8wPyhEeOC19UEcu7MOw" general="_2PQJcxSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_zY5wEF9xEey5t-mahoHmrg" name="getConsolProblemObservation2s" bodyCondition="_zY5wE19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zY5wE19xEey5t-mahoHmrg" name="body" constrainedElement="_zY5wEF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zY5wFF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KUVj0n3sEeyivuDeOiJBMg" name="getConsolProblemObservation2s" bodyCondition="_KUVj1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KUVj1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_KUVj0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KUVj1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation2)).oclAsType(consol::ProblemObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zY5wEV9xEey5t-mahoHmrg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zY5wEl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KUVj033sEeyivuDeOiJBMg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KUVj1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -33100,56 +33100,56 @@ value.code = '11348-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_mqyN0PylEeOc0tW1-DpN-Q">
         <body>This section contains a narrative description of the problems or diagnoses identified by the clinician at the time of the patient's admission. This section may contain coded entries representing the admitting diagnoses.</body>
       </ownedComment>
-      <ownedRule xmi:id="_zY5wFV9xEey5t-mahoHmrg" name="AdmissionDiagnosisSection2TemplateId" constrainedElement="_ctJgAPylEeOc0tW1-DpN-Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zY5wFl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KUVj133sEeyivuDeOiJBMg" name="AdmissionDiagnosisSection2TemplateId" constrainedElement="_ctJgAPylEeOc0tW1-DpN-Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KUVj2H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.43' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zY8MUF9xEey5t-mahoHmrg" name="HospitalAdmissionDiagnosisSectionCodeP" constrainedElement="_ctJgAPylEeOc0tW1-DpN-Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zY8MUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KUYAEH3sEeyivuDeOiJBMg" name="HospitalAdmissionDiagnosisSectionCodeP" constrainedElement="_ctJgAPylEeOc0tW1-DpN-Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KUYAEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zY6-MF9xEey5t-mahoHmrg" name="HospitalAdmissionDiagnosisSectionCode" constrainedElement="_ctJgAPylEeOc0tW1-DpN-Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zY6-MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KUWK4X3sEeyivuDeOiJBMg" name="HospitalAdmissionDiagnosisSectionCode" constrainedElement="_ctJgAPylEeOc0tW1-DpN-Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KUWx8H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '46241-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zZfl8F9xEey5t-mahoHmrg" name="HospitalAdmissionDiagnosisSectionHospitalAdmissionDiagnosis" constrainedElement="_ctJgAPylEeOc0tW1-DpN-Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zZfl8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KU4WYH3sEeyivuDeOiJBMg" name="HospitalAdmissionDiagnosisSectionHospitalAdmissionDiagnosis" constrainedElement="_ctJgAPylEeOc0tW1-DpN-Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KU4WYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->one(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::HospitalAdmissionDiagnosis2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8OU4oF9xEey5t-mahoHmrg" name="AdmissionDiagnosisSection2CETranslation" constrainedElement="_ctJgAPylEeOc0tW1-DpN-Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8OU4oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SXyc4H3sEeyivuDeOiJBMg" name="AdmissionDiagnosisSection2CETranslation" constrainedElement="_ctJgAPylEeOc0tW1-DpN-Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SXyc4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->size() = 1 and translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.code = '42347-5' and value.codeSystem = '2.16.840.1.113883.6.1')) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8OVfsF9xEey5t-mahoHmrg" name="AdmissionDiagnosisSection2CETranslationP" constrainedElement="_ctJgAPylEeOc0tW1-DpN-Q">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8OVfsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SXyc4n3sEeyivuDeOiJBMg" name="AdmissionDiagnosisSection2CETranslationP" constrainedElement="_ctJgAPylEeOc0tW1-DpN-Q">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SXyc433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->size() =  1) )))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_ctL8QPylEeOc0tW1-DpN-Q" general="_2PidQhSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_zZgNAF9xEey5t-mahoHmrg" name="getConsolHospitalAdmissionDiagnosis2" bodyCondition="_zZgNA19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zZgNA19xEey5t-mahoHmrg" name="body" constrainedElement="_zZgNAF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zZgNBF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KU4WYn3sEeyivuDeOiJBMg" name="getConsolHospitalAdmissionDiagnosis2" bodyCondition="_KU4WZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KU4WZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KU4WYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KU49cH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::HospitalAdmissionDiagnosis2))->asSequence()->any(true).oclAsType(consol::HospitalAdmissionDiagnosis2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zZgNAV9xEey5t-mahoHmrg" type="_GM6icOEIEeOmBMTtnrPqww" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zZgNAl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_KU4WY33sEeyivuDeOiJBMg" type="_GM6icOEIEeOmBMTtnrPqww" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KU4WZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -33157,42 +33157,42 @@ value.code = '42347-5' and value.codeSystem = '2.16.840.1.113883.6.1')) )))</bod
       <ownedComment xmi:id="_hnpR0PyqEeOlg_Cnc5bODw">
         <body>The section contains the medications taken by the patient prior to and at the time of admission to the facility.</body>
       </ownedComment>
-      <ownedRule xmi:id="_zZgNBV9xEey5t-mahoHmrg" name="HospitalAdmissionMedicationsSectionEntriesOptionalTemplateId" constrainedElement="_ZLY3MPyqEeOlg_Cnc5bODw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zZgNBl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KU49cX3sEeyivuDeOiJBMg" name="HospitalAdmissionMedicationsSectionEntriesOptionalTemplateId" constrainedElement="_ZLY3MPyqEeOlg_Cnc5bODw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KU49cn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.44' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zZipQF9xEey5t-mahoHmrg" name="HospitalAdmissionMedicationsSectionEntriesOptionalCodeP" constrainedElement="_ZLY3MPyqEeOlg_Cnc5bODw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zZipQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KU7ZsH3sEeyivuDeOiJBMg" name="HospitalAdmissionMedicationsSectionEntriesOptionalCodeP" constrainedElement="_ZLY3MPyqEeOlg_Cnc5bODw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KU7ZsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zZhbIF9xEey5t-mahoHmrg" name="HospitalAdmissionMedicationsSectionEntriesOptionalCode" constrainedElement="_ZLY3MPyqEeOlg_Cnc5bODw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zZhbIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KU5kgX3sEeyivuDeOiJBMg" name="HospitalAdmissionMedicationsSectionEntriesOptionalCode" constrainedElement="_ZLY3MPyqEeOlg_Cnc5bODw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KU5kgn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '42346-7' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zaE0wF9xEey5t-mahoHmrg" name="HospitalAdmissionMedicationsSectionEntriesOptionalAdmissionMedication" constrainedElement="_ZLY3MPyqEeOlg_Cnc5bODw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zaE0wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KVYssH3sEeyivuDeOiJBMg" name="HospitalAdmissionMedicationsSectionEntriesOptionalAdmissionMedication" constrainedElement="_ZLY3MPyqEeOlg_Cnc5bODw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KVYssX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::AdmissionMedication2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_ZLbTcPyqEeOlg_Cnc5bODw" general="_2Poj5BSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_zaE0wl9xEey5t-mahoHmrg" name="getConsolAdmissionMedication2s" bodyCondition="_zaE0xV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zaE0xV9xEey5t-mahoHmrg" name="body" constrainedElement="_zaE0wl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zaE0xl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KVYssn3sEeyivuDeOiJBMg" name="getConsolAdmissionMedication2s" bodyCondition="_KVYstX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KVYstX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KVYssn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KVYstn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::AdmissionMedication2)).oclAsType(consol::AdmissionMedication2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zaE0w19xEey5t-mahoHmrg" type="_ZQpEwK-1EeO8duI_7f6kZw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zaE0xF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KVYss33sEeyivuDeOiJBMg" type="_ZQpEwK-1EeO8duI_7f6kZw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KVYstH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -33200,56 +33200,56 @@ value.code = '42346-7' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_CsRpAPyuEeOmn53IDV99zw">
         <body>&lt;p>This template represents problems or diagnoses present at the time of discharge which occurred during the hospitalization. This section includes an optional entry to record patient diagnoses specific to this visit. Problems that need ongoing tracking should also be included in the Problem Section. DSTU:1238&lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_zaE0x19xEey5t-mahoHmrg" name="DischargeDiagnosisSection2TemplateId" constrainedElement="_jfuGYPytEeOmn53IDV99zw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zaFb0F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KVZTwH3sEeyivuDeOiJBMg" name="DischargeDiagnosisSection2TemplateId" constrainedElement="_jfuGYPytEeOmn53IDV99zw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KVZTwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.24' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zaH4EF9xEey5t-mahoHmrg" name="HospitalDischargeDiagnosisSectionCodeP" constrainedElement="_jfuGYPytEeOmn53IDV99zw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zaH4EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KVbI8H3sEeyivuDeOiJBMg" name="HospitalDischargeDiagnosisSectionCodeP" constrainedElement="_jfuGYPytEeOmn53IDV99zw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KVbI8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zaGC4F9xEey5t-mahoHmrg" name="HospitalDischargeDiagnosisSectionCode" constrainedElement="_jfuGYPytEeOmn53IDV99zw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zaGC4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KVZ60H3sEeyivuDeOiJBMg" name="HospitalDischargeDiagnosisSectionCode" constrainedElement="_jfuGYPytEeOmn53IDV99zw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KVZ60X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '11535-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zar4wF9xEey5t-mahoHmrg" name="HospitalDischargeDiagnosisSectionHospitalDischargeDiagnosis" constrainedElement="_jfuGYPytEeOmn53IDV99zw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zar4wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KV304H3sEeyivuDeOiJBMg" name="HospitalDischargeDiagnosisSectionHospitalDischargeDiagnosis" constrainedElement="_jfuGYPytEeOmn53IDV99zw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KV304X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->one(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::HospitalDischargeDiagnosis2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8OWGwF9xEey5t-mahoHmrg" name="DischargeDiagnosisSection2CETranslation" constrainedElement="_jfuGYPytEeOmn53IDV99zw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8OWt0F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SXzrAH3sEeyivuDeOiJBMg" name="DischargeDiagnosisSection2CETranslation" constrainedElement="_jfuGYPytEeOmn53IDV99zw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SXzrAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->size() = 1 and translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.code = '78375-3' and value.codeSystem = '2.16.840.1.113883.6.1')) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8OWt0V9xEey5t-mahoHmrg" name="DischargeDiagnosisSection2CETranslationP" constrainedElement="_jfuGYPytEeOmn53IDV99zw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8OWt0l9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SXzrAn3sEeyivuDeOiJBMg" name="DischargeDiagnosisSection2CETranslationP" constrainedElement="_jfuGYPytEeOmn53IDV99zw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SXzrA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->size() =  1) )))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_jfv7kPytEeOmn53IDV99zw" general="_2PidURSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_zar4wl9xEey5t-mahoHmrg" name="getConsolHospitalDischargeDiagnosis2" bodyCondition="_zar4xV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zar4xV9xEey5t-mahoHmrg" name="body" constrainedElement="_zar4wl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zar4xl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KV4b8H3sEeyivuDeOiJBMg" name="getConsolHospitalDischargeDiagnosis2" bodyCondition="_KV4b833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KV4b833sEeyivuDeOiJBMg" name="body" constrainedElement="_KV4b8H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KV4b9H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::HospitalDischargeDiagnosis2))->asSequence()->any(true).oclAsType(consol::HospitalDischargeDiagnosis2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zar4w19xEey5t-mahoHmrg" type="_Trd1cOEMEeOmBMTtnrPqww" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zar4xF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_KV4b8X3sEeyivuDeOiJBMg" type="_Trd1cOEMEeOmBMTtnrPqww" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KV4b8n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -33257,56 +33257,56 @@ value.code = '78375-3' and value.codeSystem = '2.16.840.1.113883.6.1')) )))</bod
       <ownedComment xmi:id="_PlPGMPyzEeOfAK77IvEBUw">
         <body>This section contains the medications the patient is intended to take or stop after discharge. Current, active medications must be listed. The section may also include a patient's prescription history and indicate the source of the medication list.</body>
       </ownedComment>
-      <ownedRule xmi:id="_zasf0F9xEey5t-mahoHmrg" name="HospitalDischargeMedicationsSectionEntriesOptionalTemplateId" constrainedElement="_HlfBYPyzEeOfAK77IvEBUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zasf0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KV4b9X3sEeyivuDeOiJBMg" name="HospitalDischargeMedicationsSectionEntriesOptionalTemplateId" constrainedElement="_HlfBYPyzEeOfAK77IvEBUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KV4b9n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.11' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zau8EF9xEey5t-mahoHmrg" name="HospitalDischargeMedicationsSectionEntriesOptionalCodeP" constrainedElement="_HlfBYPyzEeOfAK77IvEBUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zau8EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KV64MH3sEeyivuDeOiJBMg" name="HospitalDischargeMedicationsSectionEntriesOptionalCodeP" constrainedElement="_HlfBYPyzEeOfAK77IvEBUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KV64MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zatt8F9xEey5t-mahoHmrg" name="HospitalDischargeMedicationsSectionEntriesOptionalCode" constrainedElement="_HlfBYPyzEeOfAK77IvEBUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zatt8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KV5qEH3sEeyivuDeOiJBMg" name="HospitalDischargeMedicationsSectionEntriesOptionalCode" constrainedElement="_HlfBYPyzEeOfAK77IvEBUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KV5qEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10183-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zbSVsF9xEey5t-mahoHmrg" name="HospitalDischargeMedicationsSectionEntriesOptionalDischargeMedication" constrainedElement="_HlfBYPyzEeOfAK77IvEBUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zbSVsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KWb1kH3sEeyivuDeOiJBMg" name="HospitalDischargeMedicationsSectionEntriesOptionalDischargeMedication" constrainedElement="_HlfBYPyzEeOfAK77IvEBUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KWb1kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::DischargeMedication2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8OX78F9xEey5t-mahoHmrg" name="DischargeMedicationsSectionEntriesOptional2CETranslation" constrainedElement="_HlfBYPyzEeOfAK77IvEBUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8OX78V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SX05IH3sEeyivuDeOiJBMg" name="DischargeMedicationsSectionEntriesOptional2CETranslation" constrainedElement="_HlfBYPyzEeOfAK77IvEBUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SX05IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->size() = 1 and translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.code = '75311-1' and value.codeSystem = '2.16.840.1.113883.6.1')) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8OX78l9xEey5t-mahoHmrg" name="DischargeMedicationsSectionEntriesOptional2CETranslationP" constrainedElement="_HlfBYPyzEeOfAK77IvEBUw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8OX7819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SX05In3sEeyivuDeOiJBMg" name="DischargeMedicationsSectionEntriesOptional2CETranslationP" constrainedElement="_HlfBYPyzEeOfAK77IvEBUw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SX05I33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->size() =  1) )))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_HlhdoPyzEeOfAK77IvEBUw" general="_2Poj7RSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_zbSVsl9xEey5t-mahoHmrg" name="getConsolDischargeMedication2s" bodyCondition="_zbSVtV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zbSVtV9xEey5t-mahoHmrg" name="body" constrainedElement="_zbSVsl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zbSVtl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KWccoH3sEeyivuDeOiJBMg" name="getConsolDischargeMedication2s" bodyCondition="_KWcco33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KWcco33sEeyivuDeOiJBMg" name="body" constrainedElement="_KWccoH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KWccpH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::DischargeMedication2)).oclAsType(consol::DischargeMedication2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zbSVs19xEey5t-mahoHmrg" type="_EIeu8MyjEeO93sHu8pHB2g" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zbSVtF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KWccoX3sEeyivuDeOiJBMg" type="_EIeu8MyjEeO93sHu8pHB2g" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KWccon3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -33314,42 +33314,42 @@ value.code = '75311-1' and value.codeSystem = '2.16.840.1.113883.6.1')) )))</bod
       <ownedComment xmi:id="_5M3jwPy3EeO1SvUcmWeLDQ">
         <body>The Immunizations Section defines a patient's current immunization status and pertinent immunization history. The primary use case for the Immunization Section is to enable communication of a patient's immunization status. The section should include current immunization status, and may contain the entire immunization history that is relevant to the period of time being summarized.</body>
       </ownedComment>
-      <ownedRule xmi:id="_zbS8wF9xEey5t-mahoHmrg" name="ImmunizationsSectionEntriesOptionalTemplateId" constrainedElement="_kdQhIPy3EeO1SvUcmWeLDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zbS8wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KWccpX3sEeyivuDeOiJBMg" name="ImmunizationsSectionEntriesOptionalTemplateId" constrainedElement="_kdQhIPy3EeO1SvUcmWeLDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KWccpn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.2' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zbVZAF9xEey5t-mahoHmrg" name="ImmunizationsSectionEntriesOptionalCodeP" constrainedElement="_kdQhIPy3EeO1SvUcmWeLDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zbVZAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KWe44H3sEeyivuDeOiJBMg" name="ImmunizationsSectionEntriesOptionalCodeP" constrainedElement="_kdQhIPy3EeO1SvUcmWeLDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KWe44X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zbTj0V9xEey5t-mahoHmrg" name="ImmunizationsSectionEntriesOptionalCode" constrainedElement="_kdQhIPy3EeO1SvUcmWeLDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zbTj0l9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KWdDsX3sEeyivuDeOiJBMg" name="ImmunizationsSectionEntriesOptionalCode" constrainedElement="_kdQhIPy3EeO1SvUcmWeLDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KWdDsn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '11369-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zb29cF9xEey5t-mahoHmrg" name="ImmunizationsSectionEntriesOptionalImmunizationActivity" constrainedElement="_kdQhIPy3EeO1SvUcmWeLDQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zb29cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KW8y8H3sEeyivuDeOiJBMg" name="ImmunizationsSectionEntriesOptionalImmunizationActivity" constrainedElement="_kdQhIPy3EeO1SvUcmWeLDQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KW8y8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.substanceAdministration.oclIsUndefined() and entry.substanceAdministration.oclIsKindOf(consol::ImmunizationActivity2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_kdS9YPy3EeO1SvUcmWeLDQ" general="_EuPloBVeEeGQCvUGzi1kDQ"/>
-      <ownedOperation xmi:id="_zb3kgF9xEey5t-mahoHmrg" name="getConsolImmunizationActivity2s" bodyCondition="_zb3kg19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zb3kg19xEey5t-mahoHmrg" name="body" constrainedElement="_zb3kgF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zb3khF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KW8y8n3sEeyivuDeOiJBMg" name="getConsolImmunizationActivity2s" bodyCondition="_KW9aAn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KW9aAn3sEeyivuDeOiJBMg" name="body" constrainedElement="_KW8y8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KW9aA33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::ImmunizationActivity2)).oclAsType(consol::ImmunizationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zb3kgV9xEey5t-mahoHmrg" type="_zI6vcOE7EeOTq9XEMvvkWw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zb3kgl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KW9aAH3sEeyivuDeOiJBMg" type="_zI6vcOE7EeOTq9XEMvvkWw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KW9aAX3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -33357,48 +33357,48 @@ value.code = '11369-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_4mmykP1HEeOVx4YMwgfjlA">
         <body>The Instructions Section records instructions given to a patient. List patient decision aids here.</body>
       </ownedComment>
-      <ownedRule xmi:id="_zb3khV9xEey5t-mahoHmrg" name="InstructionsSection2TemplateId" constrainedElement="_k8L2YP1HEeOVx4YMwgfjlA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zb3khl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KW9aBH3sEeyivuDeOiJBMg" name="InstructionsSection2TemplateId" constrainedElement="_k8L2YP1HEeOVx4YMwgfjlA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KW9aBX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.45' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zb5ZsF9xEey5t-mahoHmrg" name="InstructionsSection2NullFlavor" constrainedElement="_k8L2YP1HEeOVx4YMwgfjlA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zb5ZsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KW-oIH3sEeyivuDeOiJBMg" name="InstructionsSection2NullFlavor" constrainedElement="_k8L2YP1HEeOVx4YMwgfjlA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KW-oIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('nullFlavor')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zb718F9xEey5t-mahoHmrg" name="InstructionsSectionCodeP" constrainedElement="_k8L2YP1HEeOVx4YMwgfjlA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zb718V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KXBEYH3sEeyivuDeOiJBMg" name="InstructionsSectionCodeP" constrainedElement="_k8L2YP1HEeOVx4YMwgfjlA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KXBEYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zb6AwF9xEey5t-mahoHmrg" name="InstructionsSectionCode" constrainedElement="_k8L2YP1HEeOVx4YMwgfjlA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zb6AwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KW_2QH3sEeyivuDeOiJBMg" name="InstructionsSectionCode" constrainedElement="_k8L2YP1HEeOVx4YMwgfjlA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KW_2QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '69730-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zclWMF9xEey5t-mahoHmrg" name="InstructionsSectionInstructions" constrainedElement="_k8L2YP1HEeOVx4YMwgfjlA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zclWMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KXdJQH3sEeyivuDeOiJBMg" name="InstructionsSectionInstructions" constrainedElement="_k8L2YP1HEeOVx4YMwgfjlA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KXdJQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::Instruction2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_k8O5sP1HEeOVx4YMwgfjlA" general="_4qKukEE1EeGdmoWy_aLP0Q"/>
-      <ownedOperation xmi:id="_zclWMl9xEey5t-mahoHmrg" name="getConsolInstruction2s" bodyCondition="_zclWNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zclWNV9xEey5t-mahoHmrg" name="body" constrainedElement="_zclWMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zclWNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KXdJQn3sEeyivuDeOiJBMg" name="getConsolInstruction2s" bodyCondition="_KXdJRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KXdJRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KXdJQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KXdJRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instruction2)).oclAsType(consol::Instruction2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zclWM19xEey5t-mahoHmrg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zclWNF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KXdJQ33sEeyivuDeOiJBMg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KXdJRH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -33417,76 +33417,76 @@ Instructions are nested within interventions and may include self-care instructi
 Instructions are information or directions to the patient. Use the Instructions Section when instructions are included as part of a document that is not a Care Plan. Use the Interventions Section, containing the Intervention Act containing the Instruction entry, when instructions are part of a structured care plan.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_zcl9QF9xEey5t-mahoHmrg" name="InterventionsSection2TemplateId" constrainedElement="_YCS1AP1WEeOW-qBXb0kbTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zcl9QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KXdwUH3sEeyivuDeOiJBMg" name="InterventionsSection2TemplateId" constrainedElement="_YCS1AP1WEeOW-qBXb0kbTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KXdwUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.21.2.3' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zcpAkF9xEey5t-mahoHmrg" name="InterventionsSectionCodeP" constrainedElement="_YCS1AP1WEeOW-qBXb0kbTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zcpAkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KXflgH3sEeyivuDeOiJBMg" name="InterventionsSectionCodeP" constrainedElement="_YCS1AP1WEeOW-qBXb0kbTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KXflgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zcnLYF9xEey5t-mahoHmrg" name="InterventionsSectionCode" constrainedElement="_YCS1AP1WEeOW-qBXb0kbTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zcnLYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KXeXYH3sEeyivuDeOiJBMg" name="InterventionsSectionCode" constrainedElement="_YCS1AP1WEeOW-qBXb0kbTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KXeXYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '62387-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zdLMEF9xEey5t-mahoHmrg" name="InterventionsSection2InterventionAct" constrainedElement="_YCS1AP1WEeOW-qBXb0kbTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zdLMEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KYAi4H3sEeyivuDeOiJBMg" name="InterventionsSection2InterventionAct" constrainedElement="_YCS1AP1WEeOW-qBXb0kbTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KYAi4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::InterventionAct))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3UjGQF9xEey5t-mahoHmrg" name="InterventionsSection2HandoffCommunication" constrainedElement="_YCS1AP1WEeOW-qBXb0kbTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3UjGQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NxfnMH3sEeyivuDeOiJBMg" name="InterventionsSection2HandoffCommunication" constrainedElement="_YCS1AP1WEeOW-qBXb0kbTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NxfnMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::HandoffCommunicationParticipants))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4J3ksF9xEey5t-mahoHmrg" name="InterventionsSection2PlannedInterventionAct" constrainedElement="_YCS1AP1WEeOW-qBXb0kbTA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4J3ksV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OfCpsH3sEeyivuDeOiJBMg" name="InterventionsSection2PlannedInterventionAct" constrainedElement="_YCS1AP1WEeOW-qBXb0kbTA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OfCpsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::PlannedInterventionAct))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_YCVRQP1WEeOW-qBXb0kbTA" general="_hqzJADVyEeGaW4kr-GbV8Q"/>
-      <ownedOperation xmi:id="_zdLMEl9xEey5t-mahoHmrg" name="getInterventionActs" bodyCondition="_zdLMFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zdLMFV9xEey5t-mahoHmrg" name="body" constrainedElement="_zdLMEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zdLMFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KYBJ8H3sEeyivuDeOiJBMg" name="getInterventionActs" bodyCondition="_KYBJ833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KYBJ833sEeyivuDeOiJBMg" name="body" constrainedElement="_KYBJ8H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KYBJ9H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::InterventionAct)).oclAsType(consol::InterventionAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zdLME19xEey5t-mahoHmrg" type="_XD5vgJA8EeOZX935IVJfOg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zdLMFF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KYBJ8X3sEeyivuDeOiJBMg" type="_XD5vgJA8EeOZX935IVJfOg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KYBJ8n3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3UjGQl9xEey5t-mahoHmrg" name="getHandoffCommunications" bodyCondition="_3UjGRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3UjGRV9xEey5t-mahoHmrg" name="body" constrainedElement="_3UjGQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3UjGRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NxfnMn3sEeyivuDeOiJBMg" name="getHandoffCommunications" bodyCondition="_NxfnNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NxfnNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NxfnMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NxfnNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::HandoffCommunicationParticipants)).oclAsType(consol::HandoffCommunicationParticipants)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3UjGQ19xEey5t-mahoHmrg" type="_POfwAIz7EeOoMZgUoTghIg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3UjGRF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_NxfnM33sEeyivuDeOiJBMg" type="_POfwAIz7EeOoMZgUoTghIg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NxfnNH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4J3ksl9xEey5t-mahoHmrg" name="getPlannedInterventionActs" bodyCondition="_4J4LwF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4J4LwF9xEey5t-mahoHmrg" name="body" constrainedElement="_4J3ksl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4J4LwV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OfCpsn3sEeyivuDeOiJBMg" name="getPlannedInterventionActs" bodyCondition="_OfCptX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OfCptX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OfCpsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OfCptn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PlannedInterventionAct)).oclAsType(consol::PlannedInterventionAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4J3ks19xEey5t-mahoHmrg" type="_dGARYOLSEeS505YV9ux2XA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4J3ktF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OfCps33sEeyivuDeOiJBMg" type="_dGARYOLSEeS505YV9ux2XA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OfCptH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -33496,76 +33496,76 @@ value.code = '62387-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
 Devices applied to, or placed in, the patient are represented with the Procedure Activity Procedure (V2) template. Equipment supplied to the patient (e.g., pumps, inhalers, wheelchairs) is represented by the Non-Medicinal Supply Activity V2 template.&#xD;
 These devices may be grouped together within a Medical Equipment Organizer. The organizer would probably not be used with devices applied in or on the patient but rather to organize a group of medical supplies the patient has been supplied with.</body>
       </ownedComment>
-      <ownedRule xmi:id="_zdLzIF9xEey5t-mahoHmrg" name="MedicalEquipmentSection2TemplateId" constrainedElement="_5OKxwP1bEeO5Hq-yrsJSmg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zdLzIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KYBJ9X3sEeyivuDeOiJBMg" name="MedicalEquipmentSection2TemplateId" constrainedElement="_5OKxwP1bEeO5Hq-yrsJSmg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KYBJ9n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.23' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zdOPYF9xEey5t-mahoHmrg" name="MedicalEquipmentSectionCodeP" constrainedElement="_5OKxwP1bEeO5Hq-yrsJSmg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zdOPYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KYDmMH3sEeyivuDeOiJBMg" name="MedicalEquipmentSectionCodeP" constrainedElement="_5OKxwP1bEeO5Hq-yrsJSmg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KYDmMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zdMaMF9xEey5t-mahoHmrg" name="MedicalEquipmentSectionCode" constrainedElement="_5OKxwP1bEeO5Hq-yrsJSmg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zdMaMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KYBxAX3sEeyivuDeOiJBMg" name="MedicalEquipmentSectionCode" constrainedElement="_5OKxwP1bEeO5Hq-yrsJSmg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KYBxAn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '46264-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zdwa4F9xEey5t-mahoHmrg" name="MedicalEquipmentSectionNonMedicinalSupplyActivity" constrainedElement="_5OKxwP1bEeO5Hq-yrsJSmg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zdwa4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KYiHUH3sEeyivuDeOiJBMg" name="MedicalEquipmentSectionNonMedicinalSupplyActivity" constrainedElement="_5OKxwP1bEeO5Hq-yrsJSmg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KYiHUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.supply.oclIsUndefined() and entry.supply.oclIsKindOf(consol::NonMedicinalSupplyActivity2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zeRYQF9xEey5t-mahoHmrg" name="MedicalEquipmentSection2MedicalEquipmentOrganizer" constrainedElement="_5OKxwP1bEeO5Hq-yrsJSmg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zeRYQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KY_aUH3sEeyivuDeOiJBMg" name="MedicalEquipmentSection2MedicalEquipmentOrganizer" constrainedElement="_5OKxwP1bEeO5Hq-yrsJSmg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KY_aUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.organizer.oclIsUndefined() and entry.organizer.oclIsKindOf(consol::MedicalEquipmentOrganizer))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zeyVoF9xEey5t-mahoHmrg" name="MedicalEquipmentSection2ProcedureActivityProcedure2" constrainedElement="_5OKxwP1bEeO5Hq-yrsJSmg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zeyVoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KZZqAH3sEeyivuDeOiJBMg" name="MedicalEquipmentSection2ProcedureActivityProcedure2" constrainedElement="_5OKxwP1bEeO5Hq-yrsJSmg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KZaREH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.procedure.oclIsUndefined() and entry.procedure.oclIsKindOf(consol::ProcedureActivityProcedure2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_5OOcIP1bEeO5Hq-yrsJSmg" general="_2KEucBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_zdwa4l9xEey5t-mahoHmrg" name="getConsolNonMedicinalSupplyActivity2s" bodyCondition="_zdwa5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zdwa5V9xEey5t-mahoHmrg" name="body" constrainedElement="_zdwa4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zdwa5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KYiuYH3sEeyivuDeOiJBMg" name="getConsolNonMedicinalSupplyActivity2s" bodyCondition="_KYiuY33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KYiuY33sEeyivuDeOiJBMg" name="body" constrainedElement="_KYiuYH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KYiuZH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::NonMedicinalSupplyActivity2)).oclAsType(consol::NonMedicinalSupplyActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zdwa419xEey5t-mahoHmrg" type="_k_C20OaCEeOmzetP5oaH3A" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zdwa5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KYiuYX3sEeyivuDeOiJBMg" type="_k_C20OaCEeOmzetP5oaH3A" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KYiuYn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zeRYQl9xEey5t-mahoHmrg" name="getMedicalEquipmentOrganizers" bodyCondition="_zeRYRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zeRYRV9xEey5t-mahoHmrg" name="body" constrainedElement="_zeRYQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zeRYRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KY_aUn3sEeyivuDeOiJBMg" name="getMedicalEquipmentOrganizers" bodyCondition="_KZABYH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KZABYH3sEeyivuDeOiJBMg" name="body" constrainedElement="_KY_aUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KZABYX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::MedicalEquipmentOrganizer)).oclAsType(consol::MedicalEquipmentOrganizer)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zeRYQ19xEey5t-mahoHmrg" type="_RbbCII0dEeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zeRYRF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KY_aU33sEeyivuDeOiJBMg" type="_RbbCII0dEeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KY_aVH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zeyVol9xEey5t-mahoHmrg" name="getProcedureActivityProcedure2s" bodyCondition="_zeyVpV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zeyVpV9xEey5t-mahoHmrg" name="body" constrainedElement="_zeyVol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zeyVpl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KZaREX3sEeyivuDeOiJBMg" name="getProcedureActivityProcedure2s" bodyCondition="_KZaRFH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KZaRFH3sEeyivuDeOiJBMg" name="body" constrainedElement="_KZaREX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KZaRFX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getProcedures()->select(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::ProcedureActivityProcedure2)).oclAsType(consol::ProcedureActivityProcedure2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zeyVo19xEey5t-mahoHmrg" type="_fCVOQPDqEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zeyVpF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KZaREn3sEeyivuDeOiJBMg" type="_fCVOQPDqEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KZaRE33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -33573,42 +33573,42 @@ value.code = '46264-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_cc_vkP4jEeOwFalSp0fRiw">
         <body>The Medications Administered Section usually resides inside a Procedure Note describing a procedure. This section defines medications and fluids administered during the procedure, its related encounter, or other procedure related activity excluding anesthetic medications. Anesthesia medications should be documented as described in the Anesthesia Section templateId 2.16.840.1.113883.10.20.22.2.25.</body>
       </ownedComment>
-      <ownedRule xmi:id="_zey8sF9xEey5t-mahoHmrg" name="MedicationsAdministeredSection2TemplateId" constrainedElement="_F37nMP4jEeOwFalSp0fRiw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zey8sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KZaRFn3sEeyivuDeOiJBMg" name="MedicationsAdministeredSection2TemplateId" constrainedElement="_F37nMP4jEeOwFalSp0fRiw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KZaRF33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.38' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ze1Y8F9xEey5t-mahoHmrg" name="MedicationsAdministeredSectionCodeP" constrainedElement="_F37nMP4jEeOwFalSp0fRiw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ze1Y8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KZctUH3sEeyivuDeOiJBMg" name="MedicationsAdministeredSectionCodeP" constrainedElement="_F37nMP4jEeOwFalSp0fRiw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KZctUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zezjwF9xEey5t-mahoHmrg" name="MedicationsAdministeredSectionCode" constrainedElement="_F37nMP4jEeOwFalSp0fRiw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zezjwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KZa4IX3sEeyivuDeOiJBMg" name="MedicationsAdministeredSectionCode" constrainedElement="_F37nMP4jEeOwFalSp0fRiw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KZa4In3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '29549-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zfXkcF9xEey5t-mahoHmrg" name="MedicationsAdministeredSectionMedicationActivity" constrainedElement="_F37nMP4jEeOwFalSp0fRiw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zfXkcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KZ29AH3sEeyivuDeOiJBMg" name="MedicationsAdministeredSectionMedicationActivity" constrainedElement="_F37nMP4jEeOwFalSp0fRiw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KZ29AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.substanceAdministration.oclIsUndefined() and entry.substanceAdministration.oclIsKindOf(consol::MedicationActivity2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_F3_RkP4jEeOwFalSp0fRiw" general="_2Poj_BSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_zfXkcl9xEey5t-mahoHmrg" name="getConsolMedicationActivity2s" bodyCondition="_zfYLgl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zfYLgl9xEey5t-mahoHmrg" name="body" constrainedElement="_zfXkcl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zfYLg19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KZ29An3sEeyivuDeOiJBMg" name="getConsolMedicationActivity2s" bodyCondition="_KZ29BX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KZ29BX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KZ29An3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KZ29Bn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity2)).oclAsType(consol::MedicationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zfYLgF9xEey5t-mahoHmrg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zfYLgV9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KZ29A33sEeyivuDeOiJBMg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KZ29BH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -33624,42 +33624,42 @@ Each unique instance of a payer and all the pertinent data needed to contact, bi
 The sources of payment are represented as a Coverage Activity, which identifies all of the insurance policies or government or other programs that cover some or all of the patient's healthcare expenses. The policies or programs are sequenced by preference. The Coverage Activity has a sequence number that represents the preference order. Each policy or program identifies the covered party with respect to the payer, so that the identifiers can be recorded.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_zfYLhF9xEey5t-mahoHmrg" name="PayersSection2TemplateId" constrainedElement="_twgM0P4lEeOzC5ykp-XCaA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zfYLhV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KZ3kEH3sEeyivuDeOiJBMg" name="PayersSection2TemplateId" constrainedElement="_twgM0P4lEeOzC5ykp-XCaA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KZ3kEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.18' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zfbO0F9xEey5t-mahoHmrg" name="PayersSectionCodeP" constrainedElement="_twgM0P4lEeOzC5ykp-XCaA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zfbO0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KZ5ZQH3sEeyivuDeOiJBMg" name="PayersSectionCodeP" constrainedElement="_twgM0P4lEeOzC5ykp-XCaA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KZ5ZQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zfZZoF9xEey5t-mahoHmrg" name="PayersSectionCode" constrainedElement="_twgM0P4lEeOzC5ykp-XCaA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zfZZoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KZ4LIH3sEeyivuDeOiJBMg" name="PayersSectionCode" constrainedElement="_twgM0P4lEeOzC5ykp-XCaA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KZ4LIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '48768-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zf8MMF9xEey5t-mahoHmrg" name="PayersSectionCoverageActivity" constrainedElement="_twgM0P4lEeOzC5ykp-XCaA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zf8MMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KaU3EH3sEeyivuDeOiJBMg" name="PayersSectionCoverageActivity" constrainedElement="_twgM0P4lEeOzC5ykp-XCaA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KaVeIH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::CoverageActivity2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_twipEP4lEeOzC5ykp-XCaA" general="_2MV_UBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_zf8MMl9xEey5t-mahoHmrg" name="getConsolCoverageActivity2s" bodyCondition="_zf8MNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zf8MNV9xEey5t-mahoHmrg" name="body" constrainedElement="_zf8MMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zf8MNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KaVeIX3sEeyivuDeOiJBMg" name="getConsolCoverageActivity2s" bodyCondition="_KaVeJH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KaVeJH3sEeyivuDeOiJBMg" name="body" constrainedElement="_KaVeIX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KaVeJX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::CoverageActivity2)).oclAsType(consol::CoverageActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zf8MM19xEey5t-mahoHmrg" type="_aJr6ULkxEeODDJAC5t5vpw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zf8MNF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KaVeIn3sEeyivuDeOiJBMg" type="_aJr6ULkxEeODDJAC5t5vpw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KaVeI33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -33678,131 +33678,131 @@ The exam may be limited to pertinent body systems based on the patient's chief c
 The Physical Exam Section may contain multiple nested subsections.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_zf8zQF9xEey5t-mahoHmrg" name="PhysicalExamSection2TemplateId" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zf8zQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KaWFMH3sEeyivuDeOiJBMg" name="PhysicalExamSection2TemplateId" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KaWFMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.2.10' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zf_PgF9xEey5t-mahoHmrg" name="PhysicalExamSectionCodeP" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zf_PgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KaYhcH3sEeyivuDeOiJBMg" name="PhysicalExamSectionCodeP" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KaYhcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zf-BYF9xEey5t-mahoHmrg" name="PhysicalExamSectionCode" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zf-BYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KaWsQH3sEeyivuDeOiJBMg" name="PhysicalExamSectionCode" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KaWsQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '29545-1' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zhnAIF9xEey5t-mahoHmrg" name="PhysicalExamSection2WoundObservation" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zhnnMF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KbyPoH3sEeyivuDeOiJBMg" name="PhysicalExamSection2WoundObservation" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KbyPoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::LongitudinalCareWoundObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ziH9gF9xEey5t-mahoHmrg" name="PhysicalExamSectionPressureUlcerObservation" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ziH9gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KcQJsH3sEeyivuDeOiJBMg" name="PhysicalExamSectionPressureUlcerObservation" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KcQJsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zio64F9xEey5t-mahoHmrg" name="PhysicalExamSectionHighestPressureUlcerStage" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zio64V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KctcsH3sEeyivuDeOiJBMg" name="PhysicalExamSectionHighestPressureUlcerStage" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KctcsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zjGN4F9xEey5t-mahoHmrg" name="PhysicalExamSectionNumberOfPressureUlcersObservation" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zjGN4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KdITcH3sEeyivuDeOiJBMg" name="PhysicalExamSectionNumberOfPressureUlcersObservation" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KdITcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3VEDoF9xEey5t-mahoHmrg" name="PhysicalExamSection2Component" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3VEDoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Nx7sEH3sEeyivuDeOiJBMg" name="PhysicalExamSection2Component" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Nx7sEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies component->exists(component : cda::Component5 | not component.oclIsUndefined() and component.oclIsKindOf(cda::Component5))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8PevMF9xEey5t-mahoHmrg" name="PhysicalExamSection2ComponentSectionCode" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8PevMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SYtC4H3sEeyivuDeOiJBMg" name="PhysicalExamSection2ComponentSectionCode" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SYtC4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).section->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8PfWQF9xEey5t-mahoHmrg" name="PhysicalExamSection2ComponentSectionCodeP" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8PfWQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SYtC4n3sEeyivuDeOiJBMg" name="PhysicalExamSection2ComponentSectionCodeP" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SYtC433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).section->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8PfWQl9xEey5t-mahoHmrg" name="PhysicalExamSection2ComponentSectionTitle" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8PfWQ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SYtp8H3sEeyivuDeOiJBMg" name="PhysicalExamSection2ComponentSectionTitle" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SYtp8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).section->excluding(null)->reject((title.oclIsUndefined() or title.isNullFlavorUndefined()) implies (not title.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Pf9UF9xEey5t-mahoHmrg" name="PhysicalExamSection2ComponentSectionText" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Pf9UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SYtp8n3sEeyivuDeOiJBMg" name="PhysicalExamSection2ComponentSectionText" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SYtp833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).section->excluding(null)->reject(not text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Pf9Ul9xEey5t-mahoHmrg" name="PhysicalExamSection2ComponentSection" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Pf9U19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SYuRAH3sEeyivuDeOiJBMg" name="PhysicalExamSection2ComponentSection" constrainedElement="_-nZiYP4uEeObaveuCI77uA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SYuRAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null)->reject(section->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(cda::Section)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_-nb-oP4uEeObaveuCI77uA" general="_2Pxt0hSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_zhnnMV9xEey5t-mahoHmrg" name="getWoundObservations" bodyCondition="_zhnnNF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zhnnNF9xEey5t-mahoHmrg" name="body" constrainedElement="_zhnnMV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zhnnNV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KbyPon3sEeyivuDeOiJBMg" name="getWoundObservations" bodyCondition="_KbyPpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KbyPpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KbyPon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KbyPpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::LongitudinalCareWoundObservation)).oclAsType(consol::LongitudinalCareWoundObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zhnnMl9xEey5t-mahoHmrg" type="_09uFMJp_EeOK6dzbL4VoTA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zhnnM19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KbyPo33sEeyivuDeOiJBMg" type="_09uFMJp_EeOK6dzbL4VoTA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KbyPpH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_ziIkkF9xEey5t-mahoHmrg" name="getConsolPressureUlcerObservations" bodyCondition="_ziIkk19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ziIkk19xEey5t-mahoHmrg" name="body" constrainedElement="_ziIkkF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ziIklF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KcQwwH3sEeyivuDeOiJBMg" name="getConsolPressureUlcerObservations" bodyCondition="_KcQww33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KcQww33sEeyivuDeOiJBMg" name="body" constrainedElement="_KcQwwH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KcQwxH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PressureUlcerObservation)).oclAsType(consol::PressureUlcerObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ziIkkV9xEey5t-mahoHmrg" type="_9rQowOZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ziIkkl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KcQwwX3sEeyivuDeOiJBMg" type="_9rQowOZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KcQwwn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zio64l9xEey5t-mahoHmrg" name="getConsolHighestPressureUlcerStages" bodyCondition="_zio65V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zio65V9xEey5t-mahoHmrg" name="body" constrainedElement="_zio64l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zio65l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Kctcsn3sEeyivuDeOiJBMg" name="getConsolHighestPressureUlcerStages" bodyCondition="_KctctX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KctctX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Kctcsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kctctn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::HighestPressureUlcerStage)).oclAsType(consol::HighestPressureUlcerStage)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zio6419xEey5t-mahoHmrg" type="_4YgVsOZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zio65F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Kctcs33sEeyivuDeOiJBMg" type="_4YgVsOZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KctctH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zjGN4l9xEey5t-mahoHmrg" name="getConsolNumberOfPressureUlcersObservations" bodyCondition="_zjG08F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zjG08F9xEey5t-mahoHmrg" name="body" constrainedElement="_zjGN4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zjG08V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KdITcn3sEeyivuDeOiJBMg" name="getConsolNumberOfPressureUlcersObservations" bodyCondition="_KdITdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KdITdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KdITcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KdITdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::NumberOfPressureUlcersObservation)).oclAsType(consol::NumberOfPressureUlcersObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zjGN419xEey5t-mahoHmrg" type="_7c4ssOZbEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zjGN5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KdITc33sEeyivuDeOiJBMg" type="_7c4ssOZbEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KdITdH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -33824,212 +33824,212 @@ When used in a document that includes a Goals Section, all the goals (whether na
 When used in a document that does not include a Goals Section, the Plan of Treatment section may also contain information about care team members' goals, including the patient's values, beliefs, preferences, care expectations, and overarching care goals. Values may include the importance of quality of life over longevity. These values are taken into account when prioritizing all problems and their treatments. Beliefs may include comfort with dying or the refusal of blood transfusions because of the patient's religious convictions. Preferences may include liquid medicines over tablets, or treatment via secure email instead of in person. Care expectations may range from being treated only by female clinicians, to expecting all calls to be returned within 24 hours. Overarching goals described in this section are not tied to a specific condition, problem, health concern, or intervention. Examples of overarching goals could be to minimize pain or dependence on others, or to walk a daughter down the aisle for her marriage. DSTU:871&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_zjG08l9xEey5t-mahoHmrg" name="PlanOfTreatmentSection2TemplateId" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zjG0819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KdI6gH3sEeyivuDeOiJBMg" name="PlanOfTreatmentSection2TemplateId" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KdI6gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.10' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zjJRMF9xEey5t-mahoHmrg" name="PlanOfCareSectionCodeP" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zjJRMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KdLWwH3sEeyivuDeOiJBMg" name="PlanOfCareSectionCodeP" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KdLWwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zjHcAV9xEey5t-mahoHmrg" name="PlanOfCareSectionCode" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zjHcAl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KdJhkX3sEeyivuDeOiJBMg" name="PlanOfCareSectionCode" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KdJhkn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '18776-5' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zjpngF9xEey5t-mahoHmrg" name="PlanOfCareSectionPlanOfCareActivityObservation" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zjpngV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KdnboH3sEeyivuDeOiJBMg" name="PlanOfCareSectionPlanOfCareActivityObservation" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KdnboX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::PlannedObservation2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zkG6gF9xEey5t-mahoHmrg" name="PlanOfCareSectionPlanOfCareActivityEncounter" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zkG6gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KeFVsH3sEeyivuDeOiJBMg" name="PlanOfCareSectionPlanOfCareActivityEncounter" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KeFVsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.encounter.oclIsUndefined() and entry.encounter.oclIsKindOf(consol::PlannedEncounter2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zkpGAF9xEey5t-mahoHmrg" name="PlanOfCareSectionPlanOfCareActivityAct" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zkpGAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KegzgH3sEeyivuDeOiJBMg" name="PlanOfCareSectionPlanOfCareActivityAct" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KegzgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::PlannedAct2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zlKqcF9xEey5t-mahoHmrg" name="PlanOfCareSectionPlanOfCareActivityProcedure" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zlKqcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ke8RUH3sEeyivuDeOiJBMg" name="PlanOfCareSectionPlanOfCareActivityProcedure" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ke8RUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.procedure.oclIsUndefined() and entry.procedure.oclIsKindOf(consol::PlannedProcedure2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zlrAwF9xEey5t-mahoHmrg" name="PlanOfCareSectionPlanOfCareActivitySubstanceAdministration" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zlrAwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KfWhAH3sEeyivuDeOiJBMg" name="PlanOfCareSectionPlanOfCareActivitySubstanceAdministration" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KfWhAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.substanceAdministration.oclIsUndefined() and entry.substanceAdministration.oclIsKindOf(consol::PlannedMedicationActivity2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zmI60F9xEey5t-mahoHmrg" name="PlanOfCareSectionPlanOfCareActivitySupply" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zmI60V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KfwwsH3sEeyivuDeOiJBMg" name="PlanOfCareSectionPlanOfCareActivitySupply" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KfwwsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.supply.oclIsUndefined() and entry.supply.oclIsKindOf(consol::PlannedSupply2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zmpRIF9xEey5t-mahoHmrg" name="PlanOfCareSectionInstructions" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zmpRIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KgQf8H3sEeyivuDeOiJBMg" name="PlanOfCareSectionInstructions" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KgQf8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::Instruction2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_znGkIF9xEey5t-mahoHmrg" name="PlanOfTreatmentSection2HandoffCommunication" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_znGkIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kgr9wH3sEeyivuDeOiJBMg" name="PlanOfTreatmentSection2HandoffCommunication" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kgr9wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::HandoffCommunicationParticipants))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_znmTYF9xEey5t-mahoHmrg" name="PlanOfTreatmentSection2NutritionRecommendation" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_znmTYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KhGNcH3sEeyivuDeOiJBMg" name="PlanOfTreatmentSection2NutritionRecommendation" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KhGNcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::NutritionRecommendation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3WEwQF9xEey5t-mahoHmrg" name="PlanOfTreatmentSection2PlannedImmunizationActivity" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3WFXUF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NywygH3sEeyivuDeOiJBMg" name="PlanOfTreatmentSection2PlannedImmunizationActivity" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NywygX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.substanceAdministration.oclIsUndefined() and entry.substanceAdministration.oclIsKindOf(consol::PlannedImmunizationActivity))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3WltoF9xEey5t-mahoHmrg" name="PlanOfTreatmentSection2GoalObservation" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3WltoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NzMQUH3sEeyivuDeOiJBMg" name="PlanOfTreatmentSection2GoalObservation" constrainedElement="_bwml0P4yEeO_Yb9cO8w3bA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NzMQUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::GoalObservation))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_bwppIP4yEeO_Yb9cO8w3bA" general="_2NP-QxSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_zjpngl9xEey5t-mahoHmrg" name="getConsolPlannedObservation2s" bodyCondition="_zjpnhV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zjpnhV9xEey5t-mahoHmrg" name="body" constrainedElement="_zjpngl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zjpnhl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Kdnbon3sEeyivuDeOiJBMg" name="getConsolPlannedObservation2s" bodyCondition="_KdnbpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KdnbpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Kdnbon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kdnbpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PlannedObservation2)).oclAsType(consol::PlannedObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zjpng19xEey5t-mahoHmrg" type="_jKZssOdvEeOqBOMhgDlycQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zjpnhF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Kdnbo33sEeyivuDeOiJBMg" type="_jKZssOdvEeOqBOMhgDlycQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KdnbpH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zkG6gl9xEey5t-mahoHmrg" name="getConsolPlannedEncounter2s" bodyCondition="_zkG6hV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zkG6hV9xEey5t-mahoHmrg" name="body" constrainedElement="_zkG6gl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zkG6hl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KeFVsn3sEeyivuDeOiJBMg" name="getConsolPlannedEncounter2s" bodyCondition="_KeFVtX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KeFVtX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KeFVsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KeFVtn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getEncounters()->select(encounter : cda::Encounter | not encounter.oclIsUndefined() and encounter.oclIsKindOf(consol::PlannedEncounter2)).oclAsType(consol::PlannedEncounter2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zkG6g19xEey5t-mahoHmrg" type="_bDPFMOdXEeOqBOMhgDlycQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zkG6hF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KeFVs33sEeyivuDeOiJBMg" type="_bDPFMOdXEeOqBOMhgDlycQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KeFVtH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zkptEF9xEey5t-mahoHmrg" name="getConsolPlannedAct2s" bodyCondition="_zkptE19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zkptE19xEey5t-mahoHmrg" name="body" constrainedElement="_zkptEF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zkptFF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KehakH3sEeyivuDeOiJBMg" name="getConsolPlannedAct2s" bodyCondition="_Kehak33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Kehak33sEeyivuDeOiJBMg" name="body" constrainedElement="_KehakH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KehalH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PlannedAct2)).oclAsType(consol::PlannedAct2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zkptEV9xEey5t-mahoHmrg" type="_lLnRMOaYEeOmzetP5oaH3A" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zkptEl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KehakX3sEeyivuDeOiJBMg" type="_lLnRMOaYEeOmzetP5oaH3A" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Kehakn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zlKqcl9xEey5t-mahoHmrg" name="getConsolPlannedProcedure2s" bodyCondition="_zlKqdV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zlKqdV9xEey5t-mahoHmrg" name="body" constrainedElement="_zlKqcl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zlKqdl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ke8RUn3sEeyivuDeOiJBMg" name="getConsolPlannedProcedure2s" bodyCondition="_Ke84YH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ke84YH3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ke8RUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ke84YX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getProcedures()->select(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::PlannedProcedure2)).oclAsType(consol::PlannedProcedure2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zlKqc19xEey5t-mahoHmrg" type="_cs0YsOeEEeOqBOMhgDlycQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zlKqdF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Ke8RU33sEeyivuDeOiJBMg" type="_cs0YsOeEEeOqBOMhgDlycQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ke8RVH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zlrn0F9xEey5t-mahoHmrg" name="getConsolPlannedMedicationActivity2s" bodyCondition="_zlrn019xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zlrn019xEey5t-mahoHmrg" name="body" constrainedElement="_zlrn0F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zlrn1F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KfXIEH3sEeyivuDeOiJBMg" name="getConsolPlannedMedicationActivity2s" bodyCondition="_KfXIE33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KfXIE33sEeyivuDeOiJBMg" name="body" constrainedElement="_KfXIEH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KfXIFH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::PlannedMedicationActivity2)).oclAsType(consol::PlannedMedicationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zlrn0V9xEey5t-mahoHmrg" type="_Yj45YOgREeO-iJTuAv7BKQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zlrn0l9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KfXIEX3sEeyivuDeOiJBMg" type="_Yj45YOgREeO-iJTuAv7BKQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KfXIEn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zmJh4F9xEey5t-mahoHmrg" name="getConsolPlannedSupply2s" bodyCondition="_zmJh419xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zmJh419xEey5t-mahoHmrg" name="body" constrainedElement="_zmJh4F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zmJh5F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Kfwwsn3sEeyivuDeOiJBMg" name="getConsolPlannedSupply2s" bodyCondition="_KfwwtX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KfwwtX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Kfwwsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kfwwtn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::PlannedSupply2)).oclAsType(consol::PlannedSupply2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zmJh4V9xEey5t-mahoHmrg" type="_vEd1cOg0EeO-iJTuAv7BKQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zmJh4l9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Kfwws33sEeyivuDeOiJBMg" type="_vEd1cOg0EeO-iJTuAv7BKQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KfwwtH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zmpRIl9xEey5t-mahoHmrg" name="getConsolInstruction2s" bodyCondition="_zmpRJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zmpRJV9xEey5t-mahoHmrg" name="body" constrainedElement="_zmpRIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zmp4MF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KgRHAH3sEeyivuDeOiJBMg" name="getConsolInstruction2s" bodyCondition="_KgRHA33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KgRHA33sEeyivuDeOiJBMg" name="body" constrainedElement="_KgRHAH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KgRHBH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instruction2)).oclAsType(consol::Instruction2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zmpRI19xEey5t-mahoHmrg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zmpRJF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KgRHAX3sEeyivuDeOiJBMg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KgRHAn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_znGkIl9xEey5t-mahoHmrg" name="getHandoffCommunications" bodyCondition="_znHLMV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_znHLMV9xEey5t-mahoHmrg" name="body" constrainedElement="_znGkIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_znHLMl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Kgr9wn3sEeyivuDeOiJBMg" name="getHandoffCommunications" bodyCondition="_Kgr9xX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Kgr9xX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Kgr9wn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kgr9xn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::HandoffCommunicationParticipants)).oclAsType(consol::HandoffCommunicationParticipants)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_znGkI19xEey5t-mahoHmrg" type="_POfwAIz7EeOoMZgUoTghIg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_znHLMF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Kgr9w33sEeyivuDeOiJBMg" type="_POfwAIz7EeOoMZgUoTghIg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Kgr9xH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_znmTYl9xEey5t-mahoHmrg" name="getNutritionRecommendations" bodyCondition="_znmTZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_znmTZV9xEey5t-mahoHmrg" name="body" constrainedElement="_znmTYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_znmTZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KhGNcn3sEeyivuDeOiJBMg" name="getNutritionRecommendations" bodyCondition="_KhGNdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KhGNdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KhGNcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KhGNdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::NutritionRecommendation)).oclAsType(consol::NutritionRecommendation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_znmTY19xEey5t-mahoHmrg" type="_FhAIMI3FEeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_znmTZF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KhGNc33sEeyivuDeOiJBMg" type="_FhAIMI3FEeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KhGNdH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3WFXUV9xEey5t-mahoHmrg" name="getPlannedImmunizationActivities" bodyCondition="_3WFXVF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3WFXVF9xEey5t-mahoHmrg" name="body" constrainedElement="_3WFXUV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3WFXVV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Nywygn3sEeyivuDeOiJBMg" name="getPlannedImmunizationActivities" bodyCondition="_NywyhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NywyhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Nywygn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Nywyhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::PlannedImmunizationActivity)).oclAsType(consol::PlannedImmunizationActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3WFXUl9xEey5t-mahoHmrg" type="_KRcPwJXFEeOgXcDbh8Igkw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3WFXU19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Nywyg33sEeyivuDeOiJBMg" type="_KRcPwJXFEeOgXcDbh8Igkw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NywyhH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3Wltol9xEey5t-mahoHmrg" name="getGoalObservations" bodyCondition="_3WltpV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3WltpV9xEey5t-mahoHmrg" name="body" constrainedElement="_3Wltol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3Wltpl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NzMQUn3sEeyivuDeOiJBMg" name="getGoalObservations" bodyCondition="_NzM3YX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NzM3YX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NzMQUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NzM3Yn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::GoalObservation)).oclAsType(consol::GoalObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3Wlto19xEey5t-mahoHmrg" type="_-miMII9TEeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3WltpF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_NzMQU33sEeyivuDeOiJBMg" type="_-miMII9TEeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NzM3YH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -34037,42 +34037,42 @@ value.code = '18776-5' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_qFPvIP49EeO_F_2qLv6FWQ">
         <body>This section contains the procedure(s) that a clinician planned based on the preoperative assessment.</body>
       </ownedComment>
-      <ownedRule xmi:id="_znm6cF9xEey5t-mahoHmrg" name="PlannedProcedureSection2TemplateId" constrainedElement="_dz0ZwP49EeO_F_2qLv6FWQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_znm6cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KhGNd33sEeyivuDeOiJBMg" name="PlannedProcedureSection2TemplateId" constrainedElement="_dz0ZwP49EeO_F_2qLv6FWQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KhGNeH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.30' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_znovoF9xEey5t-mahoHmrg" name="PlannedProcedureSectionCodeP" constrainedElement="_dz0ZwP49EeO_F_2qLv6FWQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_znpWsF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KhICoH3sEeyivuDeOiJBMg" name="PlannedProcedureSectionCodeP" constrainedElement="_dz0ZwP49EeO_F_2qLv6FWQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KhICoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_znnhgF9xEey5t-mahoHmrg" name="PlannedProcedureSectionCode" constrainedElement="_dz0ZwP49EeO_F_2qLv6FWQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_znnhgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KhG0gX3sEeyivuDeOiJBMg" name="PlannedProcedureSectionCode" constrainedElement="_dz0ZwP49EeO_F_2qLv6FWQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KhG0gn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '59772-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zoGCoF9xEey5t-mahoHmrg" name="PlannedProcedureSectionPlanOfCareActivityProcedure" constrainedElement="_dz0ZwP49EeO_F_2qLv6FWQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zoGpsF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KhiSUH3sEeyivuDeOiJBMg" name="PlannedProcedureSectionPlanOfCareActivityProcedure" constrainedElement="_dz0ZwP49EeO_F_2qLv6FWQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KhiSUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.procedure.oclIsUndefined() and entry.procedure.oclIsKindOf(consol::PlannedProcedure2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_dz3dEP49EeO_F_2qLv6FWQ" general="_3b6E4DVyEeGaW4kr-GbV8Q"/>
-      <ownedOperation xmi:id="_zoGpsV9xEey5t-mahoHmrg" name="getConsolPlannedProcedure2s" bodyCondition="_zoGptF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zoGptF9xEey5t-mahoHmrg" name="body" constrainedElement="_zoGpsV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zoGptV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Khi5YH3sEeyivuDeOiJBMg" name="getConsolPlannedProcedure2s" bodyCondition="_Khi5Y33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Khi5Y33sEeyivuDeOiJBMg" name="body" constrainedElement="_Khi5YH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Khi5ZH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getProcedures()->select(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::PlannedProcedure2)).oclAsType(consol::PlannedProcedure2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zoGpsl9xEey5t-mahoHmrg" type="_cs0YsOeEEeOqBOMhgDlycQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zoGps19xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Khi5YX3sEeyivuDeOiJBMg" type="_cs0YsOeEEeOqBOMhgDlycQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Khi5Yn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -34080,42 +34080,42 @@ value.code = '59772-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_r8KQoP5BEeOmw9RN80Tpig">
         <body>The Postprocedure Diagnosis Section records the diagnosis or diagnoses discovered or confirmed during the procedure. Often it is the same as the preprocedure diagnosis or indication.</body>
       </ownedComment>
-      <ownedRule xmi:id="_zoGptl9xEey5t-mahoHmrg" name="PostprocedureDiagnosisSection2TemplateId" constrainedElement="_MLNngP5BEeOmw9RN80Tpig">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zoGpt19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Khi5ZX3sEeyivuDeOiJBMg" name="PostprocedureDiagnosisSection2TemplateId" constrainedElement="_MLNngP5BEeOmw9RN80Tpig">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Khi5Zn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.36' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zoJF8F9xEey5t-mahoHmrg" name="PostprocedureDiagnosisSectionCodeP" constrainedElement="_MLNngP5BEeOmw9RN80Tpig">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zoJF8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KhkukH3sEeyivuDeOiJBMg" name="PostprocedureDiagnosisSectionCodeP" constrainedElement="_MLNngP5BEeOmw9RN80Tpig">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KhkukX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zoH30F9xEey5t-mahoHmrg" name="PostprocedureDiagnosisSectionCode" constrainedElement="_MLNngP5BEeOmw9RN80Tpig">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zoH30V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KhjgcX3sEeyivuDeOiJBMg" name="PostprocedureDiagnosisSectionCode" constrainedElement="_MLNngP5BEeOmw9RN80Tpig">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Khjgcn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '59769-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zopcQF9xEey5t-mahoHmrg" name="PostprocedureDiagnosisSectionPostprocedureDiagnosis" constrainedElement="_MLNngP5BEeOmw9RN80Tpig">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zopcQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KiAMYH3sEeyivuDeOiJBMg" name="PostprocedureDiagnosisSectionPostprocedureDiagnosis" constrainedElement="_MLNngP5BEeOmw9RN80Tpig">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KiAMYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->one(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::PostprocedureDiagnosis2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_MLRR4P5BEeOmw9RN80Tpig" general="_-jlSMDVyEeGaW4kr-GbV8Q"/>
-      <ownedOperation xmi:id="_zopcQl9xEey5t-mahoHmrg" name="getConsolPostprocedureDiagnosis2" bodyCondition="_zopcRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zopcRV9xEey5t-mahoHmrg" name="body" constrainedElement="_zopcQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zopcRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KiAMYn3sEeyivuDeOiJBMg" name="getConsolPostprocedureDiagnosis2" bodyCondition="_KiAMZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KiAMZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KiAMYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KiAMZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PostprocedureDiagnosis2))->asSequence()->any(true).oclAsType(consol::PostprocedureDiagnosis2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zopcQ19xEey5t-mahoHmrg" type="__SgUwOwuEeOqa975IP2wug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zopcRF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_KiAMY33sEeyivuDeOiJBMg" type="__SgUwOwuEeOqa975IP2wug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KiAMZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -34123,42 +34123,42 @@ value.code = '59769-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_OTT1EP5EEeOBnLkJOVC8NQ">
         <body>The Preoperative Diagnosis Section records the surgical diagnoses assigned to the patient before the surgical procedure which are the reason for the surgery. The preoperative diagnosis is, in the surgeon's opinion, the diagnosis that will be confirmed during surgery.</body>
       </ownedComment>
-      <ownedRule xmi:id="_zoqDUF9xEey5t-mahoHmrg" name="PreoperativeDiagnosisSection2TemplateId" constrainedElement="_JFd3MP5EEeOBnLkJOVC8NQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zoqDUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KiAMZ33sEeyivuDeOiJBMg" name="PreoperativeDiagnosisSection2TemplateId" constrainedElement="_JFd3MP5EEeOBnLkJOVC8NQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KiAzcH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.34' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zosfkF9xEey5t-mahoHmrg" name="PreoperativeDiagnosisSectionCodeP" constrainedElement="_JFd3MP5EEeOBnLkJOVC8NQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zosfkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KiCooH3sEeyivuDeOiJBMg" name="PreoperativeDiagnosisSectionCodeP" constrainedElement="_JFd3MP5EEeOBnLkJOVC8NQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KiCooX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zoqqYV9xEey5t-mahoHmrg" name="PreoperativeDiagnosisSectionCode" constrainedElement="_JFd3MP5EEeOBnLkJOVC8NQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zoqqYl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KiBagH3sEeyivuDeOiJBMg" name="PreoperativeDiagnosisSectionCode" constrainedElement="_JFd3MP5EEeOBnLkJOVC8NQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KiBagX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10219-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zpLAsF9xEey5t-mahoHmrg" name="PreoperativeDiagnosisSectionPreoperativeDiagnosis" constrainedElement="_JFd3MP5EEeOBnLkJOVC8NQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zpLAsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KidfYH3sEeyivuDeOiJBMg" name="PreoperativeDiagnosisSectionPreoperativeDiagnosis" constrainedElement="_JFd3MP5EEeOBnLkJOVC8NQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KidfYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->one(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::PreoperativeDiagnosis2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_JFgTcP5EEeOBnLkJOVC8NQ" general="_Cu6qMDVzEeGaW4kr-GbV8Q"/>
-      <ownedOperation xmi:id="_zpLnwF9xEey5t-mahoHmrg" name="getConsolPreoperativeDiagnosis2" bodyCondition="_zpLnw19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zpLnw19xEey5t-mahoHmrg" name="body" constrainedElement="_zpLnwF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zpLnxF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KidfYn3sEeyivuDeOiJBMg" name="getConsolPreoperativeDiagnosis2" bodyCondition="_KidfZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KidfZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KidfYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KidfZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PreoperativeDiagnosis2))->asSequence()->any(true).oclAsType(consol::PreoperativeDiagnosis2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zpLnwV9xEey5t-mahoHmrg" type="_5l3g0OzYEeOnE-G4kptBiw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zpLnwl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_KidfY33sEeyivuDeOiJBMg" type="_5l3g0OzYEeOnE-G4kptBiw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KidfZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -34166,42 +34166,42 @@ value.code = '10219-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_vk8YYP5FEeO_r7yO9mhwnA">
         <body>The Procedure Findings Section records clinically significant observations confirmed or discovered during a procedure or surgery.</body>
       </ownedComment>
-      <ownedRule xmi:id="_zpLnxV9xEey5t-mahoHmrg" name="ProcedureFindingsSection2TemplateId" constrainedElement="_lLOykP5FEeO_r7yO9mhwnA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zpLnxl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KieGcH3sEeyivuDeOiJBMg" name="ProcedureFindingsSection2TemplateId" constrainedElement="_lLOykP5FEeO_r7yO9mhwnA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KieGcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.28' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zpOEAF9xEey5t-mahoHmrg" name="ProcedureFindingsSectionCodeP" constrainedElement="_lLOykP5FEeO_r7yO9mhwnA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zpOrEF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KigisH3sEeyivuDeOiJBMg" name="ProcedureFindingsSectionCodeP" constrainedElement="_lLOykP5FEeO_r7yO9mhwnA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KigisX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zpM14F9xEey5t-mahoHmrg" name="ProcedureFindingsSectionCode" constrainedElement="_lLOykP5FEeO_r7yO9mhwnA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zpM14V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KietgX3sEeyivuDeOiJBMg" name="ProcedureFindingsSectionCode" constrainedElement="_lLOykP5FEeO_r7yO9mhwnA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kietgn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '59776-5' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zpwPgF9xEey5t-mahoHmrg" name="ProcedureFindingsSectionProblemObservation" constrainedElement="_lLOykP5FEeO_r7yO9mhwnA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zpwPgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ki8nkH3sEeyivuDeOiJBMg" name="ProcedureFindingsSectionProblemObservation" constrainedElement="_lLOykP5FEeO_r7yO9mhwnA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ki8nkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::ProblemObservation2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_lLR14P5FEeO_r7yO9mhwnA" general="_W4UBYDVzEeGaW4kr-GbV8Q"/>
-      <ownedOperation xmi:id="_zpw2kF9xEey5t-mahoHmrg" name="getConsolProblemObservation2s" bodyCondition="_zpw2k19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zpw2k19xEey5t-mahoHmrg" name="body" constrainedElement="_zpw2kF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zpw2lF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ki8nkn3sEeyivuDeOiJBMg" name="getConsolProblemObservation2s" bodyCondition="_Ki8nlX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ki8nlX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ki8nkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ki8nln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation2)).oclAsType(consol::ProblemObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zpw2kV9xEey5t-mahoHmrg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zpw2kl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Ki8nk33sEeyivuDeOiJBMg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ki8nlH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -34209,42 +34209,42 @@ value.code = '59776-5' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_EH_WkABzEeSjnfOPJpFg3A">
         <body>This section contains the reason(s) for the procedure or surgery. This section may include the preprocedure diagnoses as well as symptoms contributing to the reason for the procedure.</body>
       </ownedComment>
-      <ownedRule xmi:id="_zpw2lV9xEey5t-mahoHmrg" name="ProcedureIndicationsSection2TemplateId" constrainedElement="_5_O94AByEeSjnfOPJpFg3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zpw2ll9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ki9OoH3sEeyivuDeOiJBMg" name="ProcedureIndicationsSection2TemplateId" constrainedElement="_5_O94AByEeSjnfOPJpFg3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ki9OoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.29' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zpzS0F9xEey5t-mahoHmrg" name="ProcedureIndicationsSectionCodeP" constrainedElement="_5_O94AByEeSjnfOPJpFg3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zpzS0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ki_D0H3sEeyivuDeOiJBMg" name="ProcedureIndicationsSectionCodeP" constrainedElement="_5_O94AByEeSjnfOPJpFg3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ki_q4H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zpyEsF9xEey5t-mahoHmrg" name="ProcedureIndicationsSectionCode" constrainedElement="_5_O94AByEeSjnfOPJpFg3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zpyEsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ki91sH3sEeyivuDeOiJBMg" name="ProcedureIndicationsSectionCode" constrainedElement="_5_O94AByEeSjnfOPJpFg3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ki91sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '59768-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zqWFYF9xEey5t-mahoHmrg" name="ProcedureIndicationsSectionIndication" constrainedElement="_5_O94AByEeSjnfOPJpFg3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zqWFYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KjbvwH3sEeyivuDeOiJBMg" name="ProcedureIndicationsSectionIndication" constrainedElement="_5_O94AByEeSjnfOPJpFg3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KjbvwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::Indication2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_5_SoQAByEeSjnfOPJpFg3A" general="_cjmJMDVzEeGaW4kr-GbV8Q"/>
-      <ownedOperation xmi:id="_zqWFYl9xEey5t-mahoHmrg" name="getConsolIndication2s" bodyCondition="_zqWFZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zqWFZV9xEey5t-mahoHmrg" name="body" constrainedElement="_zqWFYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zqWFZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Kjbvwn3sEeyivuDeOiJBMg" name="getConsolIndication2s" bodyCondition="_KjbvxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KjbvxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Kjbvwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kjbvxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::Indication2)).oclAsType(consol::Indication2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zqWFY19xEey5t-mahoHmrg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zqWFZF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Kjbvw33sEeyivuDeOiJBMg" type="_PrEOIOHoEeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KjbvxH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -34252,76 +34252,76 @@ value.code = '59768-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_IbycIAB1EeSLOb2O6vSPzg">
         <body>This section describes all interventional, surgical, diagnostic, or therapeutic procedures or treatments pertinent to the patient historically at the time the document is generated. The section should include notable procedures, but can contain all procedures for the period of time being summarized. The common notion of &quot;procedure&quot; is broader than that specified by the HL7 Version 3 Reference Information Model (RIM), therefore this section contains procedure templates represented with three RIM classes: Act, Observation, and Procedure. Procedure Activity Procedure (V2) is for procedures that alter the physical condition of a patient (e.g., splenectomy). Procedure Activity Observation (V2) is for procedures that result in new information about a patient but do not cause physical alteration (e.g., EEG). Procedure Activity Act (V2) is for all other types of procedures (e.g., dressing change).</body>
       </ownedComment>
-      <ownedRule xmi:id="_zqWscF9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalTemplateId" constrainedElement="_80dMoAB0EeSLOb2O6vSPzg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zqWscV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KjcW0H3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalTemplateId" constrainedElement="_80dMoAB0EeSLOb2O6vSPzg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KjcW0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.7' and id.extension = '2014-06-09')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zqZIsF9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalCodeP" constrainedElement="_80dMoAB0EeSLOb2O6vSPzg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zqZIsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KjeMAH3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalCodeP" constrainedElement="_80dMoAB0EeSLOb2O6vSPzg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KjeMAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zqXTgV9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalCode" constrainedElement="_80dMoAB0EeSLOb2O6vSPzg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zqXTgl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kjc94H3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalCode" constrainedElement="_80dMoAB0EeSLOb2O6vSPzg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kjc94X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '47519-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zq6tIF9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalProcedureActivityProcedure" constrainedElement="_80dMoAB0EeSLOb2O6vSPzg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zq6tIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kj9UMH3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalProcedureActivityProcedure" constrainedElement="_80dMoAB0EeSLOb2O6vSPzg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kj9UMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.procedure.oclIsUndefined() and entry.procedure.oclIsKindOf(consol::ProcedureActivityProcedure2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zrcRkF9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalProcedureActivityObservation" constrainedElement="_80dMoAB0EeSLOb2O6vSPzg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zrcRkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KkeRkH3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalProcedureActivityObservation" constrainedElement="_80dMoAB0EeSLOb2O6vSPzg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KkeRkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::ProcedureActivityObservation2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zr8n4F9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalProcedureActivityAct" constrainedElement="_80dMoAB0EeSLOb2O6vSPzg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zr8n4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kk69gH3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalProcedureActivityAct" constrainedElement="_80dMoAB0EeSLOb2O6vSPzg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kk69gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::ProcedureActivityAct2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_80fo4AB0EeSLOb2O6vSPzg" general="_s9Ig4BVdEeGQCvUGzi1kDQ"/>
-      <ownedOperation xmi:id="_zq7UMF9xEey5t-mahoHmrg" name="getConsolProcedureActivityProcedure2s" bodyCondition="_zq7UM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zq7UM19xEey5t-mahoHmrg" name="body" constrainedElement="_zq7UMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zq7UNF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Kj9UMn3sEeyivuDeOiJBMg" name="getConsolProcedureActivityProcedure2s" bodyCondition="_Kj9UNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Kj9UNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Kj9UMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kj9UNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getProcedures()->select(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::ProcedureActivityProcedure2)).oclAsType(consol::ProcedureActivityProcedure2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zq7UMV9xEey5t-mahoHmrg" type="_fCVOQPDqEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zq7UMl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Kj9UM33sEeyivuDeOiJBMg" type="_fCVOQPDqEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Kj9UNH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zrcRkl9xEey5t-mahoHmrg" name="getConsolProcedureActivityObservation2s" bodyCondition="_zrcRlV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zrcRlV9xEey5t-mahoHmrg" name="body" constrainedElement="_zrcRkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zrcRll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KkeRkn3sEeyivuDeOiJBMg" name="getConsolProcedureActivityObservation2s" bodyCondition="_KkeRlX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KkeRlX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KkeRkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KkeRln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProcedureActivityObservation2)).oclAsType(consol::ProcedureActivityObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zrcRk19xEey5t-mahoHmrg" type="_QoLWAPDjEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zrcRlF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KkeRk33sEeyivuDeOiJBMg" type="_QoLWAPDjEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KkeRlH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zr8n4l9xEey5t-mahoHmrg" name="getConsolProcedureActivityAct2s" bodyCondition="_zr8n5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zr8n5V9xEey5t-mahoHmrg" name="body" constrainedElement="_zr8n4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zr8n5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Kk7kkH3sEeyivuDeOiJBMg" name="getConsolProcedureActivityAct2s" bodyCondition="_Kk7kk33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Kk7kk33sEeyivuDeOiJBMg" name="body" constrainedElement="_Kk7kkH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kk7klH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::ProcedureActivityAct2)).oclAsType(consol::ProcedureActivityAct2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zr8n419xEey5t-mahoHmrg" type="_CFMuYPDbEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zr8n5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Kk7kkX3sEeyivuDeOiJBMg" type="_CFMuYPDbEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Kk7kkn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -34329,42 +34329,42 @@ value.code = '47519-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_kbRpAAB5EeS20Pddu0dxVw">
         <body>This section describes the clinical reason why a provider is sending a patient to another provider for care. The reason for referral may become the reason for visit documented by the receiving provider.</body>
       </ownedComment>
-      <ownedRule xmi:id="_zr9O8F9xEey5t-mahoHmrg" name="ReasonForReferralSection2TemplateId" constrainedElement="_Ya0H0AB5EeS20Pddu0dxVw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zr9O8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kk7klX3sEeyivuDeOiJBMg" name="ReasonForReferralSection2TemplateId" constrainedElement="_Ya0H0AB5EeS20Pddu0dxVw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kk7kln3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '1.3.6.1.4.1.19376.1.5.3.1.3.1' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zr_EIF9xEey5t-mahoHmrg" name="ReasonForReferralSectionCodeP" constrainedElement="_Ya0H0AB5EeS20Pddu0dxVw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zr_EIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kk-A0H3sEeyivuDeOiJBMg" name="ReasonForReferralSectionCodeP" constrainedElement="_Ya0H0AB5EeS20Pddu0dxVw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kk-A0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zr92AF9xEey5t-mahoHmrg" name="ReasonForReferralSectionCode" constrainedElement="_Ya0H0AB5EeS20Pddu0dxVw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zr92AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kk8ysH3sEeyivuDeOiJBMg" name="ReasonForReferralSectionCode" constrainedElement="_Ya0H0AB5EeS20Pddu0dxVw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kk8ysX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '42349-1' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zshPoF9xEey5t-mahoHmrg" name="ReasonForReferralSection2PatientReferralAct" constrainedElement="_Ya0H0AB5EeS20Pddu0dxVw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zshPoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KlaFsH3sEeyivuDeOiJBMg" name="ReasonForReferralSection2PatientReferralAct" constrainedElement="_Ya0H0AB5EeS20Pddu0dxVw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KlaFsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::PatientReferralAct))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_Ya3LIAB5EeS20Pddu0dxVw" general="_2PWQFxSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_zshPol9xEey5t-mahoHmrg" name="getPatientReferralActs" bodyCondition="_zshPpV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zshPpV9xEey5t-mahoHmrg" name="body" constrainedElement="_zshPol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zshPpl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KlaswH3sEeyivuDeOiJBMg" name="getPatientReferralActs" bodyCondition="_Klasw33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Klasw33sEeyivuDeOiJBMg" name="body" constrainedElement="_KlaswH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KlasxH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PatientReferralAct)).oclAsType(consol::PatientReferralAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zshPo19xEey5t-mahoHmrg" type="_50a2UI62EeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zshPpF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KlaswX3sEeyivuDeOiJBMg" type="_50a2UI62EeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Klaswn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -34386,42 +34386,42 @@ Imaging results are typically generated by a clinician reviewing the output of a
 Procedure results are typically generated by a clinician to provide more granular information about component observations made during a procedure, such as where a gastroenterologist reports the size of a polyp observed during a colonoscopy.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_zsh2sF9xEey5t-mahoHmrg" name="ResultsSectionEntriesOptionalTemplateId" constrainedElement="_yaJ3QAFAEeSaVZ5WxWd94w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zsh2sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KlasxX3sEeyivuDeOiJBMg" name="ResultsSectionEntriesOptionalTemplateId" constrainedElement="_yaJ3QAFAEeSaVZ5WxWd94w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Klasxn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.3' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zskS8F9xEey5t-mahoHmrg" name="ResultsSectionEntriesOptionalCodeP" constrainedElement="_yaJ3QAFAEeSaVZ5WxWd94w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zskS8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KldJAH3sEeyivuDeOiJBMg" name="ResultsSectionEntriesOptionalCodeP" constrainedElement="_yaJ3QAFAEeSaVZ5WxWd94w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KldJAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zsidwV9xEey5t-mahoHmrg" name="ResultsSectionEntriesOptionalCode" constrainedElement="_yaJ3QAFAEeSaVZ5WxWd94w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zsidwl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Klb64H3sEeyivuDeOiJBMg" name="ResultsSectionEntriesOptionalCode" constrainedElement="_yaJ3QAFAEeSaVZ5WxWd94w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Klb64X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '30954-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ztECMF9xEey5t-mahoHmrg" name="ResultsSectionEntriesOptionalResultOrganizer" constrainedElement="_yaJ3QAFAEeSaVZ5WxWd94w">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ztECMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kl7qIH3sEeyivuDeOiJBMg" name="ResultsSectionEntriesOptionalResultOrganizer" constrainedElement="_yaJ3QAFAEeSaVZ5WxWd94w">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kl7qIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.organizer.oclIsUndefined() and entry.organizer.oclIsKindOf(consol::ResultOrganizer2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_yaM6kAFAEeSaVZ5WxWd94w" general="_xGqiEBVdEeGQCvUGzi1kDQ"/>
-      <ownedOperation xmi:id="_ztECMl9xEey5t-mahoHmrg" name="getConsolResultOrganizer2s" bodyCondition="_ztEpQl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_ztEpQl9xEey5t-mahoHmrg" name="body" constrainedElement="_ztECMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ztEpQ19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Kl7qIn3sEeyivuDeOiJBMg" name="getConsolResultOrganizer2s" bodyCondition="_Kl7qJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Kl7qJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Kl7qIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kl7qJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::ResultOrganizer2)).oclAsType(consol::ResultOrganizer2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_ztEpQF9xEey5t-mahoHmrg" type="_gU40UPGEEeOmsLWmq5fnqQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ztEpQV9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Kl7qI33sEeyivuDeOiJBMg" type="_gU40UPGEEeOmsLWmq5fnqQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Kl7qJH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -34429,144 +34429,144 @@ value.code = '30954-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_4SQ18AFHEeSG_MJH-zNFRw">
         <body>This section contains social history data that influence a patient's physical, psychological or emotional health (e.g., smoking status, pregnancy). Demographic data, such as marital status, race, ethnicity, and religious affiliation, is captured in the header.</body>
       </ownedComment>
-      <ownedRule xmi:id="_ztEpRF9xEey5t-mahoHmrg" name="SocialHistorySection2TemplateId" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ztEpRV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kl8RMH3sEeyivuDeOiJBMg" name="SocialHistorySection2TemplateId" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kl8RMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.17' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ztI6sF9xEey5t-mahoHmrg" name="SocialHistorySectionCodeP" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ztI6sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kl-tcH3sEeyivuDeOiJBMg" name="SocialHistorySectionCodeP" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kl-tcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_ztF3YF9xEey5t-mahoHmrg" name="SocialHistorySectionCode" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ztGecF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kl84QH3sEeyivuDeOiJBMg" name="SocialHistorySectionCode" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kl84QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '29762-2')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zt3TcF9xEey5t-mahoHmrg" name="SocialHistorySectionSocialHistoryObservation" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zt3TcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kmd1oH3sEeyivuDeOiJBMg" name="SocialHistorySectionSocialHistoryObservation" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kmd1oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::SocialHistoryObservation2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zuY34F9xEey5t-mahoHmrg" name="SocialHistorySectionSmokingStatusObservation" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zuY34V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Km8WwH3sEeyivuDeOiJBMg" name="SocialHistorySectionSmokingStatusObservation" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Km8WwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::SmokingStatusMeaningfulUse2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zu5OMF9xEey5t-mahoHmrg" name="SocialHistorySectionTobaccoUse" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zu5OMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KnZCsH3sEeyivuDeOiJBMg" name="SocialHistorySectionTobaccoUse" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KnZpwH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::TobaccoUse2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zvayoF9xEey5t-mahoHmrg" name="SocialHistorySection2CaregiverCharacteristics" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zvayoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kn1HkH3sEeyivuDeOiJBMg" name="SocialHistorySection2CaregiverCharacteristics" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kn1HkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::CaregiverCharacteristics))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zv7wAF9xEey5t-mahoHmrg" name="SocialHistorySection2CulturalAndReligiousObservation" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zv7wAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KoRMcH3sEeyivuDeOiJBMg" name="SocialHistorySection2CulturalAndReligiousObservation" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KoRzgH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::CulturalAndReligiousObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zwcGUF9xEey5t-mahoHmrg" name="SocialHistorySection2CharacteristicsOfHomeEnvironment" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zwcGUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kow7sH3sEeyivuDeOiJBMg" name="SocialHistorySection2CharacteristicsOfHomeEnvironment" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kow7sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::CharacteristicsOfHomeEnvironment))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4el3gF9xEey5t-mahoHmrg" name="SocialHistorySection2BirthSexObservation" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4el3gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OwJn0H3sEeyivuDeOiJBMg" name="SocialHistorySection2BirthSexObservation" constrainedElement="_wLWZMAFHEeSG_MJH-zNFRw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OwJn0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::BirthSexObservation))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_wLZcgAFHEeSG_MJH-zNFRw" general="_2JKvgBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_zt3Tcl9xEey5t-mahoHmrg" name="getConsolSocialHistoryObservation2s" bodyCondition="_zt3TdV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zt3TdV9xEey5t-mahoHmrg" name="body" constrainedElement="_zt3Tcl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zt3Tdl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Kmd1on3sEeyivuDeOiJBMg" name="getConsolSocialHistoryObservation2s" bodyCondition="_Kmd1pX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Kmd1pX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Kmd1on3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KmecsH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SocialHistoryObservation2)).oclAsType(consol::SocialHistoryObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zt3Tc19xEey5t-mahoHmrg" type="_b_iGIPJfEeO2NaSiicarcg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zt3TdF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Kmd1o33sEeyivuDeOiJBMg" type="_b_iGIPJfEeO2NaSiicarcg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Kmd1pH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zuY34l9xEey5t-mahoHmrg" name="getConsolCurrentSmokingStatus2s" bodyCondition="_zuY35V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zuY35V9xEey5t-mahoHmrg" name="body" constrainedElement="_zuY34l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zuY35l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Km8Wwn3sEeyivuDeOiJBMg" name="getConsolCurrentSmokingStatus2s" bodyCondition="_Km8WxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Km8WxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Km8Wwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Km8Wxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SmokingStatusMeaningfulUse2)).oclAsType(consol::SmokingStatusMeaningfulUse2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zuY3419xEey5t-mahoHmrg" type="_Hl3ScLk0EeODDJAC5t5vpw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zuY35F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Km8Ww33sEeyivuDeOiJBMg" type="_Hl3ScLk0EeODDJAC5t5vpw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Km8WxH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zu5OMl9xEey5t-mahoHmrg" name="getConsolTobaccoUse2s" bodyCondition="_zu5ONV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zu5ONV9xEey5t-mahoHmrg" name="body" constrainedElement="_zu5OMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zu5ONl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KnZpwX3sEeyivuDeOiJBMg" name="getConsolTobaccoUse2s" bodyCondition="_KnZpxH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KnZpxH3sEeyivuDeOiJBMg" name="body" constrainedElement="_KnZpwX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KnZpxX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::TobaccoUse2)).oclAsType(consol::TobaccoUse2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zu5OM19xEey5t-mahoHmrg" type="_qHUXwPMxEeOUvapeh9bVvQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zu5ONF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KnZpwn3sEeyivuDeOiJBMg" type="_qHUXwPMxEeOUvapeh9bVvQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KnZpw33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zvbZsF9xEey5t-mahoHmrg" name="getCaregiverCharacteristicss" bodyCondition="_zvbZs19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zvbZs19xEey5t-mahoHmrg" name="body" constrainedElement="_zvbZsF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zvbZtF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Kn1Hkn3sEeyivuDeOiJBMg" name="getCaregiverCharacteristicss" bodyCondition="_Kn1HlX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Kn1HlX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Kn1Hkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kn1Hln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CaregiverCharacteristics)).oclAsType(consol::CaregiverCharacteristics)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zvbZsV9xEey5t-mahoHmrg" type="__pNCUOY-EeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zvbZsl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Kn1Hk33sEeyivuDeOiJBMg" type="__pNCUOY-EeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Kn1HlH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zv7wAl9xEey5t-mahoHmrg" name="getCulturalAndReligiousObservations" bodyCondition="_zv7wBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zv7wBV9xEey5t-mahoHmrg" name="body" constrainedElement="_zv7wAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zv7wBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KoRzgX3sEeyivuDeOiJBMg" name="getCulturalAndReligiousObservations" bodyCondition="_KoRzhH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KoRzhH3sEeyivuDeOiJBMg" name="body" constrainedElement="_KoRzgX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KoRzhX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CulturalAndReligiousObservation)).oclAsType(consol::CulturalAndReligiousObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zv7wA19xEey5t-mahoHmrg" type="_H2EzIIqZEeOoMZgUoTghIg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zv7wBF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KoRzgn3sEeyivuDeOiJBMg" type="_H2EzIIqZEeOoMZgUoTghIg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KoRzg33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zwcGUl9xEey5t-mahoHmrg" name="getCharacteristicsOfHomeEnvironments" bodyCondition="_zwcGVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zwcGVV9xEey5t-mahoHmrg" name="body" constrainedElement="_zwcGUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zwcGVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Kow7sn3sEeyivuDeOiJBMg" name="getCharacteristicsOfHomeEnvironments" bodyCondition="_KoxiwH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KoxiwH3sEeyivuDeOiJBMg" name="body" constrainedElement="_Kow7sn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KoxiwX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CharacteristicsOfHomeEnvironment)).oclAsType(consol::CharacteristicsOfHomeEnvironment)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zwcGU19xEey5t-mahoHmrg" type="_O-O-IInUEeOJGtGyq_dBbA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zwcGVF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Kow7s33sEeyivuDeOiJBMg" type="_O-O-IInUEeOJGtGyq_dBbA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Kow7tH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4el3gl9xEey5t-mahoHmrg" name="getBirthSexObservations" bodyCondition="_4el3hV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4el3hV9xEey5t-mahoHmrg" name="body" constrainedElement="_4el3gl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4el3hl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OwJn0n3sEeyivuDeOiJBMg" name="getBirthSexObservations" bodyCondition="_OwJn1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OwJn1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_OwJn0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OwJn1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::BirthSexObservation)).oclAsType(consol::BirthSexObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4el3g19xEey5t-mahoHmrg" type="_8fGTcD-qEeaJttsCYk-pKw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4el3hF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OwJn033sEeyivuDeOiJBMg" type="_8fGTcD-qEeaJttsCYk-pKw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OwJn1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -34579,42 +34579,42 @@ The Vital Signs Section contains relevant vital signs for the context and use ca
 Vital signs are represented in the same way as other results, but are aggregated into their own section to follow clinical conventions.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_zwctYF9xEey5t-mahoHmrg" name="VitalSignsSectionEntriesOptionalTemplateId" constrainedElement="_8LkzYAFTEeSmasYc71ZgMQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zwctYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Koxiwn3sEeyivuDeOiJBMg" name="VitalSignsSectionEntriesOptionalTemplateId" constrainedElement="_8LkzYAFTEeSmasYc71ZgMQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Koxiw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.4' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zwfJoF9xEey5t-mahoHmrg" name="VitalSignsSectionEntriesOptionalCodeP" constrainedElement="_8LkzYAFTEeSmasYc71ZgMQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zwfJoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Koz_AH3sEeyivuDeOiJBMg" name="VitalSignsSectionEntriesOptionalCodeP" constrainedElement="_8LkzYAFTEeSmasYc71ZgMQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Koz_AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zwdUcV9xEey5t-mahoHmrg" name="VitalSignsSectionEntriesOptionalCode" constrainedElement="_8LkzYAFTEeSmasYc71ZgMQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zwdUcl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KoyJ0H3sEeyivuDeOiJBMg" name="VitalSignsSectionEntriesOptionalCode" constrainedElement="_8LkzYAFTEeSmasYc71ZgMQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KoyJ0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '8716-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zw-44F9xEey5t-mahoHmrg" name="VitalSignsSectionEntriesOptionalVitalSignsOrganizer" constrainedElement="_8LkzYAFTEeSmasYc71ZgMQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zw-44V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KpPc0H3sEeyivuDeOiJBMg" name="VitalSignsSectionEntriesOptionalVitalSignsOrganizer" constrainedElement="_8LkzYAFTEeSmasYc71ZgMQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KpPc0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.organizer.oclIsUndefined() and entry.organizer.oclIsKindOf(consol::VitalSignsOrganizer2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_8LnPoAFTEeSmasYc71ZgMQ" general="_bRH8sBVeEeGQCvUGzi1kDQ"/>
-      <ownedOperation xmi:id="_zw-44l9xEey5t-mahoHmrg" name="getConsolVitalSignsOrganizer2s" bodyCondition="_zw_f8F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zw_f8F9xEey5t-mahoHmrg" name="body" constrainedElement="_zw-44l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zw_f8V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KpPc0n3sEeyivuDeOiJBMg" name="getConsolVitalSignsOrganizer2s" bodyCondition="_KpPc1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KpPc1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_KpPc0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KpPc1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::VitalSignsOrganizer2)).oclAsType(consol::VitalSignsOrganizer2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zw-4419xEey5t-mahoHmrg" type="_dDupoPV2EeONioZkBKP8eQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zw-45F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KpPc033sEeyivuDeOiJBMg" type="_dDupoPV2EeONioZkBKP8eQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KpPc1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -34630,59 +34630,59 @@ The most recent directives are required, if known, and should be listed in as mu
 This section differentiates between &quot;advance directives&quot; and &quot;advance directive documents&quot;. The former is the directions to be followed whereas the latter refers to a legal document containing those directions.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_zw_f8l9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptionalTemplateId" constrainedElement="_jsKhYAFXEeSLIY0bHb-fFQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zw_f819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KpPc133sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptionalTemplateId" constrainedElement="_jsKhYAFXEeSLIY0bHb-fFQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KpPc2H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.21' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zxCjQF9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptionalCodeP" constrainedElement="_jsKhYAFXEeSLIY0bHb-fFQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zxCjQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KpRSAH3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptionalCodeP" constrainedElement="_jsKhYAFXEeSLIY0bHb-fFQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KpRSAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zxAHAF9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptionalCode" constrainedElement="_jsKhYAFXEeSLIY0bHb-fFQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zxAHAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KpQD4X3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptionalCode" constrainedElement="_jsKhYAFXEeSLIY0bHb-fFQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KpQD4n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '42348-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zxiSgF9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptional2AdvanceDirectiveOrganizer" constrainedElement="_jsKhYAFXEeSLIY0bHb-fFQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zxiSgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kpt98H3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptional2AdvanceDirectiveOrganizer" constrainedElement="_jsKhYAFXEeSLIY0bHb-fFQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kpt98X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.organizer.oclIsUndefined() and entry.organizer.oclIsKindOf(consol::AdvanceDirectiveOrganizer))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3R6pAF9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptionalAdvanceDirectiveObservation" constrainedElement="_jsKhYAFXEeSLIY0bHb-fFQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3R6pAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NvOWUH3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptionalAdvanceDirectiveObservation" constrainedElement="_jsKhYAFXEeSLIY0bHb-fFQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NvOWUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::AdvanceDirectiveObservation2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_jsNksAFXEeSLIY0bHb-fFQ" general="_1RZdIBVdEeGQCvUGzi1kDQ"/>
-      <ownedOperation xmi:id="_zxiSgl9xEey5t-mahoHmrg" name="getAdvanceDirectiveOrganizers" bodyCondition="_zxi5kl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zxi5kl9xEey5t-mahoHmrg" name="body" constrainedElement="_zxiSgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zxi5k19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Kpt98n3sEeyivuDeOiJBMg" name="getAdvanceDirectiveOrganizers" bodyCondition="_Kpt99X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Kpt99X3sEeyivuDeOiJBMg" name="body" constrainedElement="_Kpt98n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kpt99n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::AdvanceDirectiveOrganizer)).oclAsType(consol::AdvanceDirectiveOrganizer)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zxi5kF9xEey5t-mahoHmrg" type="_Z8VQYIlFEeOJGtGyq_dBbA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zxi5kV9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Kpt9833sEeyivuDeOiJBMg" type="_Z8VQYIlFEeOJGtGyq_dBbA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Kpt99H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3R6pAl9xEey5t-mahoHmrg" name="getConsolAdvanceDirectiveObservation2s" bodyCondition="_3R6pBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3R6pBV9xEey5t-mahoHmrg" name="body" constrainedElement="_3R6pAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3R6pBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NvOWUn3sEeyivuDeOiJBMg" name="getConsolAdvanceDirectiveObservation2s" bodyCondition="_NvOWVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NvOWVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NvOWUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NvOWVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AdvanceDirectiveObservation2)).oclAsType(consol::AdvanceDirectiveObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3R6pA19xEey5t-mahoHmrg" type="_GnllUK-9EeO8duI_7f6kZw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3R6pBF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_NvOWU33sEeyivuDeOiJBMg" type="_GnllUK-9EeO8duI_7f6kZw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NvOWVH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -34696,42 +34696,42 @@ value.code = '42348-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zxi5lF9xEey5t-mahoHmrg" name="MedicationsSectionEntriesOptionalTemplateId" constrainedElement="_JUvaUAFaEeS0nNJt6oyOyQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zxi5lV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kpt9933sEeyivuDeOiJBMg" name="MedicationsSectionEntriesOptionalTemplateId" constrainedElement="_JUvaUAFaEeS0nNJt6oyOyQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KpulAH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.1' and id.extension = '2014-06-09')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zxlV0F9xEey5t-mahoHmrg" name="MedicationsSectionEntriesOptionalCodeP" constrainedElement="_JUvaUAFaEeS0nNJt6oyOyQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zxlV0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KpwaMH3sEeyivuDeOiJBMg" name="MedicationsSectionEntriesOptionalCodeP" constrainedElement="_JUvaUAFaEeS0nNJt6oyOyQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KpwaMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zxkHsF9xEey5t-mahoHmrg" name="MedicationsSectionEntriesOptionalCode" constrainedElement="_JUvaUAFaEeS0nNJt6oyOyQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zxkHsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KpvMEH3sEeyivuDeOiJBMg" name="MedicationsSectionEntriesOptionalCode" constrainedElement="_JUvaUAFaEeS0nNJt6oyOyQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KpvMEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10160-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zyEeAF9xEey5t-mahoHmrg" name="MedicationsSectionEntriesOptionalMedicationActivity" constrainedElement="_JUvaUAFaEeS0nNJt6oyOyQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zyEeAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KqLQ8H3sEeyivuDeOiJBMg" name="MedicationsSectionEntriesOptionalMedicationActivity" constrainedElement="_JUvaUAFaEeS0nNJt6oyOyQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KqLQ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.substanceAdministration.oclIsUndefined() and entry.substanceAdministration.oclIsKindOf(consol::MedicationActivity2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_JUxPgAFaEeS0nNJt6oyOyQ" general="_iAoXEBVdEeGQCvUGzi1kDQ"/>
-      <ownedOperation xmi:id="_zyEeAl9xEey5t-mahoHmrg" name="getConsolMedicationActivity2s" bodyCondition="_zyEeBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zyEeBV9xEey5t-mahoHmrg" name="body" constrainedElement="_zyEeAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zyEeBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KqLQ8n3sEeyivuDeOiJBMg" name="getConsolMedicationActivity2s" bodyCondition="_KqLQ9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KqLQ9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_KqLQ8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KqLQ9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity2)).oclAsType(consol::MedicationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zyEeA19xEey5t-mahoHmrg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zyEeBF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KqLQ833sEeyivuDeOiJBMg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KqLQ9H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -34739,59 +34739,59 @@ value.code = '10160-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_iFLCgAFkEeSJ2uHfynwxCw">
         <body>This section lists and describes all relevant clinical problems at the time the document is generated. At a minimum, all pertinent current and historical problems should be listed. Overall health status may be represented in this section.</body>
       </ownedComment>
-      <ownedRule xmi:id="_zyFFEF9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalTemplateId" constrainedElement="_ZgLioAFkEeSJ2uHfynwxCw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zyFFEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KqL4AH3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalTemplateId" constrainedElement="_ZgLioAFkEeSJ2uHfynwxCw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KqL4AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.5' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zyHhUF9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalCodeP" constrainedElement="_ZgLioAFkEeSJ2uHfynwxCw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zyHhUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KqNtMH3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalCodeP" constrainedElement="_ZgLioAFkEeSJ2uHfynwxCw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KqNtMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zyFsIF9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalCode" constrainedElement="_ZgLioAFkEeSJ2uHfynwxCw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zyFsIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KqMfEH3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalCode" constrainedElement="_ZgLioAFkEeSJ2uHfynwxCw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KqMfEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '11450-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zymCcF9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalProblemConcern" constrainedElement="_ZgLioAFkEeSJ2uHfynwxCw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zymCcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KqpLAH3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalProblemConcern" constrainedElement="_ZgLioAFkEeSJ2uHfynwxCw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KqpLAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::ProblemConcernAct2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zzEjkF9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptional2HealthStatusObservation2" constrainedElement="_ZgLioAFkEeSJ2uHfynwxCw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zzFKoF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KrCzoH3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptional2HealthStatusObservation2" constrainedElement="_ZgLioAFkEeSJ2uHfynwxCw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KrCzoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->one(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::HealthStatusObservation2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_ZgPNAAFkEeSJ2uHfynwxCw" general="_naxrkBVdEeGQCvUGzi1kDQ"/>
-      <ownedOperation xmi:id="_zymCcl9xEey5t-mahoHmrg" name="getConsolProblemConcernAct2s" bodyCondition="_zymCdV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zymCdV9xEey5t-mahoHmrg" name="body" constrainedElement="_zymCcl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zymCdl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KqpLAn3sEeyivuDeOiJBMg" name="getConsolProblemConcernAct2s" bodyCondition="_KqpLBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KqpLBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KqpLAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KqpLBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::ProblemConcernAct2)).oclAsType(consol::ProblemConcernAct2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zymCc19xEey5t-mahoHmrg" type="_y5C8IOzbEeOnE-G4kptBiw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zymCdF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KqpLA33sEeyivuDeOiJBMg" type="_y5C8IOzbEeOnE-G4kptBiw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KqpLBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_zzFKoV9xEey5t-mahoHmrg" name="getHealthStatusObservation2" bodyCondition="_zzFKpF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zzFKpF9xEey5t-mahoHmrg" name="body" constrainedElement="_zzFKoV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zzFKpV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KrDasH3sEeyivuDeOiJBMg" name="getHealthStatusObservation2" bodyCondition="_KrDas33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KrDas33sEeyivuDeOiJBMg" name="body" constrainedElement="_KrDasH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KrDatH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::HealthStatusObservation2))->asSequence()->any(true).oclAsType(consol::HealthStatusObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zzFKol9xEey5t-mahoHmrg" type="_DMvdYOEFEeOmBMTtnrPqww" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zzFKo19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_KrDasX3sEeyivuDeOiJBMg" type="_DMvdYOEFEeOmBMTtnrPqww" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KrDasn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -34813,95 +34813,95 @@ This section differentiates between &quot;advance directives&quot; and &quot;adv
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies self.getObservations()->exists(obs : cda::Observation | obs.oclIsKindOf(consol::AdvanceDirectiveObservation2)) or self.getOrganizers()->exists(org : cda::Organizer | org.oclIsKindOf(consol::AdvanceDirectiveOrganizer))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zzFxsF9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptionalTemplateId" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zzFxsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KrDatX3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptionalTemplateId" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KrDatn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.21.1' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zzI1AF9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptionalCodeP" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zzI1AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KrF28H3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptionalCodeP" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KrF28X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zzG_0F9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptionalCode" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zzG_0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KrEo0H3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptionalCode" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KrEo0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '42348-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zzKDIF9xEey5t-mahoHmrg" name="AdvanceDirectivesSection2Title" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zzKDIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KrHFEH3sEeyivuDeOiJBMg" name="AdvanceDirectivesSection2Title" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KrHFEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zzL4UF9xEey5t-mahoHmrg" name="AdvanceDirectivesSection2Text" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zzL4UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KrITMH3sEeyivuDeOiJBMg" name="AdvanceDirectivesSection2Text" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KrITMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zzrAgF9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptional2AdvanceDirectiveOrganizer" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zzrAgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KrjJ8H3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptional2AdvanceDirectiveOrganizer" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KrjJ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3Sc0gF9xEey5t-mahoHmrg" name="AdvanceDirectivesSectionEntriesOptionalAdvanceDirectiveObservation" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3Sc0gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NvqbMH3sEeyivuDeOiJBMg" name="AdvanceDirectivesSectionEntriesOptionalAdvanceDirectiveObservation" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NvqbMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3S_nEF9xEey5t-mahoHmrg" name="AdvanceDirectivesSection2Entry" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3S_nEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NwLYkH3sEeyivuDeOiJBMg" name="AdvanceDirectivesSection2Entry" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NwLYkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.oclIsUndefined() and entry.oclIsKindOf(cda::Entry))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8QFMIF9xEey5t-mahoHmrg" name="AdvanceDirectivesSection2EntryHasAdvanceDirectiveObservation2XorAdvanceDirectiveOrganizer" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8QFMIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SZP1cH3sEeyivuDeOiJBMg" name="AdvanceDirectivesSection2EntryHasAdvanceDirectiveObservation2XorAdvanceDirectiveOrganizer" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SZP1cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entry->excluding(null)->reject(nullFlavor &lt;> vocab::NullFlavor::NI implies (observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::AdvanceDirectiveObservation2) xor organizer.oclIsUndefined() and entry.organizer.oclIsKindOf(consol::AdvanceDirectiveOrganizer)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8QFMIl9xEey5t-mahoHmrg" name="AdvanceDirectivesSection2EntryAdvanceDirectiveOrganizer" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8QFMI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SZQcgH3sEeyivuDeOiJBMg" name="AdvanceDirectivesSection2EntryAdvanceDirectiveOrganizer" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SZQcgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entry->excluding(null)->reject(organizer->one(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::AdvanceDirectiveOrganizer)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8QFMJF9xEey5t-mahoHmrg" name="AdvanceDirectivesSection2EntryAdvanceDirectiveObservation2" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8QFMJV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SZQcgn3sEeyivuDeOiJBMg" name="AdvanceDirectivesSection2EntryAdvanceDirectiveObservation2" constrainedElement="_ZFbCkAIPEeS-F85KYVlDyA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SZQcg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entry->excluding(null)->reject(observation->one(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AdvanceDirectiveObservation2)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_ZFc3wAIPEeS-F85KYVlDyA" general="_jsKhYAFXEeSLIY0bHb-fFQ"/>
-      <ownedOperation xmi:id="_zzrnkF9xEey5t-mahoHmrg" name="getConsolAdvanceDirectiveOrganizers" bodyCondition="_zzrnk19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_zzrnk19xEey5t-mahoHmrg" name="body" constrainedElement="_zzrnkF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_zzrnlF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KrjxAH3sEeyivuDeOiJBMg" name="getConsolAdvanceDirectiveOrganizers" bodyCondition="_KrjxA33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KrjxA33sEeyivuDeOiJBMg" name="body" constrainedElement="_KrjxAH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KrjxBH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::AdvanceDirectiveOrganizer)).oclAsType(consol::AdvanceDirectiveOrganizer)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_zzrnkV9xEey5t-mahoHmrg" type="_Z8VQYIlFEeOJGtGyq_dBbA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zzrnkl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KrjxAX3sEeyivuDeOiJBMg" type="_Z8VQYIlFEeOJGtGyq_dBbA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KrjxAn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3SdbkF9xEey5t-mahoHmrg" name="getConsolAdvanceDirectiveObservation2s" bodyCondition="_3Sdbk19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3Sdbk19xEey5t-mahoHmrg" name="body" constrainedElement="_3SdbkF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3SdblF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NvqbMn3sEeyivuDeOiJBMg" name="getConsolAdvanceDirectiveObservation2s" bodyCondition="_NvqbNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NvqbNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NvqbMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NvqbNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AdvanceDirectiveObservation2)).oclAsType(consol::AdvanceDirectiveObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3SdbkV9xEey5t-mahoHmrg" type="_GnllUK-9EeO8duI_7f6kZw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3Sdbkl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_NvqbM33sEeyivuDeOiJBMg" type="_GnllUK-9EeO8duI_7f6kZw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NvqbNH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -34909,42 +34909,42 @@ value.code = '42348-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_w56bYAIjEeSVzfoPSatgpg">
         <body>This section lists and describes any medication allergies, adverse reactions, idiosyncratic reactions, anaphylaxis/anaphylactoid reactions to food items, and metabolic variations or adverse reactions/allergies to other substances (such as latex, iodine, tape adhesives). At a minimum, it should list currently active and any relevant historical allergies and adverse reactions.</body>
       </ownedComment>
-      <ownedRule xmi:id="_zzrnlV9xEey5t-mahoHmrg" name="AllergiesSectionEntriesOptionalTemplateId" constrainedElement="_nWAcMAIjEeSVzfoPSatgpg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zzrnll9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KrjxBX3sEeyivuDeOiJBMg" name="AllergiesSectionEntriesOptionalTemplateId" constrainedElement="_nWAcMAIjEeSVzfoPSatgpg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KrjxBn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.6' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zzuD0F9xEey5t-mahoHmrg" name="AllergiesSectionEntriesOptionalCodeP" constrainedElement="_nWAcMAIjEeSVzfoPSatgpg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zzuD0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KrlmMH3sEeyivuDeOiJBMg" name="AllergiesSectionEntriesOptionalCodeP" constrainedElement="_nWAcMAIjEeSVzfoPSatgpg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KrlmMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_zzs1sF9xEey5t-mahoHmrg" name="AllergiesSectionEntriesOptionalCode" constrainedElement="_nWAcMAIjEeSVzfoPSatgpg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_zzs1sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KrkYEX3sEeyivuDeOiJBMg" name="AllergiesSectionEntriesOptionalCode" constrainedElement="_nWAcMAIjEeSVzfoPSatgpg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KrkYEn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '48765-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z0PBMF9xEey5t-mahoHmrg" name="AllergiesSectionEntriesOptionalAllergyProblemAct" constrainedElement="_nWAcMAIjEeSVzfoPSatgpg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z0PBMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KsAc8H3sEeyivuDeOiJBMg" name="AllergiesSectionEntriesOptionalAllergyProblemAct" constrainedElement="_nWAcMAIjEeSVzfoPSatgpg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KsAc8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::AllergyConcernAct2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_nWC4cAIjEeSVzfoPSatgpg" general="_bGzYgBVdEeGQCvUGzi1kDQ"/>
-      <ownedOperation xmi:id="_z0PBMl9xEey5t-mahoHmrg" name="getConsolAllergyConcernAct2s" bodyCondition="_z0PBNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_z0PBNV9xEey5t-mahoHmrg" name="body" constrainedElement="_z0PBMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_z0PoQF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KsBEAH3sEeyivuDeOiJBMg" name="getConsolAllergyConcernAct2s" bodyCondition="_KsBEA33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KsBEA33sEeyivuDeOiJBMg" name="body" constrainedElement="_KsBEAH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KsBEBH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::AllergyConcernAct2)).oclAsType(consol::AllergyConcernAct2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_z0PBM19xEey5t-mahoHmrg" type="_uCiIYLNwEeOtlapy2HWYww" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z0PBNF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KsBEAX3sEeyivuDeOiJBMg" type="_uCiIYLNwEeOtlapy2HWYww" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KsBEAn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -34952,60 +34952,60 @@ value.code = '48765-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_MQKTcAInEeSr1aKUYorURA">
         <body>This section lists and describes any medication allergies, adverse reactions, idiosyncratic reactions, anaphylaxis/anaphylactoid reactions to food items, and metabolic variations or adverse reactions/allergies to other substances (such as latex, iodine, tape adhesives). At a minimum, it should list currently active and any relevant historical allergies and adverse reactions.</body>
       </ownedComment>
-      <ownedRule xmi:id="_z0PoQV9xEey5t-mahoHmrg" name="AllergiesSectionEntriesOptionalTemplateId" constrainedElement="_EONPMAInEeSr1aKUYorURA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z0PoQl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KsBEBX3sEeyivuDeOiJBMg" name="AllergiesSectionEntriesOptionalTemplateId" constrainedElement="_EONPMAInEeSr1aKUYorURA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KsBEBn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.6.1' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z0Q2YF9xEey5t-mahoHmrg" name="AllergiesSection2NullFlavor" constrainedElement="_EONPMAInEeSr1aKUYorURA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z0Q2YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KsCSIH3sEeyivuDeOiJBMg" name="AllergiesSection2NullFlavor" constrainedElement="_EONPMAInEeSr1aKUYorURA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KsCSIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('nullFlavor')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z0TSoF9xEey5t-mahoHmrg" name="AllergiesSectionEntriesOptionalCodeP" constrainedElement="_EONPMAInEeSr1aKUYorURA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z0TSoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KsEuYH3sEeyivuDeOiJBMg" name="AllergiesSectionEntriesOptionalCodeP" constrainedElement="_EONPMAInEeSr1aKUYorURA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KsEuYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z0SEgF9xEey5t-mahoHmrg" name="AllergiesSectionEntriesOptionalCode" constrainedElement="_EONPMAInEeSr1aKUYorURA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z0SEgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KsDgQH3sEeyivuDeOiJBMg" name="AllergiesSectionEntriesOptionalCode" constrainedElement="_EONPMAInEeSr1aKUYorURA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KsDgQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '48765-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z0VH0F9xEey5t-mahoHmrg" name="AllergiesSection2Title" constrainedElement="_EONPMAInEeSr1aKUYorURA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z0VH0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KsGjkH3sEeyivuDeOiJBMg" name="AllergiesSection2Title" constrainedElement="_EONPMAInEeSr1aKUYorURA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KsGjkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z0WV8F9xEey5t-mahoHmrg" name="AllergiesSection2Text" constrainedElement="_EONPMAInEeSr1aKUYorURA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z0WV8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KsIYwH3sEeyivuDeOiJBMg" name="AllergiesSection2Text" constrainedElement="_EONPMAInEeSr1aKUYorURA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KsIYwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z0zo8F9xEey5t-mahoHmrg" name="AllergiesSectionEntriesOptionalAllergyProblemAct" constrainedElement="_EONPMAInEeSr1aKUYorURA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z0zo8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KsmS0H3sEeyivuDeOiJBMg" name="AllergiesSectionEntriesOptionalAllergyProblemAct" constrainedElement="_EONPMAInEeSr1aKUYorURA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KsmS0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::AllergyConcernAct2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_EOQSgAInEeSr1aKUYorURA" general="_nWAcMAIjEeSVzfoPSatgpg"/>
-      <ownedOperation xmi:id="_z00QAF9xEey5t-mahoHmrg" name="getConsolAllergyConcernAct2s" bodyCondition="_z00QA19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_z00QA19xEey5t-mahoHmrg" name="body" constrainedElement="_z00QAF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_z00QBF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ksm54H3sEeyivuDeOiJBMg" name="getConsolAllergyConcernAct2s" bodyCondition="_Ksm5433sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ksm5433sEeyivuDeOiJBMg" name="body" constrainedElement="_Ksm54H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ksm55H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::AllergyConcernAct2)).oclAsType(consol::AllergyConcernAct2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_z00QAV9xEey5t-mahoHmrg" type="_uCiIYLNwEeOtlapy2HWYww" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z00QAl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Ksm54X3sEeyivuDeOiJBMg" type="_uCiIYLNwEeOtlapy2HWYww" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ksm54n3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -35013,60 +35013,60 @@ value.code = '48765-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_2f59EAIvEeScubSeRE1upQ">
         <body>This section lists and describes any healthcare encounters pertinent to the patient's current health status or historical health history. An encounter is an interaction, regardless of the setting, between a patient and a practitioner who is vested with primary responsibility for diagnosing, evaluating, or treating the patient's condition. It may include visits, appointments, as well as non-face-to-face interactions. It is also a contact between a patient and a practitioner who has primary responsibility (exercising independent judgment) for assessing and treating the patient at a given contact. This section may contain all encounters for the time period being summarized, but should include notable encounters.</body>
       </ownedComment>
-      <ownedRule xmi:id="_z00QBV9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalTemplateId" constrainedElement="_ogD-EAIvEeScubSeRE1upQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z00QBl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ksm55X3sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalTemplateId" constrainedElement="_ogD-EAIvEeScubSeRE1upQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ksm55n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.22.1' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z02FMF9xEey5t-mahoHmrg" name="EncountersSection2NullFlavor" constrainedElement="_ogD-EAIvEeScubSeRE1upQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z02FMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KsoIAH3sEeyivuDeOiJBMg" name="EncountersSection2NullFlavor" constrainedElement="_ogD-EAIvEeScubSeRE1upQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KsoIAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('nullFlavor')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z036YF9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalCodeP" constrainedElement="_ogD-EAIvEeScubSeRE1upQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z036YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KsqkQH3sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalCodeP" constrainedElement="_ogD-EAIvEeScubSeRE1upQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KsqkQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z02sQF9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalCode" constrainedElement="_ogD-EAIvEeScubSeRE1upQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z02sQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KspWIH3sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalCode" constrainedElement="_ogD-EAIvEeScubSeRE1upQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KspWIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '46240-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z05vkF9xEey5t-mahoHmrg" name="EncountersSection2Text" constrainedElement="_ogD-EAIvEeScubSeRE1upQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z05vkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KssZcH3sEeyivuDeOiJBMg" name="EncountersSection2Text" constrainedElement="_ogD-EAIvEeScubSeRE1upQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KssZcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z069sF9xEey5t-mahoHmrg" name="EncountersSection2Title" constrainedElement="_ogD-EAIvEeScubSeRE1upQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z069sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KstnkH3sEeyivuDeOiJBMg" name="EncountersSection2Title" constrainedElement="_ogD-EAIvEeScubSeRE1upQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KstnkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z1aF4F9xEey5t-mahoHmrg" name="EncountersSectionEntriesOptionalEncounterActivities" constrainedElement="_ogD-EAIvEeScubSeRE1upQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z1aF4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KtIeUH3sEeyivuDeOiJBMg" name="EncountersSectionEntriesOptionalEncounterActivities" constrainedElement="_ogD-EAIvEeScubSeRE1upQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KtIeUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.encounter.oclIsUndefined() and entry.encounter.oclIsKindOf(consol::EncounterActivity2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_ogHBYAIvEeScubSeRE1upQ" general="_kgM0YPvbEeOJwYDYIUCQDg"/>
-      <ownedOperation xmi:id="_z1aF4l9xEey5t-mahoHmrg" name="getConsolEncounterActivity2s" bodyCondition="_z1aF5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_z1aF5V9xEey5t-mahoHmrg" name="body" constrainedElement="_z1aF4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_z1aF5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KtIeUn3sEeyivuDeOiJBMg" name="getConsolEncounterActivity2s" bodyCondition="_KtIeVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KtIeVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KtIeUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KtIeVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getEncounters()->select(encounter : cda::Encounter | not encounter.oclIsUndefined() and encounter.oclIsKindOf(consol::EncounterActivity2)).oclAsType(consol::EncounterActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_z1aF419xEey5t-mahoHmrg" type="_RGU34MzDEeO93sHu8pHB2g" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z1aF5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KtIeU33sEeyivuDeOiJBMg" type="_RGU34MzDEeO93sHu8pHB2g" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KtIeVH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -35074,74 +35074,74 @@ value.code = '46240-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_RgJTcAI0EeSRkrs1G7P_XQ">
         <body>This section contains the medications the patient is intended to take or stop after discharge. Current, active medications must be listed. The section may also include a patient's prescription history and indicate the source of the medication list.</body>
       </ownedComment>
-      <ownedRule xmi:id="_z1as8F9xEey5t-mahoHmrg" name="HospitalDischargeMedicationsSectionEntriesOptionalTemplateId" constrainedElement="_Jt0moAI0EeSRkrs1G7P_XQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z1as8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KtJFYH3sEeyivuDeOiJBMg" name="HospitalDischargeMedicationsSectionEntriesOptionalTemplateId" constrainedElement="_Jt0moAI0EeSRkrs1G7P_XQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KtJFYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.11.1' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z1b7EF9xEey5t-mahoHmrg" name="DischargeMedicationsSection2NullFlavor" constrainedElement="_Jt0moAI0EeSRkrs1G7P_XQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z1b7EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KtKTgH3sEeyivuDeOiJBMg" name="DischargeMedicationsSection2NullFlavor" constrainedElement="_Jt0moAI0EeSRkrs1G7P_XQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KtKTgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('nullFlavor')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z1eXUF9xEey5t-mahoHmrg" name="DischargeMedicationsSection2CodeP" constrainedElement="_Jt0moAI0EeSRkrs1G7P_XQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z1eXUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KtMvwH3sEeyivuDeOiJBMg" name="DischargeMedicationsSection2CodeP" constrainedElement="_Jt0moAI0EeSRkrs1G7P_XQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KtMvwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z1dJMF9xEey5t-mahoHmrg" name="DischargeMedicationsSection2Code" constrainedElement="_Jt0moAI0EeSRkrs1G7P_XQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z1dJMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KtLhoH3sEeyivuDeOiJBMg" name="DischargeMedicationsSection2Code" constrainedElement="_Jt0moAI0EeSRkrs1G7P_XQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KtLhoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10183-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z1flcF9xEey5t-mahoHmrg" name="DischargeMedicationsSection2Title" constrainedElement="_Jt0moAI0EeSRkrs1G7P_XQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z1flcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KtOk8H3sEeyivuDeOiJBMg" name="DischargeMedicationsSection2Title" constrainedElement="_Jt0moAI0EeSRkrs1G7P_XQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KtOk8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z1haoF9xEey5t-mahoHmrg" name="DischargeMedicationsSection2Text" constrainedElement="_Jt0moAI0EeSRkrs1G7P_XQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z1haoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KtPzEH3sEeyivuDeOiJBMg" name="DischargeMedicationsSection2Text" constrainedElement="_Jt0moAI0EeSRkrs1G7P_XQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KtPzEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z2DmIF9xEey5t-mahoHmrg" name="HospitalDischargeMedicationsSectionEntriesOptionalDischargeMedication" constrainedElement="_Jt0moAI0EeSRkrs1G7P_XQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z2DmIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ktr38H3sEeyivuDeOiJBMg" name="HospitalDischargeMedicationsSectionEntriesOptionalDischargeMedication" constrainedElement="_Jt0moAI0EeSRkrs1G7P_XQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ktr38X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::DischargeMedication2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8QHBUF9xEey5t-mahoHmrg" name="DischargeMedicationsSection2CETranslation" constrainedElement="_Jt0moAI0EeSRkrs1G7P_XQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8QHBUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SZSRsH3sEeyivuDeOiJBMg" name="DischargeMedicationsSection2CETranslation" constrainedElement="_Jt0moAI0EeSRkrs1G7P_XQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SZSRsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->size() = 1 and translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.code = '75311-1' and value.codeSystem = '2.16.840.1.113883.6.1')) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8QHBUl9xEey5t-mahoHmrg" name="DischargeMedicationsSection2CETranslationP" constrainedElement="_Jt0moAI0EeSRkrs1G7P_XQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8QHBU19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SZS4wH3sEeyivuDeOiJBMg" name="DischargeMedicationsSection2CETranslationP" constrainedElement="_Jt0moAI0EeSRkrs1G7P_XQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SZS4wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->size() =  1) )))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_Jt3p8AI0EeSRkrs1G7P_XQ" general="_HlfBYPyzEeOfAK77IvEBUw"/>
-      <ownedOperation xmi:id="_z2ENMF9xEey5t-mahoHmrg" name="getConsolDischargeMedication2s" bodyCondition="_z2ENM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_z2ENM19xEey5t-mahoHmrg" name="body" constrainedElement="_z2ENMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_z2ENNF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KtsfAH3sEeyivuDeOiJBMg" name="getConsolDischargeMedication2s" bodyCondition="_KtsfA33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KtsfA33sEeyivuDeOiJBMg" name="body" constrainedElement="_KtsfAH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KtsfBH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::DischargeMedication2)).oclAsType(consol::DischargeMedication2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_z2ENMV9xEey5t-mahoHmrg" type="_EIeu8MyjEeO93sHu8pHB2g" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z2ENMl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KtsfAX3sEeyivuDeOiJBMg" type="_EIeu8MyjEeO93sHu8pHB2g" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KtsfAn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -35149,60 +35149,60 @@ value.code = '75311-1' and value.codeSystem = '2.16.840.1.113883.6.1')) )))</bod
       <ownedComment xmi:id="_64PrgALNEeSIPYXg7AgJzw">
         <body>The Immunizations Section defines a patient's current immunization status and pertinent immunization history. The primary use case for the Immunization Section is to enable communication of a patient's immunization status. The section should include current immunization status, and may contain the entire immunization history that is relevant to the period of time being summarized.</body>
       </ownedComment>
-      <ownedRule xmi:id="_z2ENNV9xEey5t-mahoHmrg" name="ImmunizationsSectionEntriesOptionalTemplateId" constrainedElement="_14bikALNEeSIPYXg7AgJzw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z2ENNl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KtsfBX3sEeyivuDeOiJBMg" name="ImmunizationsSectionEntriesOptionalTemplateId" constrainedElement="_14bikALNEeSIPYXg7AgJzw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KtsfBn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.2.1' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z2FbUF9xEey5t-mahoHmrg" name="ImmunizationsSection2NullFlavor" constrainedElement="_14bikALNEeSIPYXg7AgJzw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z2GCYF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KtttIH3sEeyivuDeOiJBMg" name="ImmunizationsSection2NullFlavor" constrainedElement="_14bikALNEeSIPYXg7AgJzw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KtttIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('nullFlavor')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z2H3kF9xEey5t-mahoHmrg" name="ImmunizationsSectionEntriesOptionalCodeP" constrainedElement="_14bikALNEeSIPYXg7AgJzw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z2IeoF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KtwJYH3sEeyivuDeOiJBMg" name="ImmunizationsSectionEntriesOptionalCodeP" constrainedElement="_14bikALNEeSIPYXg7AgJzw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KtwJYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z2GpcF9xEey5t-mahoHmrg" name="ImmunizationsSectionEntriesOptionalCode" constrainedElement="_14bikALNEeSIPYXg7AgJzw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z2GpcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ktu7QH3sEeyivuDeOiJBMg" name="ImmunizationsSectionEntriesOptionalCode" constrainedElement="_14bikALNEeSIPYXg7AgJzw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ktu7QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '11369-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z2JswF9xEey5t-mahoHmrg" name="ImmunizationsSection2Title" constrainedElement="_14bikALNEeSIPYXg7AgJzw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z2JswV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KtxXgH3sEeyivuDeOiJBMg" name="ImmunizationsSection2Title" constrainedElement="_14bikALNEeSIPYXg7AgJzw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KtxXgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z2Lh8F9xEey5t-mahoHmrg" name="ImmunizationsSection2Text" constrainedElement="_14bikALNEeSIPYXg7AgJzw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z2Lh8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KtyloH3sEeyivuDeOiJBMg" name="ImmunizationsSection2Text" constrainedElement="_14bikALNEeSIPYXg7AgJzw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KtyloX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z2nm0F9xEey5t-mahoHmrg" name="ImmunizationsSectionEntriesOptionalImmunizationActivity" constrainedElement="_14bikALNEeSIPYXg7AgJzw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z2nm0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KuOqgH3sEeyivuDeOiJBMg" name="ImmunizationsSectionEntriesOptionalImmunizationActivity" constrainedElement="_14bikALNEeSIPYXg7AgJzw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KuOqgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.substanceAdministration.oclIsUndefined() and entry.substanceAdministration.oclIsKindOf(consol::ImmunizationActivity2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_14dXwALNEeSIPYXg7AgJzw" general="_kdQhIPy3EeO1SvUcmWeLDQ"/>
-      <ownedOperation xmi:id="_z2nm0l9xEey5t-mahoHmrg" name="getConsolImmunizationActivity2s" bodyCondition="_z2oN4l9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_z2oN4l9xEey5t-mahoHmrg" name="body" constrainedElement="_z2nm0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_z2oN419xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KuOqgn3sEeyivuDeOiJBMg" name="getConsolImmunizationActivity2s" bodyCondition="_KuOqhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KuOqhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KuOqgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KuOqhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::ImmunizationActivity2)).oclAsType(consol::ImmunizationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_z2oN4F9xEey5t-mahoHmrg" type="_zI6vcOE7EeOTq9XEMvvkWw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z2oN4V9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KuOqg33sEeyivuDeOiJBMg" type="_zI6vcOE7EeOTq9XEMvvkWw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KuOqhH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -35211,60 +35211,60 @@ value.code = '11369-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         <body>The Medications Section contains a patient's current medications and pertinent medication history. At a minimum, the currently active medications are listed. An entire medication history is an option. The section can describe a patient's prescription and dispense history and information about intended drug monitoring. &#xD;
 This section requires either an entry indicating the subject is not known to be on any medications or entries summarizing the subject's medications.</body>
       </ownedComment>
-      <ownedRule xmi:id="_z2oN5F9xEey5t-mahoHmrg" name="MedicationsSectionEntriesOptionalTemplateId" constrainedElement="_P2mp4ALQEeS0YMHMf4rRtQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z2oN5V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KuOqh33sEeyivuDeOiJBMg" name="MedicationsSectionEntriesOptionalTemplateId" constrainedElement="_P2mp4ALQEeS0YMHMf4rRtQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KuOqiH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.1.1' and id.extension = '2014-06-09')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z2pcAF9xEey5t-mahoHmrg" name="MedicationsSection2NullFlavor" constrainedElement="_P2mp4ALQEeS0YMHMf4rRtQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z2pcAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KuP4oH3sEeyivuDeOiJBMg" name="MedicationsSection2NullFlavor" constrainedElement="_P2mp4ALQEeS0YMHMf4rRtQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KuP4oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('nullFlavor')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z2rRMF9xEey5t-mahoHmrg" name="MedicationsSectionEntriesOptionalCodeP" constrainedElement="_P2mp4ALQEeS0YMHMf4rRtQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z2rRMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KuSU4H3sEeyivuDeOiJBMg" name="MedicationsSectionEntriesOptionalCodeP" constrainedElement="_P2mp4ALQEeS0YMHMf4rRtQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KuSU4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z2qDEF9xEey5t-mahoHmrg" name="MedicationsSectionEntriesOptionalCode" constrainedElement="_P2mp4ALQEeS0YMHMf4rRtQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z2qDEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KuRGwH3sEeyivuDeOiJBMg" name="MedicationsSectionEntriesOptionalCode" constrainedElement="_P2mp4ALQEeS0YMHMf4rRtQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KuRGwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '10160-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z2ttcF9xEey5t-mahoHmrg" name="MedicationsSection2Title" constrainedElement="_P2mp4ALQEeS0YMHMf4rRtQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z2ttcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KuUKEH3sEeyivuDeOiJBMg" name="MedicationsSection2Title" constrainedElement="_P2mp4ALQEeS0YMHMf4rRtQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KuUKEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z2u7kF9xEey5t-mahoHmrg" name="MedicationsSection2Text" constrainedElement="_P2mp4ALQEeS0YMHMf4rRtQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z2u7kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KuV_QH3sEeyivuDeOiJBMg" name="MedicationsSection2Text" constrainedElement="_P2mp4ALQEeS0YMHMf4rRtQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KuV_QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z3NcsF9xEey5t-mahoHmrg" name="MedicationsSectionEntriesOptionalMedicationActivity" constrainedElement="_P2mp4ALQEeS0YMHMf4rRtQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z3NcsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KuyEIH3sEeyivuDeOiJBMg" name="MedicationsSectionEntriesOptionalMedicationActivity" constrainedElement="_P2mp4ALQEeS0YMHMf4rRtQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KuyEIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.substanceAdministration.oclIsUndefined() and entry.substanceAdministration.oclIsKindOf(consol::MedicationActivity2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_P2ofEALQEeS0YMHMf4rRtQ" general="_JUvaUAFaEeS0nNJt6oyOyQ"/>
-      <ownedOperation xmi:id="_z3Ncsl9xEey5t-mahoHmrg" name="getConsolMedicationActivity2s" bodyCondition="_z3NctV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_z3NctV9xEey5t-mahoHmrg" name="body" constrainedElement="_z3Ncsl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_z3Nctl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KuyEIn3sEeyivuDeOiJBMg" name="getConsolMedicationActivity2s" bodyCondition="_KuyEJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KuyEJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KuyEIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KuyEJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity2)).oclAsType(consol::MedicationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_z3Ncs19xEey5t-mahoHmrg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z3NctF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KuyEI33sEeyivuDeOiJBMg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KuyEJH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -35272,77 +35272,77 @@ value.code = '10160-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_1M5_sALVEeSyydFGYJajGA">
         <body>This section lists and describes all relevant clinical problems at the time the document is generated. At a minimum, all pertinent current and historical problems should be listed. Overall health status may be represented in this section.</body>
       </ownedComment>
-      <ownedRule xmi:id="_z3ODwF9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalTemplateId" constrainedElement="_IXrA4ALVEeSyydFGYJajGA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z3ODwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KuyEJ33sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalTemplateId" constrainedElement="_IXrA4ALVEeSyydFGYJajGA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KuyEKH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.5.1' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z3PR4F9xEey5t-mahoHmrg" name="ProblemSection2NullFlavor" constrainedElement="_IXrA4ALVEeSyydFGYJajGA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z3PR4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KuzSQH3sEeyivuDeOiJBMg" name="ProblemSection2NullFlavor" constrainedElement="_IXrA4ALVEeSyydFGYJajGA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KuzSQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('nullFlavor')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z3SVMF9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalCodeP" constrainedElement="_IXrA4ALVEeSyydFGYJajGA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z3SVMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ku1ugH3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalCodeP" constrainedElement="_IXrA4ALVEeSyydFGYJajGA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ku1ugX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z3QgAF9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalCode" constrainedElement="_IXrA4ALVEeSyydFGYJajGA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z3QgAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ku0gYH3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalCode" constrainedElement="_IXrA4ALVEeSyydFGYJajGA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ku0gYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '11450-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z3UKYF9xEey5t-mahoHmrg" name="ProblemSection2Title" constrainedElement="_IXrA4ALVEeSyydFGYJajGA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z3UKYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ku28oH3sEeyivuDeOiJBMg" name="ProblemSection2Title" constrainedElement="_IXrA4ALVEeSyydFGYJajGA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ku28oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z3VYgF9xEey5t-mahoHmrg" name="ProblemSection2Text" constrainedElement="_IXrA4ALVEeSyydFGYJajGA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z3VYgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ku4KwH3sEeyivuDeOiJBMg" name="ProblemSection2Text" constrainedElement="_IXrA4ALVEeSyydFGYJajGA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ku4KwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z30gsF9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptionalProblemConcern" constrainedElement="_IXrA4ALVEeSyydFGYJajGA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z30gsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KvTokH3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptionalProblemConcern" constrainedElement="_IXrA4ALVEeSyydFGYJajGA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KvTokX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::ProblemConcernAct2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z4TB0F9xEey5t-mahoHmrg" name="ProblemSectionEntriesOptional2HealthStatusObservation2" constrainedElement="_IXrA4ALVEeSyydFGYJajGA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z4TB0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KvufUH3sEeyivuDeOiJBMg" name="ProblemSectionEntriesOptional2HealthStatusObservation2" constrainedElement="_IXrA4ALVEeSyydFGYJajGA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KvufUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->one(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::HealthStatusObservation2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_IXs2EALVEeSyydFGYJajGA" general="_ZgLioAFkEeSJ2uHfynwxCw"/>
-      <ownedOperation xmi:id="_z31HwF9xEey5t-mahoHmrg" name="getConsolProblemConcernAct2s" bodyCondition="_z31Hw19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_z31Hw19xEey5t-mahoHmrg" name="body" constrainedElement="_z31HwF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_z31HxF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KvTokn3sEeyivuDeOiJBMg" name="getConsolProblemConcernAct2s" bodyCondition="_KvTolX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KvTolX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KvTokn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KvToln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::ProblemConcernAct2)).oclAsType(consol::ProblemConcernAct2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_z31HwV9xEey5t-mahoHmrg" type="_y5C8IOzbEeOnE-G4kptBiw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z31Hwl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KvTok33sEeyivuDeOiJBMg" type="_y5C8IOzbEeOnE-G4kptBiw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KvTolH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_z4TB0l9xEey5t-mahoHmrg" name="getConsolHealthStatusObservation2" bodyCondition="_z4TB1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_z4TB1V9xEey5t-mahoHmrg" name="body" constrainedElement="_z4TB0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_z4TB1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KvufUn3sEeyivuDeOiJBMg" name="getConsolHealthStatusObservation2" bodyCondition="_KvufVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KvufVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KvufUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KvufVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::HealthStatusObservation2))->asSequence()->any(true).oclAsType(consol::HealthStatusObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_z4TB019xEey5t-mahoHmrg" type="_DMvdYOEFEeOmBMTtnrPqww" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z4TB1F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_KvufU33sEeyivuDeOiJBMg" type="_DMvdYOEFEeOmBMTtnrPqww" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KvufVH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -35356,118 +35356,118 @@ value.code = '11450-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies self.getActs()->exists(a : cda::Act | a.oclIsKindOf(consol::ProcedureActivityAct)) or self.getObservations()->exists(o : cda::Observation | o.oclIsKindOf(consol::ProcedureActivityObservation)) or self.getProcedures()->exists(p : cda::Procedure | p.oclIsKindOf(consol::ProcedureActivityProcedure))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z4To4F9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalTemplateId" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z4To4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KvufV33sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalTemplateId" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KvufWH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.7.1' and id.extension = '2014-06-09')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z4U3AF9xEey5t-mahoHmrg" name="ProceduresSection2NullFlavor" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z4U3AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KvvtcH3sEeyivuDeOiJBMg" name="ProceduresSection2NullFlavor" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KvvtcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('nullFlavor')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z4XTQF9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalCodeP" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z4XTQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KvyJsH3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalCodeP" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KvyJsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z4WFIF9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalCode" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z4WFIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kvw7kH3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalCode" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kvw7kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '47519-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z4ZIcF9xEey5t-mahoHmrg" name="ProceduresSection2Title" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z4ZIcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kvz-4H3sEeyivuDeOiJBMg" name="ProceduresSection2Title" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kvz-4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z4aWkF9xEey5t-mahoHmrg" name="ProceduresSection2Text" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z4aWkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kv1NAH3sEeyivuDeOiJBMg" name="ProceduresSection2Text" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kv1NAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z44QoF9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalProcedureActivityProcedure" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z44QoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KwQDwH3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalProcedureActivityProcedure" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KwQDwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z5ZOAF9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalProcedureActivityObservation" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z5ZOAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KwrhkH3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalProcedureActivityObservation" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KwrhkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z55kUF9xEey5t-mahoHmrg" name="ProceduresSectionEntriesOptionalProcedureActivityAct" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z55kUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KxLQ0H3sEeyivuDeOiJBMg" name="ProceduresSectionEntriesOptionalProcedureActivityAct" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KxLQ0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3XGrAF9xEey5t-mahoHmrg" name="ProceduresSection2Entry" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3XGrAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Nzo8QH3sEeyivuDeOiJBMg" name="ProceduresSection2Entry" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Nzo8QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.oclIsUndefined() and entry.oclIsKindOf(cda::Entry))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Qn-sF9xEey5t-mahoHmrg" name="ProceduresSection2EntryProcedureActivityAct2" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Qn-sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SZ-1QH3sEeyivuDeOiJBMg" name="ProceduresSection2EntryProcedureActivityAct2" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SZ-1QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entry->excluding(null)->reject(act->one(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::ProcedureActivityAct2)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8QolwF9xEey5t-mahoHmrg" name="ProceduresSection2EntryProcedureActivityObservation2" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8QolwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SZ-1Qn3sEeyivuDeOiJBMg" name="ProceduresSection2EntryProcedureActivityObservation2" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SZ-1Q33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entry->excluding(null)->reject(observation->one(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProcedureActivityObservation2)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8Qolwl9xEey5t-mahoHmrg" name="ProceduresSection2EntryProcedureActivityProcedure2" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8Qolw19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SZ_cUH3sEeyivuDeOiJBMg" name="ProceduresSection2EntryProcedureActivityProcedure2" constrainedElement="_N6wUUALoEeSBA9s7kRnaEg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SZ_cUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entry->excluding(null)->reject(procedure->one(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::ProcedureActivityProcedure2)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_N6zXoALoEeSBA9s7kRnaEg" general="_80dMoAB0EeSLOb2O6vSPzg"/>
-      <ownedOperation xmi:id="_z443sF9xEey5t-mahoHmrg" name="getConsolProcedureActivityProcedure2s" bodyCondition="_z443s19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_z443s19xEey5t-mahoHmrg" name="body" constrainedElement="_z443sF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_z443tF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KwQDwn3sEeyivuDeOiJBMg" name="getConsolProcedureActivityProcedure2s" bodyCondition="_KwQDxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KwQDxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KwQDwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KwQDxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getProcedures()->select(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::ProcedureActivityProcedure2)).oclAsType(consol::ProcedureActivityProcedure2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_z443sV9xEey5t-mahoHmrg" type="_fCVOQPDqEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z443sl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KwQDw33sEeyivuDeOiJBMg" type="_fCVOQPDqEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KwQDxH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_z5Z1EF9xEey5t-mahoHmrg" name="getConsolProcedureActivityObservation2s" bodyCondition="_z5Z1E19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_z5Z1E19xEey5t-mahoHmrg" name="body" constrainedElement="_z5Z1EF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_z5Z1FF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Kwrhkn3sEeyivuDeOiJBMg" name="getConsolProcedureActivityObservation2s" bodyCondition="_KwrhlX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KwrhlX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Kwrhkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kwrhln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProcedureActivityObservation2)).oclAsType(consol::ProcedureActivityObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_z5Z1EV9xEey5t-mahoHmrg" type="_QoLWAPDjEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z5Z1El9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Kwrhk33sEeyivuDeOiJBMg" type="_QoLWAPDjEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KwrhlH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_z55kUl9xEey5t-mahoHmrg" name="getConsolProcedureActivityAct2s" bodyCondition="_z55kVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_z55kVV9xEey5t-mahoHmrg" name="body" constrainedElement="_z55kUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_z55kVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KxL34H3sEeyivuDeOiJBMg" name="getConsolProcedureActivityAct2s" bodyCondition="_KxL3433sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KxL3433sEeyivuDeOiJBMg" name="body" constrainedElement="_KxL34H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KxL35H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::ProcedureActivityAct2)).oclAsType(consol::ProcedureActivityAct2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_z55kU19xEey5t-mahoHmrg" type="_CFMuYPDbEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z55kVF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KxL34X3sEeyivuDeOiJBMg" type="_CFMuYPDbEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KxL34n3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -35486,60 +35486,60 @@ Imaging results are typically generated by a clinician reviewing the output of a
 Procedure results are typically generated by a clinician to provide more granular information about component observations made during a procedure, such as where a gastroenterologist reports the size of a polyp observed during a colonoscopy.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_z56LYF9xEey5t-mahoHmrg" name="ResultsSectionEntriesOptionalTemplateId" constrainedElement="_bAAhEALtEeSueJWOLw5iaQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z56LYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KxL35X3sEeyivuDeOiJBMg" name="ResultsSectionEntriesOptionalTemplateId" constrainedElement="_bAAhEALtEeSueJWOLw5iaQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KxL35n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.3.1' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z57ZgF9xEey5t-mahoHmrg" name="ResultsSection2NullFlavor" constrainedElement="_bAAhEALtEeSueJWOLw5iaQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z57ZgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KxNGAH3sEeyivuDeOiJBMg" name="ResultsSection2NullFlavor" constrainedElement="_bAAhEALtEeSueJWOLw5iaQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KxNGAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('nullFlavor')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z5-c0F9xEey5t-mahoHmrg" name="ResultsSectionEntriesOptionalCodeP" constrainedElement="_bAAhEALtEeSueJWOLw5iaQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z5-c0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KxPiQH3sEeyivuDeOiJBMg" name="ResultsSectionEntriesOptionalCodeP" constrainedElement="_bAAhEALtEeSueJWOLw5iaQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KxPiQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z58noF9xEey5t-mahoHmrg" name="ResultsSectionEntriesOptionalCode" constrainedElement="_bAAhEALtEeSueJWOLw5iaQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z58noV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KxOUIH3sEeyivuDeOiJBMg" name="ResultsSectionEntriesOptionalCode" constrainedElement="_bAAhEALtEeSueJWOLw5iaQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KxOUIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '30954-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z6ASAF9xEey5t-mahoHmrg" name="ResultsSection2Title" constrainedElement="_bAAhEALtEeSueJWOLw5iaQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z6ASAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KxRXcH3sEeyivuDeOiJBMg" name="ResultsSection2Title" constrainedElement="_bAAhEALtEeSueJWOLw5iaQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KxRXcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z6BgIF9xEey5t-mahoHmrg" name="ResultsSection2Text" constrainedElement="_bAAhEALtEeSueJWOLw5iaQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z6BgIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KxSlkH3sEeyivuDeOiJBMg" name="ResultsSection2Text" constrainedElement="_bAAhEALtEeSueJWOLw5iaQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KxSlkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z6jEkF9xEey5t-mahoHmrg" name="ResultsSectionEntriesOptionalResultOrganizer" constrainedElement="_bAAhEALtEeSueJWOLw5iaQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z6jEkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KxuDYH3sEeyivuDeOiJBMg" name="ResultsSectionEntriesOptionalResultOrganizer" constrainedElement="_bAAhEALtEeSueJWOLw5iaQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KxuDYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.organizer.oclIsUndefined() and entry.organizer.oclIsKindOf(consol::ResultOrganizer2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_bAC9UALtEeSueJWOLw5iaQ" general="_yaJ3QAFAEeSaVZ5WxWd94w"/>
-      <ownedOperation xmi:id="_z6jEkl9xEey5t-mahoHmrg" name="getConsolResultOrganizer2s" bodyCondition="_z6jroF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_z6jroF9xEey5t-mahoHmrg" name="body" constrainedElement="_z6jEkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_z6jroV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KxuDYn3sEeyivuDeOiJBMg" name="getConsolResultOrganizer2s" bodyCondition="_KxuDZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KxuDZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_KxuDYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KxuDZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::ResultOrganizer2)).oclAsType(consol::ResultOrganizer2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_z6jEk19xEey5t-mahoHmrg" type="_gU40UPGEEeOmsLWmq5fnqQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z6jElF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KxuDY33sEeyivuDeOiJBMg" type="_gU40UPGEEeOmsLWmq5fnqQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KxuDZH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -35552,60 +35552,60 @@ The Vital Signs Section contains relevant vital signs for the context and use ca
 Vital signs are represented in the same way as other results, but are aggregated into their own section to follow clinical conventions.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_z6jrol9xEey5t-mahoHmrg" name="VitalSignsSectionEntriesOptionalTemplateId" constrainedElement="_D3010ALzEeSM0Jd2D1FgKw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z6jro19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KxuqcH3sEeyivuDeOiJBMg" name="VitalSignsSectionEntriesOptionalTemplateId" constrainedElement="_D3010ALzEeSM0Jd2D1FgKw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KxuqcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.4.1' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z6k5wF9xEey5t-mahoHmrg" name="VitalSignsSection2NullFlavor" constrainedElement="_D3010ALzEeSM0Jd2D1FgKw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z6k5wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KxvRgH3sEeyivuDeOiJBMg" name="VitalSignsSection2NullFlavor" constrainedElement="_D3010ALzEeSM0Jd2D1FgKw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KxvRgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('nullFlavor')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z6n9EF9xEey5t-mahoHmrg" name="VitalSignsSectionEntriesOptionalCodeP" constrainedElement="_D3010ALzEeSM0Jd2D1FgKw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z6n9EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KxxtwH3sEeyivuDeOiJBMg" name="VitalSignsSectionEntriesOptionalCodeP" constrainedElement="_D3010ALzEeSM0Jd2D1FgKw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KxxtwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z6mH4F9xEey5t-mahoHmrg" name="VitalSignsSectionEntriesOptionalCode" constrainedElement="_D3010ALzEeSM0Jd2D1FgKw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z6mH4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KxwfoH3sEeyivuDeOiJBMg" name="VitalSignsSectionEntriesOptionalCode" constrainedElement="_D3010ALzEeSM0Jd2D1FgKw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KxwfoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '8716-3' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z6pLMF9xEey5t-mahoHmrg" name="VitalSignsSection2Title" constrainedElement="_D3010ALzEeSM0Jd2D1FgKw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z6pLMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kxzi8H3sEeyivuDeOiJBMg" name="VitalSignsSection2Title" constrainedElement="_D3010ALzEeSM0Jd2D1FgKw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kxzi8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z6rAYF9xEey5t-mahoHmrg" name="VitalSignsSection2Text" constrainedElement="_D3010ALzEeSM0Jd2D1FgKw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z6rAYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Kx0xEH3sEeyivuDeOiJBMg" name="VitalSignsSection2Text" constrainedElement="_D3010ALzEeSM0Jd2D1FgKw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Kx0xEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_z7Mk0F9xEey5t-mahoHmrg" name="VitalSignsSectionEntriesOptionalVitalSignsOrganizer" constrainedElement="_D3010ALzEeSM0Jd2D1FgKw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_z7Mk0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_KyPAwH3sEeyivuDeOiJBMg" name="VitalSignsSectionEntriesOptionalVitalSignsOrganizer" constrainedElement="_D3010ALzEeSM0Jd2D1FgKw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_KyPAwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.organizer.oclIsUndefined() and entry.organizer.oclIsKindOf(consol::VitalSignsOrganizer2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_D33SEALzEeSM0Jd2D1FgKw" general="_8LkzYAFTEeSmasYc71ZgMQ"/>
-      <ownedOperation xmi:id="_z7Mk0l9xEey5t-mahoHmrg" name="getConsolVitalSignsOrganizer2s" bodyCondition="_z7Mk1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_z7Mk1V9xEey5t-mahoHmrg" name="body" constrainedElement="_z7Mk0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_z7Mk1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_KyPn0H3sEeyivuDeOiJBMg" name="getConsolVitalSignsOrganizer2s" bodyCondition="_KyPn033sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_KyPn033sEeyivuDeOiJBMg" name="body" constrainedElement="_KyPn0H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_KyPn1H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::VitalSignsOrganizer2)).oclAsType(consol::VitalSignsOrganizer2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_z7Mk019xEey5t-mahoHmrg" type="_dDupoPV2EeONioZkBKP8eQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z7Mk1F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_KyPn0X3sEeyivuDeOiJBMg" type="_dDupoPV2EeONioZkBKP8eQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KyPn0n3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -35642,612 +35642,612 @@ A Consultation Note includes the reason for the referral, history of present ill
           <body>(self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2)) and  self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))) xor self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0FFgoF9xEey5t-mahoHmrg" name="USRealmHeader2TemplateId" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0FFgoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_K65NgH3sEeyivuDeOiJBMg" name="USRealmHeader2TemplateId" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_K65NgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.4' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0FlP4F9xEey5t-mahoHmrg" name="ConsultationNote2CodeP" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0FlP4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_K7Y8wH3sEeyivuDeOiJBMg" name="ConsultationNote2CodeP" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_K7Y8wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0FHV0F9xEey5t-mahoHmrg" name="ConsultationNote2Code" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0FHV0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_K67CsH3sEeyivuDeOiJBMg" name="ConsultationNote2Code" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_K67CsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '11488-4' or value.code = '34100-8' or value.code = '34104-0' or value.code = '51845-6' or value.code = '51853-0' or value.code = '51846-4' or value.code = '34101-6' or value.code = '34749-2' or value.code = '34102-4' or value.code = '34099-2' or value.code = '34756-7' or value.code = '34758-3' or value.code = '34760-9' or value.code = '34879-7' or value.code = '34761-7' or value.code = '34764-1' or value.code = '34771-6' or value.code = '34776-5' or value.code = '34777-3' or value.code = '34779-9' or value.code = '34781-5' or value.code = '34783-1' or value.code = '34785-6' or value.code = '34795-5' or value.code = '34797-1' or value.code = '34798-9' or value.code = '34800-3' or value.code = '34803-7' or value.code = '34855-7' or value.code = '34805-2' or value.code = '34807-8' or value.code = '34810-2' or value.code = '34812-8' or value.code = '34814-4' or value.code = '34816-9' or value.code = '34820-1' or value.code = '34822-7' or value.code = '34824-3' or value.code = '34826-8' or value.code = '34828-4' or value.code = '34788-0' or value.code = '34791-4' or value.code = '34103-2' or value.code = '34831-8' or value.code = '34833-4' or value.code = '34835-9' or value.code = '34837-5' or value.code = '34839-1' or value.code = '34841-7' or value.code = '34845-8' or value.code = '34847-4' or value.code = '34849-0' or value.code = '34851-6' or value.code = '34853-2'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0G4QYF9xEey5t-mahoHmrg" name="ConsultationNote2Participant" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0G4QYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_K8kogH3sEeyivuDeOiJBMg" name="ConsultationNote2Participant" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_K8kogX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->select(participant : cda::Participant1 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant1))->select(typeCode = vocab::ParticipationType::CALLBCK)->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0I5CkF9xEey5t-mahoHmrg" name="ConsultationNote2InFulfillmentOf" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0I5CkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_K-cQwH3sEeyivuDeOiJBMg" name="ConsultationNote2InFulfillmentOf" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_K-cQwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->exists(inFulfillmentOf : cda::InFulfillmentOf | not inFulfillmentOf.oclIsUndefined() and inFulfillmentOf.oclIsKindOf(cda::InFulfillmentOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0J5vMF9xEey5t-mahoHmrg" name="ConsultationNote2ComponentOf" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0J5vMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_K_VBkH3sEeyivuDeOiJBMg" name="ConsultationNote2ComponentOf" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_K_VBkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->one(componentOf : cda::Component1 | not componentOf.oclIsUndefined() and componentOf.oclIsKindOf(cda::Component1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0M1ucF9xEey5t-mahoHmrg" name="ConsultationNote2AssessmentSection" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0M2VgF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LB6bgH3sEeyivuDeOiJBMg" name="ConsultationNote2AssessmentSection" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LB6bgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0NUPkF9xEey5t-mahoHmrg" name="ConsultationNote2AssessmentAndPlanSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0NUPkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LCUEIH3sEeyivuDeOiJBMg" name="ConsultationNote2AssessmentAndPlanSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LCUEIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0Nz-0F9xEey5t-mahoHmrg" name="ConsultationNote2PlanOfTreatmentSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0Nz-0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LCu64H3sEeyivuDeOiJBMg" name="ConsultationNote2PlanOfTreatmentSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LCu64X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0ObC0F9xEey5t-mahoHmrg" name="ConsultationNote2ReasonForVisitSection" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0ObC0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LDIjgH3sEeyivuDeOiJBMg" name="ConsultationNote2ReasonForVisitSection" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LDIjgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0O8nQF9xEey5t-mahoHmrg" name="ConsultationNote2HistoryOfPresentIllnessSection" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0O8nQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LDkBUH3sEeyivuDeOiJBMg" name="ConsultationNote2HistoryOfPresentIllnessSection" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LDkBUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0PZ6QF9xEey5t-mahoHmrg" name="ConsultationNote2PhysicalExamSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0PZ6QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LD-4EH3sEeyivuDeOiJBMg" name="ConsultationNote2PhysicalExamSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LD-4EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0P5pgF9xEey5t-mahoHmrg" name="ConsultationNote2AllergiesSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0P5pgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LEYgsH3sEeyivuDeOiJBMg" name="ConsultationNote2AllergiesSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LEYgsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0QXjkF9xEey5t-mahoHmrg" name="ConsultationNote2ChiefComplaintSection" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0QXjkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LE1MoH3sEeyivuDeOiJBMg" name="ConsultationNote2ChiefComplaintSection" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LE1MoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0Q354F9xEey5t-mahoHmrg" name="ConsultationNote2ChiefComplaintAndReasonForVisitSection" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0Q354V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LFSfoH3sEeyivuDeOiJBMg" name="ConsultationNote2ChiefComplaintAndReasonForVisitSection" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LFSfoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0RYQMF9xEey5t-mahoHmrg" name="ConsultationNote2GeneralStatusSection" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0RYQMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LFvLkH3sEeyivuDeOiJBMg" name="ConsultationNote2GeneralStatusSection" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LFvLkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::GeneralStatusSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0R3YYF9xEey5t-mahoHmrg" name="ConsultationNote2HistoryOfPastIllnessSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0R3YYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LGL3gH3sEeyivuDeOiJBMg" name="ConsultationNote2HistoryOfPastIllnessSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LGL3gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0SUrYF9xEey5t-mahoHmrg" name="ConsultationNote2ImmunizationsSectionEntriesOptional2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0SUrYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LGnVUH3sEeyivuDeOiJBMg" name="ConsultationNote2ImmunizationsSectionEntriesOptional2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LGnVUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0SzzkF9xEey5t-mahoHmrg" name="ConsultationNote2MedicationsSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0SzzkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LHBlAH3sEeyivuDeOiJBMg" name="ConsultationNote2MedicationsSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LHBlAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0TRGkF9xEey5t-mahoHmrg" name="ConsultationNote2ProblemSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0TRGkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LHb0sH3sEeyivuDeOiJBMg" name="ConsultationNote2ProblemSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LHb0sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0Txc4F9xEey5t-mahoHmrg" name="ConsultationNote2ProceduresSectionEntriesOptional2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0Txc4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LH2EYH3sEeyivuDeOiJBMg" name="ConsultationNote2ProceduresSectionEntriesOptional2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LH2EYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0UPW8F9xEey5t-mahoHmrg" name="ConsultationNote2ResultsSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0UPW8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LIQUEH3sEeyivuDeOiJBMg" name="ConsultationNote2ResultsSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LIQUEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0UvGMF9xEey5t-mahoHmrg" name="ConsultationNote2SocialHistorySection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0UvGMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LItnEH3sEeyivuDeOiJBMg" name="ConsultationNote2SocialHistorySection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LItnEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0VLyIF9xEey5t-mahoHmrg" name="ConsultationNote2VitalSignsSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0VLyIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LJKTAH3sEeyivuDeOiJBMg" name="ConsultationNote2VitalSignsSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LJKTAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0VtWkF9xEey5t-mahoHmrg" name="ConsultationNote2AdvanceDirectivesSectionEntriesOptional2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0VtWkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LJkisH3sEeyivuDeOiJBMg" name="ConsultationNote2AdvanceDirectivesSectionEntriesOptional2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LJkisX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdvanceDirectivesSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0WLQoF9xEey5t-mahoHmrg" name="ConsultationNote2FunctionalStatusSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0WLQoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LJ_ZcH3sEeyivuDeOiJBMg" name="ConsultationNote2FunctionalStatusSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LJ_ZcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FunctionalStatusSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0Wrm8F9xEey5t-mahoHmrg" name="ConsultationNote2ReviewOfSystemsSection" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0Wrm8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LKZpIH3sEeyivuDeOiJBMg" name="ConsultationNote2ReviewOfSystemsSection" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LKZpIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0XKvIF9xEey5t-mahoHmrg" name="ConsultationNote2MedicalEquipmentSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0XKvIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LKz40H3sEeyivuDeOiJBMg" name="ConsultationNote2MedicalEquipmentSection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LKz40X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicalEquipmentSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0Xp3UF9xEey5t-mahoHmrg" name="ConsultationNote2MentalStatusSection" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0Xp3UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LLRL0H3sEeyivuDeOiJBMg" name="ConsultationNote2MentalStatusSection" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LLRL0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MentalStatusSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0YF8MF9xEey5t-mahoHmrg" name="ConsultationNote2NutritionSection" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0YF8MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LLsCkH3sEeyivuDeOiJBMg" name="ConsultationNote2NutritionSection" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LLsCkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::NutritionSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3G1aYF9xEey5t-mahoHmrg" name="ConsultationNote2FamilyHistorySection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3G1aYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Nl-6wH3sEeyivuDeOiJBMg" name="ConsultationNote2FamilyHistorySection2" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Nl-6wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8SHzgF9xEey5t-mahoHmrg" name="ConsultationNote2ParticipantAssociatedEntityAssociatedPersonName" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8SIakF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sb45wH3sEeyivuDeOiJBMg" name="ConsultationNote2ParticipantAssociatedEntityAssociatedPersonName" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sb45wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null).associatedPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (( not name->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8SIakV9xEey5t-mahoHmrg" name="ConsultationNote2ParticipantAssociatedEntityClassCode" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8SIakl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sb5g0H3sEeyivuDeOiJBMg" name="ConsultationNote2ParticipantAssociatedEntityClassCode" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sb5g0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null)->reject(classCode=vocab::RoleClassAssociative::ASSIGNED)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8SIak19xEey5t-mahoHmrg" name="ConsultationNote2ParticipantAssociatedEntityId" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8SIalF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sb5g0n3sEeyivuDeOiJBMg" name="ConsultationNote2ParticipantAssociatedEntityId" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sb5g033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8SJBoF9xEey5t-mahoHmrg" name="ConsultationNote2ParticipantAssociatedEntityAddr" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8SJBoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sb5g1H3sEeyivuDeOiJBMg" name="ConsultationNote2ParticipantAssociatedEntityAddr" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sb5g1X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null)->reject((addr->isEmpty() or addr->exists(element | element.isNullFlavorUndefined())) implies (not addr->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8SJBol9xEey5t-mahoHmrg" name="ConsultationNote2ParticipantAssociatedEntityTelecom" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8SJBo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sb6H4H3sEeyivuDeOiJBMg" name="ConsultationNote2ParticipantAssociatedEntityTelecom" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sb6H4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (( not telecom->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8SJosF9xEey5t-mahoHmrg" name="ConsultationNote2ParticipantAssociatedEntityAssociatedPerson" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8SJosV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sb6H4n3sEeyivuDeOiJBMg" name="ConsultationNote2ParticipantAssociatedEntityAssociatedPerson" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sb6H433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null)->reject(associatedPerson->one(associatedPerson : cda::Person | not associatedPerson.oclIsUndefined() and associatedPerson.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8SJosl9xEey5t-mahoHmrg" name="ConsultationNote2ParticipantAssociatedEntityScopingOrganization" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8SJos19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sb6u8H3sEeyivuDeOiJBMg" name="ConsultationNote2ParticipantAssociatedEntityScopingOrganization" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sb6u8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::CALLBCK).associatedEntity->excluding(null)->reject(scopingOrganization->one(scopingOrganization : cda::Organization | not scopingOrganization.oclIsUndefined() and scopingOrganization.oclIsKindOf(rim::Entity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8SJotF9xEey5t-mahoHmrg" name="ConsultationNote2ParticipantTypeCode" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8SJotV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sb6u8n3sEeyivuDeOiJBMg" name="ConsultationNote2ParticipantTypeCode" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sb6u833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::CALLBCK)->select(typeCode = vocab::ParticipationType::CALLBCK)->reject(typeCode=vocab::ParticipationType::CALLBCK)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8SKPwF9xEey5t-mahoHmrg" name="ConsultationNote2ParticipantAssociatedEntity" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8SKPwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sb7WAH3sEeyivuDeOiJBMg" name="ConsultationNote2ParticipantAssociatedEntity" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sb7WAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::CALLBCK)->select(typeCode = vocab::ParticipationType::CALLBCK)->reject(associatedEntity->one(associatedEntity : cda::AssociatedEntity | not associatedEntity.oclIsUndefined() and associatedEntity.oclIsKindOf(cda::AssociatedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8TK8YF9xEey5t-mahoHmrg" name="ConsultationNote2InFulfillmentOfOrderId" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8TK8YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sc5mYH3sEeyivuDeOiJBMg" name="ConsultationNote2InFulfillmentOfOrderId" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sc5mYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->excluding(null).order->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8TLjcF9xEey5t-mahoHmrg" name="ConsultationNote2InFulfillmentOfOrder" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8TLjcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sc5mYn3sEeyivuDeOiJBMg" name="ConsultationNote2InFulfillmentOfOrder" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sc5mY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->excluding(null)->reject(order->one(order : cda::Order | not order.oclIsUndefined() and order.oclIsKindOf(cda::Order)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8UMQEF9xEey5t-mahoHmrg" name="ConsultationNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheDayIVLTS" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8UMQEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sdy-QH3sEeyivuDeOiJBMg" name="ConsultationNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheDayIVLTS" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sdy-QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ((not value.oclIsUndefined() implies value.size() >= 8) and ((not low.value.oclIsUndefined() and low.isNullFlavorUndefined() implies low.value.size() >= 8) and (not high.value.oclIsUndefined() and high.isNullFlavorUndefined() implies high.value.size() >= 8))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8UMQEl9xEey5t-mahoHmrg" name="ConsultationNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheMinuteIVLTS" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8UMQE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SdzlUH3sEeyivuDeOiJBMg" name="ConsultationNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheMinuteIVLTS" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SdzlUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ((not value.oclIsUndefined() implies value.size() >= 12) and ((not low.value.oclIsUndefined() and low.isNullFlavorUndefined() implies low.value.size() >= 12) and (not high.value.oclIsUndefined() and high.isNullFlavorUndefined() implies high.value.size() >= 12))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8UM3IF9xEey5t-mahoHmrg" name="ConsultationNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheSecondIVLTS" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8UM3IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SdzlUn3sEeyivuDeOiJBMg" name="ConsultationNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheSecondIVLTS" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SdzlU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ((not value.oclIsUndefined() implies value.size() >= 14) and ((not low.value.oclIsUndefined() and low.isNullFlavorUndefined() implies low.value.size() >= 14) and (not high.value.oclIsUndefined() and high.isNullFlavorUndefined() implies high.value.size() >= 14))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8UM3Il9xEey5t-mahoHmrg" name="ConsultationNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTIfMorePreciseThanDayIncludeTimeZoneOffsetIVLTS" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8UM3I19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SdzlVH3sEeyivuDeOiJBMg" name="ConsultationNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTIfMorePreciseThanDayIncludeTimeZoneOffsetIVLTS" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SdzlVX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject((not value.oclIsUndefined() and value.size() > 8 implies value.size() >= 15) and ((not low.value.oclIsUndefined() and low.value.size() > 8 implies low.value.size() >= 15) and (not high.value.oclIsUndefined() and high.value.size() > 8 implies high.value.size() >= 15)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8UqKIF9xEey5t-mahoHmrg" name="ConsultationNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasPersonOrganizationOrBoth" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8UqKIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SePDIH3sEeyivuDeOiJBMg" name="ConsultationNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasPersonOrganizationOrBoth" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SePDIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).responsibleParty->excluding(null)->reject(not assignedEntity.assignedPerson.oclIsUndefined() or not assignedEntity.representedOrganization->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8UqKIl9xEey5t-mahoHmrg" name="ConsultationNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8UqKI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SePqMH3sEeyivuDeOiJBMg" name="ConsultationNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SePqMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).responsibleParty->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(rim::Role)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8VLHgF9xEey5t-mahoHmrg" name="ConsultationNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityHasPersonOrganizationOrBoth" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8VLHgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ServEH3sEeyivuDeOiJBMg" name="ConsultationNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityHasPersonOrganizationOrBoth" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ServEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).encounterParticipant->excluding(null)->reject(not assignedEntity.assignedPerson.oclIsUndefined() or not assignedEntity.representedOrganization->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8VLHgl9xEey5t-mahoHmrg" name="ConsultationNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntity" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8VLHg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SesWIH3sEeyivuDeOiJBMg" name="ConsultationNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntity" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SesWIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).encounterParticipant->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(rim::Role)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8VLHhF9xEey5t-mahoHmrg" name="ConsultationNote2ComponentOfEncompassingEncounterId" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8VLHhV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SesWIn3sEeyivuDeOiJBMg" name="ConsultationNote2ComponentOfEncompassingEncounterId" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SesWI33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8VLukF9xEey5t-mahoHmrg" name="ConsultationNote2ComponentOfEncompassingEncounterEffectiveTime" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8VLukV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SesWJH3sEeyivuDeOiJBMg" name="ConsultationNote2ComponentOfEncompassingEncounterEffectiveTime" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SesWJX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8VLukl9xEey5t-mahoHmrg" name="ConsultationNote2ComponentOfEncompassingEncounterResponsibleParty" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8VLuk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SesWJn3sEeyivuDeOiJBMg" name="ConsultationNote2ComponentOfEncompassingEncounterResponsibleParty" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SesWJ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(responsibleParty->one(responsibleParty : cda::ResponsibleParty | not responsibleParty.oclIsUndefined() and responsibleParty.oclIsKindOf(cda::ResponsibleParty)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8VLulF9xEey5t-mahoHmrg" name="ConsultationNote2ComponentOfEncompassingEncounterEncounterParticipant" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8VLulV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ses9MH3sEeyivuDeOiJBMg" name="ConsultationNote2ComponentOfEncompassingEncounterEncounterParticipant" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ses9MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(encounterParticipant->exists(encounterParticipant : cda::EncounterParticipant | not encounterParticipant.oclIsUndefined() and encounterParticipant.oclIsKindOf(cda::EncounterParticipant)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8VMVoF9xEey5t-mahoHmrg" name="ConsultationNote2ComponentOfEncompassingEncounter" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8VMVoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ses9Mn3sEeyivuDeOiJBMg" name="ConsultationNote2ComponentOfEncompassingEncounter" constrainedElement="_PkP3oCFmEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ses9M33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null)->reject(encompassingEncounter->one(encompassingEncounter : cda::EncompassingEncounter | not encompassingEncounter.oclIsUndefined() and encompassingEncounter.oclIsKindOf(cda::EncompassingEncounter)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_PkS68CFmEeSt4IEYu7xgbw" general="_dduXkJ5OEeOr4eM3k36wAg"/>
-      <ownedOperation xmi:id="_0M2VgV9xEey5t-mahoHmrg" name="getAssessmentSection" bodyCondition="_0M2VhF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0M2VhF9xEey5t-mahoHmrg" name="body" constrainedElement="_0M2VgV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0M2VhV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LB7CkH3sEeyivuDeOiJBMg" name="getAssessmentSection" bodyCondition="_LB7Ck33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LB7Ck33sEeyivuDeOiJBMg" name="body" constrainedElement="_LB7CkH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LB7ClH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))->asSequence()->any(true).oclAsType(consol::AssessmentSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0M2Vgl9xEey5t-mahoHmrg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0M2Vg19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LB7CkX3sEeyivuDeOiJBMg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LB7Ckn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0NUPkl9xEey5t-mahoHmrg" name="getAssessmentAndPlanSection2" bodyCondition="_0NU2ol9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0NU2ol9xEey5t-mahoHmrg" name="body" constrainedElement="_0NUPkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0NU2o19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LCUrMH3sEeyivuDeOiJBMg" name="getAssessmentAndPlanSection2" bodyCondition="_LCUrM33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LCUrM33sEeyivuDeOiJBMg" name="body" constrainedElement="_LCUrMH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LCUrNH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection2))->asSequence()->any(true).oclAsType(consol::AssessmentAndPlanSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0NU2oF9xEey5t-mahoHmrg" type="_q_8twPvVEeOvZJBdQKQrqQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0NU2oV9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LCUrMX3sEeyivuDeOiJBMg" type="_q_8twPvVEeOvZJBdQKQrqQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LCUrMn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0Nz-0l9xEey5t-mahoHmrg" name="getPlanOfTreatmentSection2" bodyCondition="_0N0l4V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0N0l4V9xEey5t-mahoHmrg" name="body" constrainedElement="_0Nz-0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0N0l4l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LCvh8H3sEeyivuDeOiJBMg" name="getPlanOfTreatmentSection2" bodyCondition="_LCvh833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LCvh833sEeyivuDeOiJBMg" name="body" constrainedElement="_LCvh8H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LCvh9H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2))->asSequence()->any(true).oclAsType(consol::PlanOfTreatmentSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0Nz-019xEey5t-mahoHmrg" type="_bwml0P4yEeO_Yb9cO8w3bA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0N0l4F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LCvh8X3sEeyivuDeOiJBMg" type="_bwml0P4yEeO_Yb9cO8w3bA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LCvh8n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0ObC0l9xEey5t-mahoHmrg" name="getReasonForVisitSection" bodyCondition="_0ObC1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0ObC1V9xEey5t-mahoHmrg" name="body" constrainedElement="_0ObC0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0ObC1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LDIjgn3sEeyivuDeOiJBMg" name="getReasonForVisitSection" bodyCondition="_LDJKkH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LDJKkH3sEeyivuDeOiJBMg" name="body" constrainedElement="_LDIjgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LDJKkX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))->asSequence()->any(true).oclAsType(consol::ReasonForVisitSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0ObC019xEey5t-mahoHmrg" type="_Nm64UCscEeGHF88-qhhUMA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0ObC1F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LDIjg33sEeyivuDeOiJBMg" type="_Nm64UCscEeGHF88-qhhUMA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LDIjhH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0O8nQl9xEey5t-mahoHmrg" name="getHistoryOfPresentIllnessSection" bodyCondition="_0O8nRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0O8nRV9xEey5t-mahoHmrg" name="body" constrainedElement="_0O8nQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0O8nRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LDkoYH3sEeyivuDeOiJBMg" name="getHistoryOfPresentIllnessSection" bodyCondition="_LDkoY33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LDkoY33sEeyivuDeOiJBMg" name="body" constrainedElement="_LDkoYH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LDkoZH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))->asSequence()->any(true).oclAsType(consol::HistoryOfPresentIllnessSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0O8nQ19xEey5t-mahoHmrg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0O8nRF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LDkoYX3sEeyivuDeOiJBMg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LDkoYn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0PZ6Ql9xEey5t-mahoHmrg" name="getPhysicalExamSection2" bodyCondition="_0PZ6RV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0PZ6RV9xEey5t-mahoHmrg" name="body" constrainedElement="_0PZ6Ql9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0PZ6Rl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LD-4En3sEeyivuDeOiJBMg" name="getPhysicalExamSection2" bodyCondition="_LD-4FX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LD-4FX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LD-4En3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LD-4Fn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection2))->asSequence()->any(true).oclAsType(consol::PhysicalExamSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0PZ6Q19xEey5t-mahoHmrg" type="_-nZiYP4uEeObaveuCI77uA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0PZ6RF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LD-4E33sEeyivuDeOiJBMg" type="_-nZiYP4uEeObaveuCI77uA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LD-4FH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0P6QkF9xEey5t-mahoHmrg" name="getAllergiesSection2" bodyCondition="_0P6Qk19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0P6Qk19xEey5t-mahoHmrg" name="body" constrainedElement="_0P6QkF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0P6QlF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LEYgsn3sEeyivuDeOiJBMg" name="getAllergiesSection2" bodyCondition="_LEYgtX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LEYgtX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LEYgsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LEYgtn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSection2))->asSequence()->any(true).oclAsType(consol::AllergiesSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0P6QkV9xEey5t-mahoHmrg" type="_EONPMAInEeSr1aKUYorURA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0P6Qkl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LEYgs33sEeyivuDeOiJBMg" type="_EONPMAInEeSr1aKUYorURA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LEYgtH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0QYKoF9xEey5t-mahoHmrg" name="getChiefComplaintSection" bodyCondition="_0QYKo19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0QYKo19xEey5t-mahoHmrg" name="body" constrainedElement="_0QYKoF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0QYKpF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LE1zsH3sEeyivuDeOiJBMg" name="getChiefComplaintSection" bodyCondition="_LE1zs33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LE1zs33sEeyivuDeOiJBMg" name="body" constrainedElement="_LE1zsH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LE1ztH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))->asSequence()->any(true).oclAsType(consol::ChiefComplaintSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0QYKoV9xEey5t-mahoHmrg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0QYKol9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LE1zsX3sEeyivuDeOiJBMg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LE1zsn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0Q354l9xEey5t-mahoHmrg" name="getChiefComplaintAndReasonForVisitSection" bodyCondition="_0Q355V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0Q355V9xEey5t-mahoHmrg" name="body" constrainedElement="_0Q354l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0Q4g8F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LFSfon3sEeyivuDeOiJBMg" name="getChiefComplaintAndReasonForVisitSection" bodyCondition="_LFTGsn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LFTGsn3sEeyivuDeOiJBMg" name="body" constrainedElement="_LFSfon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LFTGs33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))->asSequence()->any(true).oclAsType(consol::ChiefComplaintAndReasonForVisitSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0Q35419xEey5t-mahoHmrg" type="_oI7CQCsaEeGHF88-qhhUMA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0Q355F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LFTGsH3sEeyivuDeOiJBMg" type="_oI7CQCsaEeGHF88-qhhUMA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LFTGsX3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0RYQMl9xEey5t-mahoHmrg" name="getGeneralStatusSection" bodyCondition="_0RYQNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0RYQNV9xEey5t-mahoHmrg" name="body" constrainedElement="_0RYQMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0RYQNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LFvLkn3sEeyivuDeOiJBMg" name="getGeneralStatusSection" bodyCondition="_LFvLlX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LFvLlX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LFvLkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LFvLln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::GeneralStatusSection))->asSequence()->any(true).oclAsType(consol::GeneralStatusSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0RYQM19xEey5t-mahoHmrg" type="_2Pxt6xSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0RYQNF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LFvLk33sEeyivuDeOiJBMg" type="_2Pxt6xSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LFvLlH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0R3YYl9xEey5t-mahoHmrg" name="getHistoryOfPastIllnessSection2" bodyCondition="_0R3YZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0R3YZV9xEey5t-mahoHmrg" name="body" constrainedElement="_0R3YYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0R3YZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LGL3gn3sEeyivuDeOiJBMg" name="getHistoryOfPastIllnessSection2" bodyCondition="_LGL3hX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LGL3hX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LGL3gn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LGL3hn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection2))->asSequence()->any(true).oclAsType(consol::HistoryOfPastIllnessSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0R3YY19xEey5t-mahoHmrg" type="_sZlggPyhEeOC19UEcu7MOw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0R3YZF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LGL3g33sEeyivuDeOiJBMg" type="_sZlggPyhEeOC19UEcu7MOw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LGL3hH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0SUrYl9xEey5t-mahoHmrg" name="getImmunizationsSectionEntriesOptional2" bodyCondition="_0SUrZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0SUrZV9xEey5t-mahoHmrg" name="body" constrainedElement="_0SUrYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0SUrZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LGnVUn3sEeyivuDeOiJBMg" name="getImmunizationsSectionEntriesOptional2" bodyCondition="_LGn8Yn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LGn8Yn3sEeyivuDeOiJBMg" name="body" constrainedElement="_LGnVUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LGn8Y33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::ImmunizationsSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0SUrY19xEey5t-mahoHmrg" type="_kdQhIPy3EeO1SvUcmWeLDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0SUrZF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LGn8YH3sEeyivuDeOiJBMg" type="_kdQhIPy3EeO1SvUcmWeLDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LGn8YX3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0S0aoF9xEey5t-mahoHmrg" name="getMedicationsSection2" bodyCondition="_0S0ao19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0S0ao19xEey5t-mahoHmrg" name="body" constrainedElement="_0S0aoF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0S0apF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LHBlAn3sEeyivuDeOiJBMg" name="getMedicationsSection2" bodyCondition="_LHBlBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LHBlBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LHBlAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LHBlBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSection2))->asSequence()->any(true).oclAsType(consol::MedicationsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0S0aoV9xEey5t-mahoHmrg" type="_P2mp4ALQEeS0YMHMf4rRtQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0S0aol9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LHBlA33sEeyivuDeOiJBMg" type="_P2mp4ALQEeS0YMHMf4rRtQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LHBlBH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0TRGkl9xEey5t-mahoHmrg" name="getProblemSection2" bodyCondition="_0TRGlV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0TRGlV9xEey5t-mahoHmrg" name="body" constrainedElement="_0TRGkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0TRGll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LHb0sn3sEeyivuDeOiJBMg" name="getProblemSection2" bodyCondition="_LHb0tX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LHb0tX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LHb0sn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LHb0tn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSection2))->asSequence()->any(true).oclAsType(consol::ProblemSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0TRGk19xEey5t-mahoHmrg" type="_IXrA4ALVEeSyydFGYJajGA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0TRGlF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LHb0s33sEeyivuDeOiJBMg" type="_IXrA4ALVEeSyydFGYJajGA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LHb0tH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0Txc4l9xEey5t-mahoHmrg" name="getProceduresSectionEntriesOptional2" bodyCondition="_0Txc5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0Txc5V9xEey5t-mahoHmrg" name="body" constrainedElement="_0Txc4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0Txc5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LH2EYn3sEeyivuDeOiJBMg" name="getProceduresSectionEntriesOptional2" bodyCondition="_LH2EZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LH2EZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LH2EYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LH2EZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::ProceduresSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0Txc419xEey5t-mahoHmrg" type="_80dMoAB0EeSLOb2O6vSPzg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0Txc5F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LH2EY33sEeyivuDeOiJBMg" type="_80dMoAB0EeSLOb2O6vSPzg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LH2EZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0UPW8l9xEey5t-mahoHmrg" name="getResultsSection2" bodyCondition="_0UPW9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0UPW9V9xEey5t-mahoHmrg" name="body" constrainedElement="_0UPW8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0UPW9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LIQUEn3sEeyivuDeOiJBMg" name="getResultsSection2" bodyCondition="_LIQUFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LIQUFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LIQUEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LIQUFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSection2))->asSequence()->any(true).oclAsType(consol::ResultsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0UPW819xEey5t-mahoHmrg" type="_bAAhEALtEeSueJWOLw5iaQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0UPW9F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LIQUE33sEeyivuDeOiJBMg" type="_bAAhEALtEeSueJWOLw5iaQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LIQUFH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0UvGMl9xEey5t-mahoHmrg" name="getSocialHistorySection2" bodyCondition="_0UvGNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0UvGNV9xEey5t-mahoHmrg" name="body" constrainedElement="_0UvGMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0UvGNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LItnEn3sEeyivuDeOiJBMg" name="getSocialHistorySection2" bodyCondition="_LItnFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LItnFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LItnEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LItnFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection2))->asSequence()->any(true).oclAsType(consol::SocialHistorySection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0UvGM19xEey5t-mahoHmrg" type="_wLWZMAFHEeSG_MJH-zNFRw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0UvGNF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LItnE33sEeyivuDeOiJBMg" type="_wLWZMAFHEeSG_MJH-zNFRw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LItnFH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0VMZMF9xEey5t-mahoHmrg" name="getVitalSignsSection2" bodyCondition="_0VMZM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0VMZM19xEey5t-mahoHmrg" name="body" constrainedElement="_0VMZMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0VMZNF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LJKTAn3sEeyivuDeOiJBMg" name="getVitalSignsSection2" bodyCondition="_LJKTBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LJKTBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LJKTAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LJKTBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSection2))->asSequence()->any(true).oclAsType(consol::VitalSignsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0VMZMV9xEey5t-mahoHmrg" type="_D3010ALzEeSM0Jd2D1FgKw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0VMZMl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LJKTA33sEeyivuDeOiJBMg" type="_D3010ALzEeSM0Jd2D1FgKw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LJKTBH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0VtWkl9xEey5t-mahoHmrg" name="getAdvanceDirectivesSectionEntriesOptional2" bodyCondition="_0Vt9oV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0Vt9oV9xEey5t-mahoHmrg" name="body" constrainedElement="_0VtWkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0Vt9ol9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LJkisn3sEeyivuDeOiJBMg" name="getAdvanceDirectivesSectionEntriesOptional2" bodyCondition="_LJkitX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LJkitX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LJkisn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LJkitn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdvanceDirectivesSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::AdvanceDirectivesSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0VtWk19xEey5t-mahoHmrg" type="_jsKhYAFXEeSLIY0bHb-fFQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0Vt9oF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LJkis33sEeyivuDeOiJBMg" type="_jsKhYAFXEeSLIY0bHb-fFQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LJkitH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0WLQol9xEey5t-mahoHmrg" name="getFunctionalStatusSection2" bodyCondition="_0WLQpV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0WLQpV9xEey5t-mahoHmrg" name="body" constrainedElement="_0WLQol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0WLQpl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LJ_Zcn3sEeyivuDeOiJBMg" name="getFunctionalStatusSection2" bodyCondition="_LJ_ZdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LJ_ZdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LJ_Zcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LJ_Zdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FunctionalStatusSection2))->asSequence()->any(true).oclAsType(consol::FunctionalStatusSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0WLQo19xEey5t-mahoHmrg" type="_8rMFkPyHEeOozpLKXSm5NA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0WLQpF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LJ_Zc33sEeyivuDeOiJBMg" type="_8rMFkPyHEeOozpLKXSm5NA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LJ_ZdH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0Wrm8l9xEey5t-mahoHmrg" name="getReviewOfSystemsSection" bodyCondition="_0WsOAl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0WsOAl9xEey5t-mahoHmrg" name="body" constrainedElement="_0Wrm8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0WsOA19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LKZpIn3sEeyivuDeOiJBMg" name="getReviewOfSystemsSection" bodyCondition="_LKZpJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LKZpJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LKZpIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LKZpJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))->asSequence()->any(true).oclAsType(consol::ReviewOfSystemsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0WsOAF9xEey5t-mahoHmrg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0WsOAV9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LKZpI33sEeyivuDeOiJBMg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LKZpJH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0XLWMF9xEey5t-mahoHmrg" name="getMedicalEquipmentSection2" bodyCondition="_0XLWM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0XLWM19xEey5t-mahoHmrg" name="body" constrainedElement="_0XLWMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0XLWNF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LK0f4H3sEeyivuDeOiJBMg" name="getMedicalEquipmentSection2" bodyCondition="_LK0f433sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LK0f433sEeyivuDeOiJBMg" name="body" constrainedElement="_LK0f4H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LK0f5H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicalEquipmentSection2))->asSequence()->any(true).oclAsType(consol::MedicalEquipmentSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0XLWMV9xEey5t-mahoHmrg" type="_5OKxwP1bEeO5Hq-yrsJSmg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0XLWMl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LK0f4X3sEeyivuDeOiJBMg" type="_5OKxwP1bEeO5Hq-yrsJSmg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LK0f4n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0Xp3Ul9xEey5t-mahoHmrg" name="getMentalStatusSection" bodyCondition="_0Xp3VV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0Xp3VV9xEey5t-mahoHmrg" name="body" constrainedElement="_0Xp3Ul9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0Xp3Vl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LLRy4H3sEeyivuDeOiJBMg" name="getMentalStatusSection" bodyCondition="_LLRy433sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LLRy433sEeyivuDeOiJBMg" name="body" constrainedElement="_LLRy4H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LLRy5H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MentalStatusSection))->asSequence()->any(true).oclAsType(consol::MentalStatusSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0Xp3U19xEey5t-mahoHmrg" type="_4tfOMJ2CEeORR8_YW0n_jQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0Xp3VF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LLRy4X3sEeyivuDeOiJBMg" type="_4tfOMJ2CEeORR8_YW0n_jQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LLRy4n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0YF8Ml9xEey5t-mahoHmrg" name="getNutritionSection" bodyCondition="_0YF8NV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0YF8NV9xEey5t-mahoHmrg" name="body" constrainedElement="_0YF8Ml9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0YF8Nl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LLsCkn3sEeyivuDeOiJBMg" name="getNutritionSection" bodyCondition="_LLsClX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LLsClX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LLsCkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LLsCln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::NutritionSection))->asSequence()->any(true).oclAsType(consol::NutritionSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0YF8M19xEey5t-mahoHmrg" type="_MlM4IJ2GEeORR8_YW0n_jQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0YF8NF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LLsCk33sEeyivuDeOiJBMg" type="_MlM4IJ2GEeORR8_YW0n_jQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LLsClH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3G1aYl9xEey5t-mahoHmrg" name="getFamilyHistorySection2" bodyCondition="_3G1aZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3G1aZV9xEey5t-mahoHmrg" name="body" constrainedElement="_3G1aYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3G1aZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Nl-6wn3sEeyivuDeOiJBMg" name="getFamilyHistorySection2" bodyCondition="_Nl-6xX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Nl-6xX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Nl-6wn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Nl-6xn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection2))->asSequence()->any(true).oclAsType(consol::FamilyHistorySection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3G1aY19xEey5t-mahoHmrg" type="_NGivoIevEeSBauRYePLghA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3G1aZF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Nl-6w33sEeyivuDeOiJBMg" type="_NGivoIevEeSBauRYePLghA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Nl-6xH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -36264,410 +36264,410 @@ The primary use case for the CCD is to provide a snapshot in time containing the
 More specific use cases, such as a Discharge Summary, Transfer Summary, Referral Note, Consultation Note, or Progress Note, are available as alternative documents in this guide.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_0YGjQF9xEey5t-mahoHmrg" name="USRealmHeader2TemplateId" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0YGjQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LLspoH3sEeyivuDeOiJBMg" name="USRealmHeader2TemplateId" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LLspoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.2' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0YJmkF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2CodeP" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0YJmkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LLvs8H3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2CodeP" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LLvs8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0YHKUF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2Code" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0YHxYF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LLt3wH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2Code" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LLt3wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '34133-9' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0Y1jEF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2Author" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0Y1jEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LMWJ4H3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2Author" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LMWJ4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(cda::Author))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0Z3d0F9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2DocumentationOf" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0Z3d0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LNW2gH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2DocumentationOf" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LNW2gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->one(documentationOf : cda::DocumentationOf | not documentationOf.oclIsUndefined() and documentationOf.oclIsKindOf(cda::DocumentationOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0cXYMF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2AllergiesSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0cXYMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LPoHYH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2AllergiesSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LPoHYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0c3ugF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2MedicationsSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0c3ugV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LQFaYH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2MedicationsSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LQFaYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0dVBgF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2ProblemSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0dVBgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LQitYH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2ProblemSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LQitYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0d1-4F9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2ProceduresSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0d1-4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LRB1kH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2ProceduresSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LRB1kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0effIF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2ResultsSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0effIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LRd6cH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2ResultsSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LRd6cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0e-AQF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2AdvanceDirectivesSectionEntriesOptional2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0e-AQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LR4KIH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2AdvanceDirectivesSectionEntriesOptional2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LR4KIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdvanceDirectivesSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0fdvgF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2EncountersSectionEntriesOptional2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0fdvgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LSTn8H3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2EncountersSectionEntriesOptional2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LSTn8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::EncountersSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0f83sF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2FunctionalStatusSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0f83sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LSt3oH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2FunctionalStatusSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LSuesH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FunctionalStatusSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0gbY0F9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2ImmunizationsSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0gbY0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LTIuYH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2ImmunizationsSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LTIuYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0g7vIF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2MedicalEquipmentSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0g7vIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LTkzQH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2MedicalEquipmentSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LTlaUH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicalEquipmentSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0hcFcF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2PayersSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0hcsgF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LUBfMH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2PayersSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LUBfMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PayersSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0h6mkF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2PlanOfTreatmentSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0h7NoF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LUbu4H3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2PlanOfTreatmentSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LUbu4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0iZuwF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2SocialHistorySection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0iZuwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LU7eIH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2SocialHistorySection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LU7eIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0i3o0F9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2VitalSignsSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0i3o0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LVVt0H3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2VitalSignsSection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LVVt0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0jXYEF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2MentalStatusSection" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0jXYEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LVxLoH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2MentalStatusSection" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LVxLoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MentalStatusSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3HWXwF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2NutritionSection" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3HWXwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NmcNwH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2NutritionSection" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NmcNwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::NutritionSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3H6YcF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2FamilyHistorySection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3H6YcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Nm3rkH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2FamilyHistorySection2" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Nm3rkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8WNCQF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2AuthorAssignedAuthorHasAssignedPersonOrRepresentedOrganization" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8WNCQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SfpYYH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2AuthorAssignedAuthorHasAssignedPersonOrRepresentedOrganization" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SfpYYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject(not assignedPerson.oclIsUndefined() or (not assignedAuthoringDevice.oclIsUndefined() and not representedOrganization.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8WNCQl9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2AuthorAssignedAuthorHasRepresentOrganization" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8WNCQ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SfpYYn3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2AuthorAssignedAuthorHasRepresentOrganization" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SfpYY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null).assignedAuthor->excluding(null)->reject((not representedOrganization.oclIsUndefined() and assignedPerson.oclIsUndefined() and assignedAuthoringDevice.oclIsUndefined()) implies id->exists(id | not id.isNullFlavorUndefined() and id.nullFlavor = vocab::NullFlavor::NA))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8WNCRF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2AuthorAssignedAuthor" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8WNCRV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sfp_cH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2AuthorAssignedAuthor" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sfp_cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->excluding(null)->reject(assignedAuthor->one(assignedAuthor : cda::AssignedAuthor | not assignedAuthor.oclIsUndefined() and assignedAuthor.oclIsKindOf(cda::AssignedAuthor)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8XO9AF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2DocumentationOfServiceEventIVLTSLow" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8XO9AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SgiJMH3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2DocumentationOfServiceEventIVLTSLow" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SgiJMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((low.oclIsUndefined() or low.isNullFlavorUndefined()) implies (not low.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8XO9Al9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2DocumentationOfServiceEventIVLTSHigh" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8XO9A19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SgiJMn3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2DocumentationOfServiceEventIVLTSHigh" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SgiJM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((high.oclIsUndefined() or high.isNullFlavorUndefined()) implies (not high.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8YPpoF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntityHasNationalProviderIdentifier" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8YPpoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ShZE0H3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntityHasNationalProviderIdentifier" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ShZE0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PRF).assignedEntity->excluding(null)->reject((not assignedPerson.oclIsUndefined() and not id->isEmpty()) implies id->exists(id | (id.isNullFlavorDefined() and id.extension->isEmpty() and id.root->isEmpty()) or (id.isNullFlavorDefined() and id.root='2.16.840.1.113883.4.6') or (id.root='2.16.840.1.113883.4.6' and id.extension->size() = 1)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8YPpol9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntityId" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8YPpo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ShZE0n3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntityId" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ShZE033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PRF).assignedEntity->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8YPppF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntityAssignedPerson" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8YPppV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ShZE1H3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntityAssignedPerson" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ShZE1X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PRF).assignedEntity->excluding(null)->reject(assignedPerson->one(assignedPerson : cda::Person | not assignedPerson.oclIsUndefined() and assignedPerson.oclIsKindOf(rim::Entity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8YQQsF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2DocumentationOfServiceEventPerformerTypeCode" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8YQQsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ShZE1n3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2DocumentationOfServiceEventPerformerTypeCode" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ShZE133sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PRF)->select(typeCode = vocab::x_ServiceEventPerformer::PRF)->reject(typeCode=vocab::x_ServiceEventPerformer::PRF)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8YQQsl9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntity" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8YQQs19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ShZr4H3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntity" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ShZr4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PRF)->select(typeCode = vocab::x_ServiceEventPerformer::PRF)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8YQ3wF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2DocumentationOfServiceEventClassCode" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8YQ3wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ShZr4n3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2DocumentationOfServiceEventClassCode" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ShZr433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(isDefined('classCode') and classCode=vocab::ActClassRoot::PCPR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8YQ3wl9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2DocumentationOfServiceEventEffectiveTime" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8YQ3w19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ShZr5H3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2DocumentationOfServiceEventEffectiveTime" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ShZr5X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8YQ3xF9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2DocumentationOfServiceEventPerformer" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8YQ3xV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ShaS8H3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2DocumentationOfServiceEventPerformer" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ShaS8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(performer->select(performer : cda::Performer1 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer1))->select(typeCode = vocab::x_ServiceEventPerformer::PRF)->notEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8YRe0F9xEey5t-mahoHmrg" name="ContinuityOfCareDocument2DocumentationOfServiceEvent" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8YRe0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ShaS8n3sEeyivuDeOiJBMg" name="ContinuityOfCareDocument2DocumentationOfServiceEvent" constrainedElement="_lPMNYCGjEeSt4IEYu7xgbw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ShaS833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null)->reject(serviceEvent->one(serviceEvent : cda::ServiceEvent | not serviceEvent.oclIsUndefined() and serviceEvent.oclIsKindOf(cda::ServiceEvent)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_lPMNYSGjEeSt4IEYu7xgbw" general="_dduXkJ5OEeOr4eM3k36wAg"/>
-      <ownedOperation xmi:id="_0cX_QF9xEey5t-mahoHmrg" name="getAllergiesSection2" bodyCondition="_0cX_Q19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0cX_Q19xEey5t-mahoHmrg" name="body" constrainedElement="_0cX_QF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0cX_RF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LPoucH3sEeyivuDeOiJBMg" name="getAllergiesSection2" bodyCondition="_LPouc33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LPouc33sEeyivuDeOiJBMg" name="body" constrainedElement="_LPoucH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LPoudH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSection2))->asSequence()->any(true).oclAsType(consol::AllergiesSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0cX_QV9xEey5t-mahoHmrg" type="_EONPMAInEeSr1aKUYorURA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0cX_Ql9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LPoucX3sEeyivuDeOiJBMg" type="_EONPMAInEeSr1aKUYorURA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LPoucn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0c3ugl9xEey5t-mahoHmrg" name="getMedicationsSection2" bodyCondition="_0c3uhV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0c3uhV9xEey5t-mahoHmrg" name="body" constrainedElement="_0c3ugl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0c3uhl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LQGBcH3sEeyivuDeOiJBMg" name="getMedicationsSection2" bodyCondition="_LQGBc33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LQGBc33sEeyivuDeOiJBMg" name="body" constrainedElement="_LQGBcH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LQGBdH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSection2))->asSequence()->any(true).oclAsType(consol::MedicationsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0c3ug19xEey5t-mahoHmrg" type="_P2mp4ALQEeS0YMHMf4rRtQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0c3uhF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LQGBcX3sEeyivuDeOiJBMg" type="_P2mp4ALQEeS0YMHMf4rRtQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LQGBcn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0dVBgl9xEey5t-mahoHmrg" name="getProblemSection2" bodyCondition="_0dVBhV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0dVBhV9xEey5t-mahoHmrg" name="body" constrainedElement="_0dVBgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0dVBhl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LQitYn3sEeyivuDeOiJBMg" name="getProblemSection2" bodyCondition="_LQitZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LQitZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LQitYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LQitZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSection2))->asSequence()->any(true).oclAsType(consol::ProblemSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0dVBg19xEey5t-mahoHmrg" type="_IXrA4ALVEeSyydFGYJajGA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0dVBhF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LQitY33sEeyivuDeOiJBMg" type="_IXrA4ALVEeSyydFGYJajGA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LQitZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0d2l8F9xEey5t-mahoHmrg" name="getProceduresSection2" bodyCondition="_0d2l819xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0d2l819xEey5t-mahoHmrg" name="body" constrainedElement="_0d2l8F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0d2l9F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LRB1kn3sEeyivuDeOiJBMg" name="getProceduresSection2" bodyCondition="_LRB1lX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LRB1lX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LRB1kn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LRB1ln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSection2))->asSequence()->any(true).oclAsType(consol::ProceduresSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0d2l8V9xEey5t-mahoHmrg" type="_N6wUUALoEeSBA9s7kRnaEg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0d2l8l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LRB1k33sEeyivuDeOiJBMg" type="_N6wUUALoEeSBA9s7kRnaEg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LRB1lH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0effIl9xEey5t-mahoHmrg" name="getResultsSection2" bodyCondition="_0effJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0effJV9xEey5t-mahoHmrg" name="body" constrainedElement="_0effIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0effJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LRd6cn3sEeyivuDeOiJBMg" name="getResultsSection2" bodyCondition="_LRd6dX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LRd6dX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LRd6cn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LRd6dn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSection2))->asSequence()->any(true).oclAsType(consol::ResultsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0effI19xEey5t-mahoHmrg" type="_bAAhEALtEeSueJWOLw5iaQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0effJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LRd6c33sEeyivuDeOiJBMg" type="_bAAhEALtEeSueJWOLw5iaQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LRd6dH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0e-AQl9xEey5t-mahoHmrg" name="getAdvanceDirectivesSectionEntriesOptional2" bodyCondition="_0e-ARV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0e-ARV9xEey5t-mahoHmrg" name="body" constrainedElement="_0e-AQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0e-ARl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LR4KIn3sEeyivuDeOiJBMg" name="getAdvanceDirectivesSectionEntriesOptional2" bodyCondition="_LR4KJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LR4KJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LR4KIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LR4KJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdvanceDirectivesSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::AdvanceDirectivesSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0e-AQ19xEey5t-mahoHmrg" type="_jsKhYAFXEeSLIY0bHb-fFQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0e-ARF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LR4KI33sEeyivuDeOiJBMg" type="_jsKhYAFXEeSLIY0bHb-fFQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LR4KJH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0fdvgl9xEey5t-mahoHmrg" name="getEncountersSectionEntriesOptional2" bodyCondition="_0feWkl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0feWkl9xEey5t-mahoHmrg" name="body" constrainedElement="_0fdvgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0feWk19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LSUPAH3sEeyivuDeOiJBMg" name="getEncountersSectionEntriesOptional2" bodyCondition="_LSUPA33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LSUPA33sEeyivuDeOiJBMg" name="body" constrainedElement="_LSUPAH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LSUPBH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::EncountersSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::EncountersSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0feWkF9xEey5t-mahoHmrg" type="_kgM0YPvbEeOJwYDYIUCQDg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0feWkV9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LSUPAX3sEeyivuDeOiJBMg" type="_kgM0YPvbEeOJwYDYIUCQDg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LSUPAn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0f83sl9xEey5t-mahoHmrg" name="getFunctionalStatusSection2" bodyCondition="_0f83tV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0f83tV9xEey5t-mahoHmrg" name="body" constrainedElement="_0f83sl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0f83tl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LSuesX3sEeyivuDeOiJBMg" name="getFunctionalStatusSection2" bodyCondition="_LSuetH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LSuetH3sEeyivuDeOiJBMg" name="body" constrainedElement="_LSuesX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LSuetX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FunctionalStatusSection2))->asSequence()->any(true).oclAsType(consol::FunctionalStatusSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0f83s19xEey5t-mahoHmrg" type="_8rMFkPyHEeOozpLKXSm5NA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0f83tF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LSuesn3sEeyivuDeOiJBMg" type="_8rMFkPyHEeOozpLKXSm5NA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LSues33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0gb_4F9xEey5t-mahoHmrg" name="getImmunizationsSection2" bodyCondition="_0gb_419xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0gb_419xEey5t-mahoHmrg" name="body" constrainedElement="_0gb_4F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0gb_5F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LTIuYn3sEeyivuDeOiJBMg" name="getImmunizationsSection2" bodyCondition="_LTIuZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LTIuZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LTIuYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LTIuZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSection2))->asSequence()->any(true).oclAsType(consol::ImmunizationsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0gb_4V9xEey5t-mahoHmrg" type="_14bikALNEeSIPYXg7AgJzw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0gb_4l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LTIuY33sEeyivuDeOiJBMg" type="_14bikALNEeSIPYXg7AgJzw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LTIuZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0g7vIl9xEey5t-mahoHmrg" name="getMedicalEquipmentSection2" bodyCondition="_0g8WMV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0g8WMV9xEey5t-mahoHmrg" name="body" constrainedElement="_0g7vIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0g8WMl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LTlaUX3sEeyivuDeOiJBMg" name="getMedicalEquipmentSection2" bodyCondition="_LTlaVH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LTlaVH3sEeyivuDeOiJBMg" name="body" constrainedElement="_LTlaUX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LTlaVX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicalEquipmentSection2))->asSequence()->any(true).oclAsType(consol::MedicalEquipmentSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0g7vI19xEey5t-mahoHmrg" type="_5OKxwP1bEeO5Hq-yrsJSmg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0g8WMF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LTlaUn3sEeyivuDeOiJBMg" type="_5OKxwP1bEeO5Hq-yrsJSmg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LTlaU33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0hcsgV9xEey5t-mahoHmrg" name="getPayersSection2" bodyCondition="_0hcshF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0hcshF9xEey5t-mahoHmrg" name="body" constrainedElement="_0hcsgV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0hcshV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LUBfMn3sEeyivuDeOiJBMg" name="getPayersSection2" bodyCondition="_LUBfNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LUBfNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LUBfMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LUBfNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PayersSection2))->asSequence()->any(true).oclAsType(consol::PayersSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0hcsgl9xEey5t-mahoHmrg" type="_twgM0P4lEeOzC5ykp-XCaA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0hcsg19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LUBfM33sEeyivuDeOiJBMg" type="_twgM0P4lEeOzC5ykp-XCaA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LUBfNH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0h7NoV9xEey5t-mahoHmrg" name="getPlanOfTreatmentSection2" bodyCondition="_0h7NpF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0h7NpF9xEey5t-mahoHmrg" name="body" constrainedElement="_0h7NoV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0h7NpV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LUbu4n3sEeyivuDeOiJBMg" name="getPlanOfTreatmentSection2" bodyCondition="_LUbu5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LUbu5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_LUbu4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LUbu5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2))->asSequence()->any(true).oclAsType(consol::PlanOfTreatmentSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0h7Nol9xEey5t-mahoHmrg" type="_bwml0P4yEeO_Yb9cO8w3bA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0h7No19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LUbu433sEeyivuDeOiJBMg" type="_bwml0P4yEeO_Yb9cO8w3bA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LUbu5H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0iaV0F9xEey5t-mahoHmrg" name="getSocialHistorySection2" bodyCondition="_0iaV019xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0iaV019xEey5t-mahoHmrg" name="body" constrainedElement="_0iaV0F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0iaV1F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LU7eIn3sEeyivuDeOiJBMg" name="getSocialHistorySection2" bodyCondition="_LU7eJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LU7eJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LU7eIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LU7eJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection2))->asSequence()->any(true).oclAsType(consol::SocialHistorySection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0iaV0V9xEey5t-mahoHmrg" type="_wLWZMAFHEeSG_MJH-zNFRw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0iaV0l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LU7eI33sEeyivuDeOiJBMg" type="_wLWZMAFHEeSG_MJH-zNFRw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LU7eJH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0i3o0l9xEey5t-mahoHmrg" name="getVitalSignsSection2" bodyCondition="_0i4P4F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0i4P4F9xEey5t-mahoHmrg" name="body" constrainedElement="_0i3o0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0i4P4V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LVWU4H3sEeyivuDeOiJBMg" name="getVitalSignsSection2" bodyCondition="_LVWU433sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LVWU433sEeyivuDeOiJBMg" name="body" constrainedElement="_LVWU4H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LVWU5H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSection2))->asSequence()->any(true).oclAsType(consol::VitalSignsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0i3o019xEey5t-mahoHmrg" type="_D3010ALzEeSM0Jd2D1FgKw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0i3o1F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LVWU4X3sEeyivuDeOiJBMg" type="_D3010ALzEeSM0Jd2D1FgKw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LVWU4n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0jX_IF9xEey5t-mahoHmrg" name="getMentalStatusSection" bodyCondition="_0jX_I19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0jX_I19xEey5t-mahoHmrg" name="body" constrainedElement="_0jX_IF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0jX_JF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LVxLon3sEeyivuDeOiJBMg" name="getMentalStatusSection" bodyCondition="_LVxLpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LVxLpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LVxLon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LVxLpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MentalStatusSection))->asSequence()->any(true).oclAsType(consol::MentalStatusSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0jX_IV9xEey5t-mahoHmrg" type="_4tfOMJ2CEeORR8_YW0n_jQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0jX_Il9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LVxLo33sEeyivuDeOiJBMg" type="_4tfOMJ2CEeORR8_YW0n_jQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LVxLpH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3HW-0F9xEey5t-mahoHmrg" name="getNutritionSection" bodyCondition="_3HW-019xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3HW-019xEey5t-mahoHmrg" name="body" constrainedElement="_3HW-0F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3HW-1F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Nmc00H3sEeyivuDeOiJBMg" name="getNutritionSection" bodyCondition="_Nmc0033sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Nmc0033sEeyivuDeOiJBMg" name="body" constrainedElement="_Nmc00H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Nmc01H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::NutritionSection))->asSequence()->any(true).oclAsType(consol::NutritionSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3HW-0V9xEey5t-mahoHmrg" type="_MlM4IJ2GEeORR8_YW0n_jQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3HW-0l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Nmc00X3sEeyivuDeOiJBMg" type="_MlM4IJ2GEeORR8_YW0n_jQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Nmc00n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3H6Ycl9xEey5t-mahoHmrg" name="getFamilyHistorySection2" bodyCondition="_3H6YdV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3H6YdV9xEey5t-mahoHmrg" name="body" constrainedElement="_3H6Ycl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3H6Ydl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Nm4SoH3sEeyivuDeOiJBMg" name="getFamilyHistorySection2" bodyCondition="_Nm4So33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Nm4So33sEeyivuDeOiJBMg" name="body" constrainedElement="_Nm4SoH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Nm4SpH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection2))->asSequence()->any(true).oclAsType(consol::FamilyHistorySection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3H6Yc19xEey5t-mahoHmrg" type="_NGivoIevEeSBauRYePLghA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3H6YdF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Nm4SoX3sEeyivuDeOiJBMg" type="_NGivoIevEeSBauRYePLghA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Nm4Son3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -36675,367 +36675,367 @@ value.code = '34133-9' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <ownedComment xmi:id="_GhvMECJoEeSBLYc2hU6GfA">
         <body>A Diagnostic Imaging Report (DIR) is a document that contains a consulting specialist's interpretation of image data. It conveys the interpretation to the referring (ordering) physician and becomes part of the patient's medical record. It is for use in Radiology, Endoscopy, Cardiology, and other imaging specialties.</body>
       </ownedComment>
-      <ownedRule xmi:id="_0jX_JV9xEey5t-mahoHmrg" name="USRealmHeader2TemplateId" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0jYmMF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LVxysH3sEeyivuDeOiJBMg" name="USRealmHeader2TemplateId" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LVxysX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.5' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0jZ0UF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2Id" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0jabYF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LVzA0H3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2Id" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LVzA0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id.oclIsUndefined() or self.id.isNullFlavorUndefined()) implies (not self.id.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0j9N8F9xEey5t-mahoHmrg" name="DiagnosticImagingReport2CodeP" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0j9N8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LWRh8H3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2CodeP" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LWRh8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0jcQkF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2Code" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0jcQkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LV02AH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2Code" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LV02AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0mYP0F9xEey5t-mahoHmrg" name="DiagnosticImagingReport2InformationRecipient" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0mYP0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LYV-gH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2InformationRecipient" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LYV-gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->exists(informationRecipient : cda::InformationRecipient | not informationRecipient.oclIsUndefined() and informationRecipient.oclIsKindOf(rim::Participation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0m50QF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2Participant" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0m50QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LYxcUH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2Participant" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LYxcUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->one(participant : cda::Participant1 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0odTcF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2InFulfillmentOf" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0odTcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LaJ8YH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2InFulfillmentOf" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LaKjcH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->exists(inFulfillmentOf : cda::InFulfillmentOf | not inFulfillmentOf.oclIsUndefined() and inFulfillmentOf.oclIsKindOf(cda::InFulfillmentOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0pcx8F9xEey5t-mahoHmrg" name="DiagnosticImagingReport2DocumentationOf" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0pcx8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LbAQ8H3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2DocumentationOf" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LbAQ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->one(documentationOf : cda::DocumentationOf | not documentationOf.oclIsUndefined() and documentationOf.oclIsKindOf(cda::DocumentationOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0qc3gF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2RelatedDocument" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0qc3gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Lb0wUH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2RelatedDocument" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Lb1XYH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.relatedDocument->one(relatedDocument : cda::RelatedDocument | not relatedDocument.oclIsUndefined() and relatedDocument.oclIsKindOf(cda::RelatedDocument))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0rcWAF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentOf" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0rcWAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LcsTAH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentOf" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LcsTAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->one(componentOf : cda::Component1 | not componentOf.oclIsUndefined() and componentOf.oclIsKindOf(cda::Component1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0t3-8F9xEey5t-mahoHmrg" name="DiagnosticImagingReport2FindingsSection" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0t3-8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Lezy4H3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2FindingsSection" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Lezy4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FindingsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0ugREF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2DICOMObjectCatalogSection" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0ugREV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LfOCkH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2DICOMObjectCatalogSection" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LfOCkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::DICOMObjectCatalogSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0vDDoF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2Component2" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0vDDoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LfqugH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2Component2" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LfqugX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->one(component : cda::Component2 | not component.oclIsUndefined() and component.oclIsKindOf(cda::Component2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_00HJ0F9xEey5t-mahoHmrg" name="DiagnosticImagingReport2Informant" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_00HJ0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LkWaMH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2Informant" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LkWaMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informant->select(informant : cda::Informant12 | not informant.oclIsUndefined() and informant.oclIsKindOf(rim::Participation))->isEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8ZV10F9xEey5t-mahoHmrg" name="DiagnosticImagingReport2IIRootOIDsMustBeNoMoreThan64Characters" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8ZV10V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SiaYgH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2IIRootOIDsMustBeNoMoreThan64Characters" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SiaYgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->excluding(null)->select(isNullFlavorUndefined())->reject(id.root.size() &lt;= 64)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8ZV10l9xEey5t-mahoHmrg" name="DiagnosticImagingReport2IIRoot" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8ZV1019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SiaYgn3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2IIRoot" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SiaYg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not root.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8a3f0F9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ParticipantAssociatedEntityPersonName" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8a3f0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SjxqcH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ParticipantAssociatedEntityPersonName" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SjxqcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).associatedEntity->excluding(null).associatedPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (name->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8a3f0l9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ParticipantAssociatedEntityAssociatedPerson" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8a3f019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sjxqcn3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ParticipantAssociatedEntityAssociatedPerson" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sjxqc33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null).associatedEntity->excluding(null)->reject(associatedPerson->one(associatedPerson : cda::Person | not associatedPerson.oclIsUndefined() and associatedPerson.oclIsKindOf(cda::Person)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8a4G4F9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ParticipantAssociatedEntity" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8a4G4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SjyRgH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ParticipantAssociatedEntity" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SjyRgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(associatedEntity->one(associatedEntity : cda::AssociatedEntity | not associatedEntity.oclIsUndefined() and associatedEntity.oclIsKindOf(cda::AssociatedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8b5akF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2InFulfillmentOfOrderId" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8b5akV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SkrpYH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2InFulfillmentOfOrderId" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SkrpYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->excluding(null).order->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8b5akl9xEey5t-mahoHmrg" name="DiagnosticImagingReport2InFulfillmentOfOrder" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8b5ak19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SkrpYn3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2InFulfillmentOfOrder" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SkrpY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->excluding(null)->reject(order->one(order : cda::Order | not order.oclIsUndefined() and order.oclIsKindOf(cda::Order)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8dG7gF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2DocumentationOfServiceEventClassCode" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8dG7gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SlhW4H3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2DocumentationOfServiceEventClassCode" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SlhW4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(isDefined('classCode') and classCode=vocab::ActClassRoot::ACT)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8dG7gl9xEey5t-mahoHmrg" name="DiagnosticImagingReport2DocumentationOfServiceEventId" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8dG7g19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SlhW4n3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2DocumentationOfServiceEventId" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SlhW433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8dHikF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2DocumentationOfServiceEventCode" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8dHikV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SlhW5H3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2DocumentationOfServiceEventCode" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SlhW5X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8dHikl9xEey5t-mahoHmrg" name="DiagnosticImagingReport2DocumentationOfServiceEventPhysicianReadingStudyPerformer2" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8dHik19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Slh98H3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2DocumentationOfServiceEventPhysicianReadingStudyPerformer2" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Slh98X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(performer->exists(performer : cda::Performer1 | not performer.oclIsUndefined() and performer.oclIsKindOf(consol::PhysicianReadingStudyPerformer2)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8dIJoF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2DocumentationOfServiceEvent" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8dIJoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Slh98n3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2DocumentationOfServiceEvent" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Slh9833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null)->reject(serviceEvent->one(serviceEvent : cda::ServiceEvent | not serviceEvent.oclIsUndefined() and serviceEvent.oclIsKindOf(cda::ServiceEvent)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8eI2QF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2RelatedDocumentParentDocumentIIOidsLength" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8eI2QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SmaHsH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2RelatedDocumentParentDocumentIIOidsLength" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SmaHsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.relatedDocument->excluding(null).parentDocument->excluding(null).id->excluding(null)->select(isNullFlavorUndefined())->reject(not root.oclIsUndefined() implies root.size() &lt;= 64)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8eJdUF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2RelatedDocumentParentDocumentId" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8eJdUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SmauwH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2RelatedDocumentParentDocumentId" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SmauwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.relatedDocument->excluding(null).parentDocument->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (id->size() =  1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8eJdUl9xEey5t-mahoHmrg" name="DiagnosticImagingReport2RelatedDocumentParentDocument" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8eJdU19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Smauwn3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2RelatedDocumentParentDocument" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Smauw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.relatedDocument->excluding(null)->reject(parentDocument->one(parentDocument : cda::ParentDocument | not parentDocument.oclIsUndefined() and parentDocument.oclIsKindOf(cda::ParentDocument)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8fKJ8F9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheDayIVLTS" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8fKJ8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SnUGoH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheDayIVLTS" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SnUGoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ((not value.oclIsUndefined() implies value.size() >= 8) and ((not low.value.oclIsUndefined() and low.isNullFlavorUndefined() implies low.value.size() >= 8) and (not high.value.oclIsUndefined() and high.isNullFlavorUndefined() implies high.value.size() >= 8))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8fKJ8l9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheMinuteIVLTS" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8fKJ819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SnUGon3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheMinuteIVLTS" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SnUGo33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ((not value.oclIsUndefined() implies value.size() >= 12) and ((not low.value.oclIsUndefined() and low.isNullFlavorUndefined() implies low.value.size() >= 12) and (not high.value.oclIsUndefined() and high.isNullFlavorUndefined() implies high.value.size() >= 12))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8fKJ9F9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheSecondIVLTS" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8fKJ9V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SnUGpH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheSecondIVLTS" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SnUtsH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ((not value.oclIsUndefined() implies value.size() >= 14) and ((not low.value.oclIsUndefined() and low.isNullFlavorUndefined() implies low.value.size() >= 14) and (not high.value.oclIsUndefined() and high.isNullFlavorUndefined() implies high.value.size() >= 14))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8fKxAF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTIfMorePreciseThanDayIncludeTimeZoneOffsetIVLTS" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8fKxAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SnUtsX3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTIfMorePreciseThanDayIncludeTimeZoneOffsetIVLTS" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SnUtsn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject((not value.oclIsUndefined() and value.size() > 8 implies value.size() >= 15) and ((not low.value.oclIsUndefined() and low.value.size() > 8 implies low.value.size() >= 15) and (not high.value.oclIsUndefined() and high.value.size() > 8 implies high.value.size() >= 15)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8gLdoF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasAssignPersonOrRepresentedOrganization" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8gLdoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SoPTsH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasAssignPersonOrRepresentedOrganization" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SoPTsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).responsibleParty->excluding(null).assignedEntity->excluding(null)->reject(assignedPerson->size() = 1 or representedOrganization->size() = 1)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8gMEsF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8gMEsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SoPTsn3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SoPTs33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).responsibleParty->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8gMEsl9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterId" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8gMEs19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SoP6wH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterId" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SoP6wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8gMrwF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterEffectiveTime" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8gMrwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SoP6wn3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterEffectiveTime" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SoP6w33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8gMrwl9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterResponsibleParty" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8gMrw19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SoP6xH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterResponsibleParty" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SoP6xX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(responsibleParty->one(responsibleParty : cda::ResponsibleParty | not responsibleParty.oclIsUndefined() and responsibleParty.oclIsKindOf(cda::ResponsibleParty)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8gNS0F9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterPhysicianofRecordParticipant2" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8gNS0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SoP6xn3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounterPhysicianofRecordParticipant2" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SoP6x33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(encounterParticipant->one(encounterParticipant : cda::EncounterParticipant | not encounterParticipant.oclIsUndefined() and encounterParticipant.oclIsKindOf(consol::PhysicianofRecordParticipant2)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8gNS0l9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounter" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8gNS019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SoQh0H3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentOfEncompassingEncounter" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SoQh0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null)->reject(encompassingEncounter->one(encompassingEncounter : cda::EncompassingEncounter | not encompassingEncounter.oclIsUndefined() and encompassingEncounter.oclIsKindOf(cda::EncompassingEncounter)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8ismIF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSubjectFetusSubjectContext" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8ismIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SqbFAH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSubjectFetusSubjectContext" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SqbFAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).structuredBody->excluding(null).component->excluding(null).section->excluding(null).subject->excluding(null)->reject(relatedSubject->one(relatedSubject : cda::RelatedSubject | not relatedSubject.oclIsUndefined() and relatedSubject.oclIsKindOf(consol::FetusSubjectContext)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8jNjgF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSectionsHaveText" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8jOKkF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sq4YAH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSectionsHaveText" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sq4YAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).structuredBody->excluding(null).component->excluding(null).section->excluding(null)->reject(getAllSections()->forAll(section : cda::Section | not section.text.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8jOKkV9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionCode" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8jOKkl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sq4_EH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionCode" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sq4_EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).structuredBody->excluding(null).component->excluding(null).section->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '1.2.840.10008.2.16.4' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8jOKk19xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionCodeP" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8jOKlF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sq4_En3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionCodeP" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sq4_E33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).structuredBody->excluding(null).component->excluding(null).section->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8jOxoF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionTitle" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8jOxoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sq4_FH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionTitle" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sq4_FX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).structuredBody->excluding(null).component->excluding(null).section->excluding(null)->reject((title.oclIsUndefined() or title.isNullFlavorUndefined()) implies (not title.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8jOxol9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionText" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8jOxo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sq5mIH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionText" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sq5mIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).structuredBody->excluding(null).component->excluding(null).section->excluding(null)->reject(not text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8jOxpF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSubject" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8jPYsF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sq5mIn3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSubject" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sq5mI33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).structuredBody->excluding(null).component->excluding(null).section->excluding(null)->reject(nullFlavor &lt;> vocab::NullFlavor::NI implies subject->exists(subject : cda::Subject | not subject.oclIsUndefined() and subject.oclIsKindOf(cda::Subject)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8jPYsV9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionAuthor" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8jPYsl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sq5mJH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionAuthor" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sq5mJX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).structuredBody->excluding(null).component->excluding(null).section->excluding(null)->reject(nullFlavor &lt;> vocab::NullFlavor::NI implies author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(cda::Author)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8jPYs19xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionProcedureContext" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8jPYtF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sq5mJn3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionProcedureContext" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sq5mJ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).structuredBody->excluding(null).component->excluding(null).section->excluding(null)->reject(nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.act.oclIsUndefined() and entry.act.oclIsKindOf(consol::ProcedureContext)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8jP_wF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionTextObservation" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8jP_wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sq6NMH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionTextObservation" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sq6NMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).structuredBody->excluding(null).component->excluding(null).section->excluding(null)->reject(nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::TextObservation)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8jP_wl9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionCodeObservations" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8jP_w19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sq6NMn3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionCodeObservations" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sq6NM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).structuredBody->excluding(null).component->excluding(null).section->excluding(null)->reject(nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::CodeObservations)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8jP_xF9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionQuantityMeasurementObservation" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8jP_xV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sq6NNH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionQuantityMeasurementObservation" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sq6NNX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).structuredBody->excluding(null).component->excluding(null).section->excluding(null)->reject(nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::QuantityMeasurementObservation)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8jQm0F9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSOPInstanceObservation" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8jQm0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sq60QH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSOPInstanceObservation" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sq60QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).structuredBody->excluding(null).component->excluding(null).section->excluding(null)->reject(nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.observation.oclIsUndefined() and entry.observation.oclIsKindOf(consol::SOPInstanceObservation)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8jQm0l9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3Section" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8jQm019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sq60Qn3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3Section" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sq60Q33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).structuredBody->excluding(null).component->excluding(null)->reject(section->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(cda::Section)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8jRN4F9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8jRN4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sq60RH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentStructuredBodyComponent3" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sq60RX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).structuredBody->excluding(null)->reject(component->exists(component : cda::Component3 | not component.oclIsUndefined() and component.oclIsKindOf(cda::Component3)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8jRN4l9xEey5t-mahoHmrg" name="DiagnosticImagingReport2ComponentStructuredBody" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8jRN419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sq7bUH3sEeyivuDeOiJBMg" name="DiagnosticImagingReport2ComponentStructuredBody" constrainedElement="_4JRRsCJnEeSBLYc2hU6GfA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sq7bUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null)->reject(structuredBody->one(structuredBody : cda::StructuredBody | not structuredBody.oclIsUndefined() and structuredBody.oclIsKindOf(cda::StructuredBody)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_4JRRsSJnEeSBLYc2hU6GfA" general="_dduXkJ5OEeOr4eM3k36wAg"/>
-      <ownedOperation xmi:id="_0t3-8l9xEey5t-mahoHmrg" name="getFindingsSection" bodyCondition="_0t3-9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0t3-9V9xEey5t-mahoHmrg" name="body" constrainedElement="_0t3-8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0t3-9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Le0Z8H3sEeyivuDeOiJBMg" name="getFindingsSection" bodyCondition="_Le0Z833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Le0Z833sEeyivuDeOiJBMg" name="body" constrainedElement="_Le0Z8H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Le0Z9H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FindingsSection))->asSequence()->any(true).oclAsType(consol::FindingsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0t3-819xEey5t-mahoHmrg" type="_ZcC-4DVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0t3-9F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Le0Z8X3sEeyivuDeOiJBMg" type="_ZcC-4DVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Le0Z8n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0ugREl9xEey5t-mahoHmrg" name="getDICOMObjectCatalogSection" bodyCondition="_0ugRFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0ugRFV9xEey5t-mahoHmrg" name="body" constrainedElement="_0ugREl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0ugRFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LfOCkn3sEeyivuDeOiJBMg" name="getDICOMObjectCatalogSection" bodyCondition="_LfOpoX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LfOpoX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LfOCkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LfOpon3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::DICOMObjectCatalogSection))->asSequence()->any(true).oclAsType(consol::DICOMObjectCatalogSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0ugRE19xEey5t-mahoHmrg" type="_WPTWEDVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0ugRFF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LfOCk33sEeyivuDeOiJBMg" type="_WPTWEDVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LfOpoH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -37064,600 +37064,600 @@ The best practice for a Discharge Summary is to include the discharge dispositio
           <body>( self.getAllSections()->exists(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection)) ) implies not ( self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection)) or self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection)) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_00Hw4F9xEey5t-mahoHmrg" name="USRealmHeader2TemplateId" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_00Hw4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LkXBQH3sEeyivuDeOiJBMg" name="USRealmHeader2TemplateId" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LkXBQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.8' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_00qjcF9xEey5t-mahoHmrg" name="DischargeSummary2CodeP" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_00qjcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Lk5z0H3sEeyivuDeOiJBMg" name="DischargeSummary2CodeP" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Lk5z0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_00I_AF9xEey5t-mahoHmrg" name="DischargeSummary2Code" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_00I_AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LkYPYH3sEeyivuDeOiJBMg" name="DischargeSummary2Code" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LkYPYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '18842-5' or value.code = '11490-0' or value.code = '28655-9' or value.code = '29761-4' or value.code = '34745-0' or value.code = '34105-7' or value.code = '34106-5'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_025_IF9xEey5t-mahoHmrg" name="DischargeSummary2Participant" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_025_IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LnCh0H3sEeyivuDeOiJBMg" name="DischargeSummary2Participant" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LnCh0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant1 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_03cKoF9xEey5t-mahoHmrg" name="DischargeSummary2ComponentOf" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_03cKoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LnlUYH3sEeyivuDeOiJBMg" name="DischargeSummary2ComponentOf" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LnlUYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->one(componentOf : cda::Component1 | not componentOf.oclIsUndefined() and componentOf.oclIsKindOf(cda::Component1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_06bNMF9xEey5t-mahoHmrg" name="DischargeSummary2AllergiesSectionEntriesOptional2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_06bNMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LqTRMH3sEeyivuDeOiJBMg" name="DischargeSummary2AllergiesSectionEntriesOptional2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LqTRMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_064gMF9xEey5t-mahoHmrg" name="DischargeSummary2HospitalCourseSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_064gMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LquvAH3sEeyivuDeOiJBMg" name="DischargeSummary2HospitalCourseSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LquvAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalCourseSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_07ZdkF9xEey5t-mahoHmrg" name="DischargeSummary2PlanOfTreatmentSection2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_07ZdkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LrI-sH3sEeyivuDeOiJBMg" name="DischargeSummary2PlanOfTreatmentSection2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LrI-sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_073-sF9xEey5t-mahoHmrg" name="DischargeSummary2ChiefComplaintSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_073-sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Lrj1cH3sEeyivuDeOiJBMg" name="DischargeSummary2ChiefComplaintSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Lrj1cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_08Xt8F9xEey5t-mahoHmrg" name="DischargeSummary2ChiefComplaintAndReasonForVisitSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_08Xt8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Lr_TQH3sEeyivuDeOiJBMg" name="DischargeSummary2ChiefComplaintAndReasonForVisitSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Lr_TQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_081A8F9xEey5t-mahoHmrg" name="DischargeSummary2NutritionSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_081oAF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LsdNUH3sEeyivuDeOiJBMg" name="DischargeSummary2NutritionSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LsdNUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::NutritionSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_09WlYF9xEey5t-mahoHmrg" name="DischargeSummary2FunctionalStatusSection2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_09WlYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ls4rIH3sEeyivuDeOiJBMg" name="DischargeSummary2FunctionalStatusSection2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ls4rIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FunctionalStatusSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_092UoF9xEey5t-mahoHmrg" name="DischargeSummary2HistoryOfPastIllnessSection2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_092UoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LtXMQH3sEeyivuDeOiJBMg" name="DischargeSummary2HistoryOfPastIllnessSection2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LtXMQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0-Wq8F9xEey5t-mahoHmrg" name="DischargeSummary2HistoryOfPresentIllnessSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0-Wq8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LtyDAH3sEeyivuDeOiJBMg" name="DischargeSummary2HistoryOfPresentIllnessSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LtyDAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0_ALMF9xEey5t-mahoHmrg" name="DischargeSummary2HospitalConsultationsSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0_AyQF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LuMSsH3sEeyivuDeOiJBMg" name="DischargeSummary2HospitalConsultationsSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LuM5wH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalConsultationsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0_esUF9xEey5t-mahoHmrg" name="DischargeSummary2HospitalDischargeInstructionsSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0_esUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LumiYH3sEeyivuDeOiJBMg" name="DischargeSummary2HospitalDischargeInstructionsSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LumiYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalDischargeInstructionsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_0_90gF9xEey5t-mahoHmrg" name="DischargeSummary2HospitalDischargePhysicalSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0_90gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LvAyEH3sEeyivuDeOiJBMg" name="DischargeSummary2HospitalDischargePhysicalSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LvAyEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalDischargePhysicalSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1AagcF9xEey5t-mahoHmrg" name="DischargeSummary2HospitalDischargeStudiesSummarySection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1AagcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LvZzoH3sEeyivuDeOiJBMg" name="DischargeSummary2HospitalDischargeStudiesSummarySection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LvaasH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalDischargeStudiesSummarySection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1A3MYF9xEey5t-mahoHmrg" name="DischargeSummary2ImmunizationsSectionEntriesOptional2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1A3MYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Lv1RcH3sEeyivuDeOiJBMg" name="DischargeSummary2ImmunizationsSectionEntriesOptional2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Lv14gH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1BXisF9xEey5t-mahoHmrg" name="DischargeSummary2ProblemSectionEntriesOptional2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1BXisV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LwQIMH3sEeyivuDeOiJBMg" name="DischargeSummary2ProblemSectionEntriesOptional2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LwQIMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1BzAgF9xEey5t-mahoHmrg" name="DischargeSummary2ProceduresSectionEntriesOptional2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1BzAgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LwqX4H3sEeyivuDeOiJBMg" name="DischargeSummary2ProceduresSectionEntriesOptional2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LwqX4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1CSvwF9xEey5t-mahoHmrg" name="DischargeSummary2ReasonForVisitSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1CSvwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LxI5AH3sEeyivuDeOiJBMg" name="DischargeSummary2ReasonForVisitSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LxI5AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1CxQ4F9xEey5t-mahoHmrg" name="DischargeSummary2ReviewOfSystemsSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1CxQ4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LxmzEH3sEeyivuDeOiJBMg" name="DischargeSummary2ReviewOfSystemsSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LxmzEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1DRnMF9xEey5t-mahoHmrg" name="DischargeSummary2SocialHistorySection2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1DRnMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LyC38H3sEeyivuDeOiJBMg" name="DischargeSummary2SocialHistorySection2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LyC38X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1DuTIF9xEey5t-mahoHmrg" name="DischargeSummary2VitalSignsSectionEntriesOptional2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1DuTIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LycgkH3sEeyivuDeOiJBMg" name="DischargeSummary2VitalSignsSectionEntriesOptional2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LydHoH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3K6CEF9xEey5t-mahoHmrg" name="DischargeSummary2DischargeDiagnosisSection2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3K6CEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NpoEoH3sEeyivuDeOiJBMg" name="DischargeSummary2DischargeDiagnosisSection2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NpoEoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::DischargeDiagnosisSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3LXVEF9xEey5t-mahoHmrg" name="DischargeSummary2DischargeMedicationsSectionEntriesOptional2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3LXVEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NqEJgH3sEeyivuDeOiJBMg" name="DischargeSummary2DischargeMedicationsSectionEntriesOptional2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NqEJgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::DischargeMedicationsSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3L4ScF9xEey5t-mahoHmrg" name="DischargeSummary2FamilyHistorySection2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3L45gF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NqfAQH3sEeyivuDeOiJBMg" name="DischargeSummary2FamilyHistorySection2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NqfAQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3MYBsF9xEey5t-mahoHmrg" name="DischargeSummary2AdmissionDiagnosisSection2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3MYBsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Nq53AH3sEeyivuDeOiJBMg" name="DischargeSummary2AdmissionDiagnosisSection2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Nq53AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdmissionDiagnosisSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3M5mIF9xEey5t-mahoHmrg" name="DischargeSummary2AdmissionMedicationsSectionEntriesOptional2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3M5mIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NrVU0H3sEeyivuDeOiJBMg" name="DischargeSummary2AdmissionMedicationsSectionEntriesOptional2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NrVU0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdmissionMedicationsSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3NYHQF9xEey5t-mahoHmrg" name="DischargeSummary2DischargeMedicationsSection2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3NYHQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Nru9cH3sEeyivuDeOiJBMg" name="DischargeSummary2DischargeMedicationsSection2" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Nru9cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::DischargeMedicationsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3N5EoF9xEey5t-mahoHmrg" name="DischargeSummary2DischargeDietSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3N5EoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NsLpYH3sEeyivuDeOiJBMg" name="DischargeSummary2DischargeDietSection" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NsLpYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::DischargeDietSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8j0AcF9xEey5t-mahoHmrg" name="DischargeSummary2ParticipantIfParTypeCodeINDThenAEClassCodeIND" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8j0ngF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SrbKkH3sEeyivuDeOiJBMg" name="DischargeSummary2ParticipantIfParTypeCodeINDThenAEClassCodeIND" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SrbKkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(p : cda::Participant1 | p.typeCode = vocab::ParticipationType::IND and not ( p.associatedEntity.classCode = vocab::RoleClassAssociative::PRS  or p.associatedEntity.classCode = vocab::RoleClassAssociative::NOK or p.associatedEntity.classCode = vocab::RoleClassAssociative::CAREGIVER or p.associatedEntity.classCode = vocab::RoleClassAssociative::AGNT or p.associatedEntity.classCode = vocab::RoleClassAssociative::GUAR or p.associatedEntity.classCode = vocab::RoleClassAssociative::ECON or p.associatedEntity.isNullFlavorDefined() ) or p.associatedEntity.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8k2iQF9xEey5t-mahoHmrg" name="DischargeSummary2ComponentOfEncompassingEncounterIVLTSLow" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8k2iQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SsUicH3sEeyivuDeOiJBMg" name="DischargeSummary2ComponentOfEncompassingEncounterIVLTSLow" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SsUicX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((low.oclIsUndefined() or low.isNullFlavorUndefined()) implies (not low.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8k3JUF9xEey5t-mahoHmrg" name="DischargeSummary2ComponentOfEncompassingEncounterIVLTSHigh" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8k3JUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SsUicn3sEeyivuDeOiJBMg" name="DischargeSummary2ComponentOfEncompassingEncounterIVLTSHigh" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SsUic33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((high.oclIsUndefined() or high.isNullFlavorUndefined()) implies (not high.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8l318F9xEey5t-mahoHmrg" name="DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityAssignedPerson" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8l318V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_StJo4H3sEeyivuDeOiJBMg" name="DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityAssignedPerson" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_StJo4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).encounterParticipant->excluding(null).assignedEntity->excluding(null)->reject(assignedPerson->one(assignedPerson : cda::Person | not assignedPerson.oclIsUndefined() and assignedPerson.oclIsKindOf(rim::Entity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8l4dAF9xEey5t-mahoHmrg" name="DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityRepresentedOrganization" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8l4dAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_StKP8H3sEeyivuDeOiJBMg" name="DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityRepresentedOrganization" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_StKP8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).encounterParticipant->excluding(null).assignedEntity->excluding(null)->reject(representedOrganization->one(representedOrganization : cda::Organization | not representedOrganization.oclIsUndefined() and representedOrganization.oclIsKindOf(rim::Entity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8l4dAl9xEey5t-mahoHmrg" name="DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityHasPersonOrOrganization" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8l4dA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_StKP8n3sEeyivuDeOiJBMg" name="DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityHasPersonOrOrganization" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_StKP833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).encounterParticipant->excluding(null)->reject(not assignedEntity.assignedPerson.oclIsUndefined() or not assignedEntity.representedOrganization->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8l5EEF9xEey5t-mahoHmrg" name="DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntity" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8l5EEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_StKP9H3sEeyivuDeOiJBMg" name="DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntity" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_StKP9X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).encounterParticipant->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8m5wsF9xEey5t-mahoHmrg" name="DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityAssignedPerson" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8m5wsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SuEO4H3sEeyivuDeOiJBMg" name="DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityAssignedPerson" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SuEO4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).responsibleParty->excluding(null).assignedEntity->excluding(null)->reject(assignedPerson->one(assignedPerson : cda::Person | not assignedPerson.oclIsUndefined() and assignedPerson.oclIsKindOf(rim::Entity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8m5wsl9xEey5t-mahoHmrg" name="DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityRepresentedOrganization" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8m5ws19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SuE18H3sEeyivuDeOiJBMg" name="DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityRepresentedOrganization" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SuE18X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).responsibleParty->excluding(null).assignedEntity->excluding(null)->reject(representedOrganization->one(representedOrganization : cda::Organization | not representedOrganization.oclIsUndefined() and representedOrganization.oclIsKindOf(rim::Entity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8m5wtF9xEey5t-mahoHmrg" name="DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasPersonOrOrganization" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8m5wtV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SuE18n3sEeyivuDeOiJBMg" name="DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasPersonOrOrganization" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SuE1833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).responsibleParty->excluding(null)->reject(not assignedEntity.assignedPerson.oclIsUndefined() or not assignedEntity.representedOrganization->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8m6XwF9xEey5t-mahoHmrg" name="DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8m6XwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SuE19H3sEeyivuDeOiJBMg" name="DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SuE19X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).responsibleParty->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8m6Xwl9xEey5t-mahoHmrg" name="DischargeSummary2ComponentOfEncompassingEncounterEffectiveTime" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8m6Xw19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SuFdAH3sEeyivuDeOiJBMg" name="DischargeSummary2ComponentOfEncompassingEncounterEffectiveTime" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SuFdAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8m6XxF9xEey5t-mahoHmrg" name="DischargeSummary2ComponentOfEncompassingEncounterDischargeDispositionCode" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8m6XxV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SuFdAn3sEeyivuDeOiJBMg" name="DischargeSummary2ComponentOfEncompassingEncounterDischargeDispositionCode" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SuFdA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((dischargeDispositionCode.oclIsUndefined() or dischargeDispositionCode.isNullFlavorUndefined()) implies (not dischargeDispositionCode.oclIsUndefined() and dischargeDispositionCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = dischargeDispositionCode.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.301.5' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8m6-0F9xEey5t-mahoHmrg" name="DischargeSummary2ComponentOfEncompassingEncounterDischargeDispositionCodeP" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8m6-0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SuFdBH3sEeyivuDeOiJBMg" name="DischargeSummary2ComponentOfEncompassingEncounterDischargeDispositionCodeP" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SuFdBX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((dischargeDispositionCode.oclIsUndefined() or dischargeDispositionCode.isNullFlavorUndefined()) implies (not dischargeDispositionCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8m6-0l9xEey5t-mahoHmrg" name="DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipant" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8m6-019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SuFdBn3sEeyivuDeOiJBMg" name="DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipant" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SuFdB33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(encounterParticipant->one(encounterParticipant : cda::EncounterParticipant | not encounterParticipant.oclIsUndefined() and encounterParticipant.oclIsKindOf(cda::EncounterParticipant)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8m6-1F9xEey5t-mahoHmrg" name="DischargeSummary2ComponentOfEncompassingEncounterResponsibleParty" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8m6-1V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SuGEEH3sEeyivuDeOiJBMg" name="DischargeSummary2ComponentOfEncompassingEncounterResponsibleParty" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SuGEEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(responsibleParty->one(responsibleParty : cda::ResponsibleParty | not responsibleParty.oclIsUndefined() and responsibleParty.oclIsKindOf(cda::ResponsibleParty)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8m7l4F9xEey5t-mahoHmrg" name="DischargeSummary2ComponentOfEncompassingEncounter" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8m7l4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SuGEEn3sEeyivuDeOiJBMg" name="DischargeSummary2ComponentOfEncompassingEncounter" constrainedElement="_89EzQCP5EeS4d9o7u1_H3A">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SuGEE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null)->reject(encompassingEncounter->one(encompassingEncounter : cda::EncompassingEncounter | not encompassingEncounter.oclIsUndefined() and encompassingEncounter.oclIsKindOf(cda::EncompassingEncounter)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_89FaUCP5EeS4d9o7u1_H3A" general="_dduXkJ5OEeOr4eM3k36wAg"/>
-      <ownedOperation xmi:id="_06bNMl9xEey5t-mahoHmrg" name="getAllergiesSectionEntriesOptional2" bodyCondition="_06bNNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_06bNNV9xEey5t-mahoHmrg" name="body" constrainedElement="_06bNMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_06bNNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LqTRMn3sEeyivuDeOiJBMg" name="getAllergiesSectionEntriesOptional2" bodyCondition="_LqTRNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LqTRNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LqTRMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LqTRNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::AllergiesSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_06bNM19xEey5t-mahoHmrg" type="_nWAcMAIjEeSVzfoPSatgpg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_06bNNF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LqTRM33sEeyivuDeOiJBMg" type="_nWAcMAIjEeSVzfoPSatgpg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LqTRNH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_064gMl9xEey5t-mahoHmrg" name="getHospitalCourseSection" bodyCondition="_064gNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_064gNV9xEey5t-mahoHmrg" name="body" constrainedElement="_064gMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_064gNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LquvAn3sEeyivuDeOiJBMg" name="getHospitalCourseSection" bodyCondition="_LquvBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LquvBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LquvAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LquvBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalCourseSection))->asSequence()->any(true).oclAsType(consol::HospitalCourseSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_064gM19xEey5t-mahoHmrg" type="_2RqkOxSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_064gNF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LquvA33sEeyivuDeOiJBMg" type="_2RqkOxSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LquvBH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_07Zdkl9xEey5t-mahoHmrg" name="getPlanOfTreatmentSection2" bodyCondition="_07ZdlV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_07ZdlV9xEey5t-mahoHmrg" name="body" constrainedElement="_07Zdkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_07Zdll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LrI-sn3sEeyivuDeOiJBMg" name="getPlanOfTreatmentSection2" bodyCondition="_LrI-tX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LrI-tX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LrI-sn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LrI-tn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2))->asSequence()->any(true).oclAsType(consol::PlanOfTreatmentSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_07Zdk19xEey5t-mahoHmrg" type="_bwml0P4yEeO_Yb9cO8w3bA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_07ZdlF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LrI-s33sEeyivuDeOiJBMg" type="_bwml0P4yEeO_Yb9cO8w3bA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LrI-tH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_074lwF9xEey5t-mahoHmrg" name="getChiefComplaintSection" bodyCondition="_074lw19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_074lw19xEey5t-mahoHmrg" name="body" constrainedElement="_074lwF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_074lxF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Lrj1cn3sEeyivuDeOiJBMg" name="getChiefComplaintSection" bodyCondition="_Lrj1dX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Lrj1dX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Lrj1cn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Lrj1dn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))->asSequence()->any(true).oclAsType(consol::ChiefComplaintSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_074lwV9xEey5t-mahoHmrg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_074lwl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Lrj1c33sEeyivuDeOiJBMg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Lrj1dH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_08Xt8l9xEey5t-mahoHmrg" name="getChiefComplaintAndReasonForVisitSection" bodyCondition="_08YVAV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_08YVAV9xEey5t-mahoHmrg" name="body" constrainedElement="_08Xt8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_08YVAl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Lr_TQn3sEeyivuDeOiJBMg" name="getChiefComplaintAndReasonForVisitSection" bodyCondition="_Lr_TRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Lr_TRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Lr_TQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Lr_TRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))->asSequence()->any(true).oclAsType(consol::ChiefComplaintAndReasonForVisitSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_08Xt819xEey5t-mahoHmrg" type="_oI7CQCsaEeGHF88-qhhUMA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_08YVAF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Lr_TQ33sEeyivuDeOiJBMg" type="_oI7CQCsaEeGHF88-qhhUMA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Lr_TRH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_081oAV9xEey5t-mahoHmrg" name="getNutritionSection" bodyCondition="_081oBF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_081oBF9xEey5t-mahoHmrg" name="body" constrainedElement="_081oAV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_081oBV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LsdNUn3sEeyivuDeOiJBMg" name="getNutritionSection" bodyCondition="_LsdNVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LsdNVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LsdNUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LsdNVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::NutritionSection))->asSequence()->any(true).oclAsType(consol::NutritionSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_081oAl9xEey5t-mahoHmrg" type="_MlM4IJ2GEeORR8_YW0n_jQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_081oA19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LsdNU33sEeyivuDeOiJBMg" type="_MlM4IJ2GEeORR8_YW0n_jQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LsdNVH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_09WlYl9xEey5t-mahoHmrg" name="getFunctionalStatusSection2" bodyCondition="_09WlZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_09WlZV9xEey5t-mahoHmrg" name="body" constrainedElement="_09WlYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_09WlZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Ls4rIn3sEeyivuDeOiJBMg" name="getFunctionalStatusSection2" bodyCondition="_Ls4rJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Ls4rJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Ls4rIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ls4rJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FunctionalStatusSection2))->asSequence()->any(true).oclAsType(consol::FunctionalStatusSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_09WlY19xEey5t-mahoHmrg" type="_8rMFkPyHEeOozpLKXSm5NA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_09WlZF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Ls4rI33sEeyivuDeOiJBMg" type="_8rMFkPyHEeOozpLKXSm5NA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ls4rJH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_092Uol9xEey5t-mahoHmrg" name="getHistoryOfPastIllnessSection2" bodyCondition="_092UpV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_092UpV9xEey5t-mahoHmrg" name="body" constrainedElement="_092Uol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_092Upl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LtXMQn3sEeyivuDeOiJBMg" name="getHistoryOfPastIllnessSection2" bodyCondition="_LtXMRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LtXMRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LtXMQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LtXMRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection2))->asSequence()->any(true).oclAsType(consol::HistoryOfPastIllnessSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_092Uo19xEey5t-mahoHmrg" type="_sZlggPyhEeOC19UEcu7MOw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_092UpF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LtXMQ33sEeyivuDeOiJBMg" type="_sZlggPyhEeOC19UEcu7MOw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LtXMRH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0-XSAF9xEey5t-mahoHmrg" name="getHistoryOfPresentIllnessSection" bodyCondition="_0-XSA19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0-XSA19xEey5t-mahoHmrg" name="body" constrainedElement="_0-XSAF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0-XSBF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LtyDAn3sEeyivuDeOiJBMg" name="getHistoryOfPresentIllnessSection" bodyCondition="_LtyDBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LtyDBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LtyDAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LtyDBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))->asSequence()->any(true).oclAsType(consol::HistoryOfPresentIllnessSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0-XSAV9xEey5t-mahoHmrg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0-XSAl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LtyDA33sEeyivuDeOiJBMg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LtyDBH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0_AyQV9xEey5t-mahoHmrg" name="getHospitalConsultationsSection" bodyCondition="_0_AyRF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0_AyRF9xEey5t-mahoHmrg" name="body" constrainedElement="_0_AyQV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0_AyRV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LuM5wX3sEeyivuDeOiJBMg" name="getHospitalConsultationsSection" bodyCondition="_LuM5xH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LuM5xH3sEeyivuDeOiJBMg" name="body" constrainedElement="_LuM5wX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LuM5xX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalConsultationsSection))->asSequence()->any(true).oclAsType(consol::HospitalConsultationsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0_AyQl9xEey5t-mahoHmrg" type="_eKFbUDVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0_AyQ19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LuM5wn3sEeyivuDeOiJBMg" type="_eKFbUDVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LuM5w33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0_esUl9xEey5t-mahoHmrg" name="getHospitalDischargeInstructionsSection" bodyCondition="_0_esVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0_esVV9xEey5t-mahoHmrg" name="body" constrainedElement="_0_esUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0_esVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LumiYn3sEeyivuDeOiJBMg" name="getHospitalDischargeInstructionsSection" bodyCondition="_LumiZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LumiZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LumiYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LumiZn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalDischargeInstructionsSection))->asSequence()->any(true).oclAsType(consol::HospitalDischargeInstructionsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0_esU19xEey5t-mahoHmrg" type="_lBergCUMEeGiOPpZVnfEJA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0_esVF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LumiY33sEeyivuDeOiJBMg" type="_lBergCUMEeGiOPpZVnfEJA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LumiZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_0_90gl9xEey5t-mahoHmrg" name="getHospitalDischargePhysicalSection" bodyCondition="_0_90hV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_0_90hV9xEey5t-mahoHmrg" name="body" constrainedElement="_0_90gl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_0_90hl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LvAyEn3sEeyivuDeOiJBMg" name="getHospitalDischargePhysicalSection" bodyCondition="_LvAyFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LvAyFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LvAyEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LvAyFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalDischargePhysicalSection))->asSequence()->any(true).oclAsType(consol::HospitalDischargePhysicalSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_0_90g19xEey5t-mahoHmrg" type="_WikGsCUTEeGiOPpZVnfEJA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0_90hF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LvAyE33sEeyivuDeOiJBMg" type="_WikGsCUTEeGiOPpZVnfEJA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LvAyFH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1Aagcl9xEey5t-mahoHmrg" name="getHospitalDischargeStudiesSummarySection" bodyCondition="_1AagdV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1AagdV9xEey5t-mahoHmrg" name="body" constrainedElement="_1Aagcl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1Aagdl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LvaasX3sEeyivuDeOiJBMg" name="getHospitalDischargeStudiesSummarySection" bodyCondition="_LvaatH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LvaatH3sEeyivuDeOiJBMg" name="body" constrainedElement="_LvaasX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LvaatX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HospitalDischargeStudiesSummarySection))->asSequence()->any(true).oclAsType(consol::HospitalDischargeStudiesSummarySection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1Aagc19xEey5t-mahoHmrg" type="_38AXoCUTEeGiOPpZVnfEJA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1AagdF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Lvaasn3sEeyivuDeOiJBMg" type="_38AXoCUTEeGiOPpZVnfEJA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Lvaas33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1A3MYl9xEey5t-mahoHmrg" name="getImmunizationsSectionEntriesOptional2" bodyCondition="_1A3MZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1A3MZV9xEey5t-mahoHmrg" name="body" constrainedElement="_1A3MYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1A3MZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Lv14gX3sEeyivuDeOiJBMg" name="getImmunizationsSectionEntriesOptional2" bodyCondition="_Lv14hH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Lv14hH3sEeyivuDeOiJBMg" name="body" constrainedElement="_Lv14gX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Lv14hX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::ImmunizationsSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1A3MY19xEey5t-mahoHmrg" type="_kdQhIPy3EeO1SvUcmWeLDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1A3MZF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Lv14gn3sEeyivuDeOiJBMg" type="_kdQhIPy3EeO1SvUcmWeLDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Lv14g33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1BXisl9xEey5t-mahoHmrg" name="getProblemSectionEntriesOptional2" bodyCondition="_1BXitV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1BXitV9xEey5t-mahoHmrg" name="body" constrainedElement="_1BXisl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1BXitl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LwQvQH3sEeyivuDeOiJBMg" name="getProblemSectionEntriesOptional2" bodyCondition="_LwQvQ33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LwQvQ33sEeyivuDeOiJBMg" name="body" constrainedElement="_LwQvQH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LwQvRH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::ProblemSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1BXis19xEey5t-mahoHmrg" type="_ZgLioAFkEeSJ2uHfynwxCw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1BXitF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LwQvQX3sEeyivuDeOiJBMg" type="_ZgLioAFkEeSJ2uHfynwxCw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LwQvQn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1BznkF9xEey5t-mahoHmrg" name="getProceduresSectionEntriesOptional2" bodyCondition="_1Bznk19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1Bznk19xEey5t-mahoHmrg" name="body" constrainedElement="_1BznkF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1BznlF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LwqX4n3sEeyivuDeOiJBMg" name="getProceduresSectionEntriesOptional2" bodyCondition="_LwqX5X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LwqX5X3sEeyivuDeOiJBMg" name="body" constrainedElement="_LwqX4n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LwqX5n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::ProceduresSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1BznkV9xEey5t-mahoHmrg" type="_80dMoAB0EeSLOb2O6vSPzg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1Bznkl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LwqX433sEeyivuDeOiJBMg" type="_80dMoAB0EeSLOb2O6vSPzg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LwqX5H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1CSvwl9xEey5t-mahoHmrg" name="getReasonForVisitSection" bodyCondition="_1CSvxV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1CSvxV9xEey5t-mahoHmrg" name="body" constrainedElement="_1CSvwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1CTW0F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LxJgEH3sEeyivuDeOiJBMg" name="getReasonForVisitSection" bodyCondition="_LxJgE33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LxJgE33sEeyivuDeOiJBMg" name="body" constrainedElement="_LxJgEH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LxJgFH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))->asSequence()->any(true).oclAsType(consol::ReasonForVisitSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1CSvw19xEey5t-mahoHmrg" type="_Nm64UCscEeGHF88-qhhUMA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1CSvxF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LxJgEX3sEeyivuDeOiJBMg" type="_Nm64UCscEeGHF88-qhhUMA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LxJgEn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1CxQ4l9xEey5t-mahoHmrg" name="getReviewOfSystemsSection" bodyCondition="_1Cx38l9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1Cx38l9xEey5t-mahoHmrg" name="body" constrainedElement="_1CxQ4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1Cx3819xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LxmzEn3sEeyivuDeOiJBMg" name="getReviewOfSystemsSection" bodyCondition="_LxmzFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LxmzFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_LxmzEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LxmzFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))->asSequence()->any(true).oclAsType(consol::ReviewOfSystemsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1Cx38F9xEey5t-mahoHmrg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1Cx38V9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LxmzE33sEeyivuDeOiJBMg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LxmzFH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1DRnMl9xEey5t-mahoHmrg" name="getSocialHistorySection2" bodyCondition="_1DRnNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1DRnNV9xEey5t-mahoHmrg" name="body" constrainedElement="_1DRnMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1DRnNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LyDfAH3sEeyivuDeOiJBMg" name="getSocialHistorySection2" bodyCondition="_LyDfA33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LyDfA33sEeyivuDeOiJBMg" name="body" constrainedElement="_LyDfAH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LyDfBH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection2))->asSequence()->any(true).oclAsType(consol::SocialHistorySection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1DRnM19xEey5t-mahoHmrg" type="_wLWZMAFHEeSG_MJH-zNFRw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1DRnNF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LyDfAX3sEeyivuDeOiJBMg" type="_wLWZMAFHEeSG_MJH-zNFRw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LyDfAn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1DuTIl9xEey5t-mahoHmrg" name="getVitalSignsSectionEntriesOptional2" bodyCondition="_1DuTJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1DuTJV9xEey5t-mahoHmrg" name="body" constrainedElement="_1DuTIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1DuTJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_LydHoX3sEeyivuDeOiJBMg" name="getVitalSignsSectionEntriesOptional2" bodyCondition="_LydHpH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_LydHpH3sEeyivuDeOiJBMg" name="body" constrainedElement="_LydHoX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_LydHpX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::VitalSignsSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1DuTI19xEey5t-mahoHmrg" type="_8LkzYAFTEeSmasYc71ZgMQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1DuTJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_LydHon3sEeyivuDeOiJBMg" type="_8LkzYAFTEeSmasYc71ZgMQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LydHo33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3K6CEl9xEey5t-mahoHmrg" name="getDischargeDiagnosisSection2" bodyCondition="_3K6CFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3K6CFV9xEey5t-mahoHmrg" name="body" constrainedElement="_3K6CEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3K6CFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NporsH3sEeyivuDeOiJBMg" name="getDischargeDiagnosisSection2" bodyCondition="_Npors33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Npors33sEeyivuDeOiJBMg" name="body" constrainedElement="_NporsH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NportH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::DischargeDiagnosisSection2))->asSequence()->any(true).oclAsType(consol::DischargeDiagnosisSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3K6CE19xEey5t-mahoHmrg" type="_jfuGYPytEeOmn53IDV99zw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3K6CFF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NporsX3sEeyivuDeOiJBMg" type="_jfuGYPytEeOmn53IDV99zw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Nporsn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3LX8IF9xEey5t-mahoHmrg" name="getDischargeMedicationsSectionEntriesOptional2" bodyCondition="_3LX8I19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3LX8I19xEey5t-mahoHmrg" name="body" constrainedElement="_3LX8IF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3LX8JF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NqEJgn3sEeyivuDeOiJBMg" name="getDischargeMedicationsSectionEntriesOptional2" bodyCondition="_NqEJhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NqEJhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NqEJgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NqEJhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::DischargeMedicationsSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::DischargeMedicationsSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3LX8IV9xEey5t-mahoHmrg" type="_HlfBYPyzEeOfAK77IvEBUw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3LX8Il9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NqEJg33sEeyivuDeOiJBMg" type="_HlfBYPyzEeOfAK77IvEBUw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NqEJhH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3L45gV9xEey5t-mahoHmrg" name="getFamilyHistorySection2" bodyCondition="_3L45hF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3L45hF9xEey5t-mahoHmrg" name="body" constrainedElement="_3L45gV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3L45hV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NqfAQn3sEeyivuDeOiJBMg" name="getFamilyHistorySection2" bodyCondition="_NqfARX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NqfARX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NqfAQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NqfARn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection2))->asSequence()->any(true).oclAsType(consol::FamilyHistorySection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3L45gl9xEey5t-mahoHmrg" type="_NGivoIevEeSBauRYePLghA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3L45g19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NqfAQ33sEeyivuDeOiJBMg" type="_NGivoIevEeSBauRYePLghA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NqfARH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3MYowF9xEey5t-mahoHmrg" name="getAdmissionDiagnosisSection2" bodyCondition="_3MYow19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3MYow19xEey5t-mahoHmrg" name="body" constrainedElement="_3MYowF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3MYoxF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Nq6eEH3sEeyivuDeOiJBMg" name="getAdmissionDiagnosisSection2" bodyCondition="_Nq6eE33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Nq6eE33sEeyivuDeOiJBMg" name="body" constrainedElement="_Nq6eEH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Nq6eFH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdmissionDiagnosisSection2))->asSequence()->any(true).oclAsType(consol::AdmissionDiagnosisSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3MYowV9xEey5t-mahoHmrg" type="_ctJgAPylEeOc0tW1-DpN-Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3MYowl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Nq6eEX3sEeyivuDeOiJBMg" type="_ctJgAPylEeOc0tW1-DpN-Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Nq6eEn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3M5mIl9xEey5t-mahoHmrg" name="getAdmissionMedicationsSectionEntriesOptional2" bodyCondition="_3M5mJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3M5mJV9xEey5t-mahoHmrg" name="body" constrainedElement="_3M5mIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3M5mJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NrV74H3sEeyivuDeOiJBMg" name="getAdmissionMedicationsSectionEntriesOptional2" bodyCondition="_NrV7433sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NrV7433sEeyivuDeOiJBMg" name="body" constrainedElement="_NrV74H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NrV75H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AdmissionMedicationsSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::AdmissionMedicationsSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3M5mI19xEey5t-mahoHmrg" type="_ZLY3MPyqEeOlg_Cnc5bODw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3M5mJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NrV74X3sEeyivuDeOiJBMg" type="_ZLY3MPyqEeOlg_Cnc5bODw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NrV74n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3NYHQl9xEey5t-mahoHmrg" name="getDischargeMedicationsSection2" bodyCondition="_3NYHRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3NYHRV9xEey5t-mahoHmrg" name="body" constrainedElement="_3NYHQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3NYHRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Nru9cn3sEeyivuDeOiJBMg" name="getDischargeMedicationsSection2" bodyCondition="_Nru9dX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Nru9dX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Nru9cn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Nru9dn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::DischargeMedicationsSection2))->asSequence()->any(true).oclAsType(consol::DischargeMedicationsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3NYHQ19xEey5t-mahoHmrg" type="_Jt0moAI0EeSRkrs1G7P_XQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3NYHRF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Nru9c33sEeyivuDeOiJBMg" type="_Jt0moAI0EeSRkrs1G7P_XQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Nru9dH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3N5Eol9xEey5t-mahoHmrg" name="getDischargeDietSection" bodyCondition="_3N5EpV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3N5EpV9xEey5t-mahoHmrg" name="body" constrainedElement="_3N5Eol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3N5Epl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NsLpYn3sEeyivuDeOiJBMg" name="getDischargeDietSection" bodyCondition="_NsMQcX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NsMQcX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NsLpYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NsMQcn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::DischargeDietSection))->asSequence()->any(true).oclAsType(consol::DischargeDietSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3N5Eo19xEey5t-mahoHmrg" type="_2Uz-4xSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3N5EpF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NsLpY33sEeyivuDeOiJBMg" type="_2Uz-4xSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NsMQcH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -37703,502 +37703,502 @@ A History and Physical Examination is required upon hospital admission as well a
           <body>(self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection)) or  self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))) xor self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1EQeoF9xEey5t-mahoHmrg" name="USRealmHeader2TemplateId" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1EQeoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ly4lcH3sEeyivuDeOiJBMg" name="USRealmHeader2TemplateId" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ly4lcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.3' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1Ew08F9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2CodeP" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1Ew08V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_LzXGkH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2CodeP" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_LzXGkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1EST0F9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2Code" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1EST0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ly6aoH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2Code" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ly6aoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '34117-2' or value.code = '11492-6' or value.code = '28626-0' or value.code = '34774-0' or value.code = '34115-6' or value.code = '34116-4' or value.code = '34095-0' or value.code = '34096-8' or value.code = '51849-8' or value.code = '47039-3' or value.code = '34763-3' or value.code = '34094-3' or value.code = '34138-8'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1F6rgF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2InformationRecipient" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1F7SkF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L0ZBUH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2InformationRecipient" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L0ZBUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->exists(informationRecipient : cda::InformationRecipient | not informationRecipient.oclIsUndefined() and informationRecipient.oclIsKindOf(cda::InformationRecipient))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1G8mQF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2Participant" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1G8mQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L1X4wH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2Participant" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L1X4wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant1 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1Hc8kF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2InFulfillmentOf" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1Hc8kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L11y0H3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2InFulfillmentOf" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L11y0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.inFulfillmentOf->exists(inFulfillmentOf : cda::InFulfillmentOf | not inFulfillmentOf.oclIsUndefined() and inFulfillmentOf.oclIsKindOf(rim::ActRelationship))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1H-hAF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ComponentOf" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1H-hAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L2Ts4H3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ComponentOf" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L2Ts4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->one(componentOf : cda::Component1 | not componentOf.oclIsUndefined() and componentOf.oclIsKindOf(cda::Component1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1LV-EF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2AllergiesSectionEntriesOptional2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1LV-EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L5VywH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2AllergiesSectionEntriesOptional2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L5VywX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1L1tUF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2AssessmentSection" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1L1tUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L5wCcH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2AssessmentSection" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L5wCcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1MUOcF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2PlanOfTreatmentSection2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1MUOcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L6PxsH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2PlanOfTreatmentSection2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L6PxsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1MxhcF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2AssessmentAndPlanSection2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1MxhcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L6sdoH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2AssessmentAndPlanSection2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L6sdoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1NPbgF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ChiefComplaintSection" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1NPbgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L7GtUH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ChiefComplaintSection" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L7GtUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1NrgYF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ChiefComplaintAndReasonForVisitSection" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1NrgYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L7g9AH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ChiefComplaintAndReasonForVisitSection" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L7g9AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1OTygF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2GeneralStatusSection" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1OTygV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L7_eIH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2GeneralStatusSection" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L7_eIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::GeneralStatusSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1O3MIF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2HistoryOfPastIllnessSection2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1O3MIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L8cKEH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2HistoryOfPastIllnessSection2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L8cKEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1PXicF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2HistoryOfPresentIllnessSection" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1PXicV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L86EIH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2HistoryOfPresentIllnessSection" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L86EIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1P34wF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ImmunizationsSectionEntriesOptional2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1P34wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L9ZMUH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ImmunizationsSectionEntriesOptional2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L9ZMUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1QYPEF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2InstructionsSection2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1QYPEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L914QH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2InstructionsSection2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L914QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::InstructionsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1Q3-UF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2MedicationsSectionEntriesOptional2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1Q3-UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L-QvAH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2MedicationsSectionEntriesOptional2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L-QvAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1RXtkF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2PhysicalExamSection2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1RXtkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L-rlwH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2PhysicalExamSection2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L-rlwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1R4D4F9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ProblemSectionEntriesOptional2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1R4D4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L_GcgH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ProblemSectionEntriesOptional2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L_GcgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1SV98F9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ProceduresSectionEntriesOptional2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1SV98V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L_gsMH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ProceduresSectionEntriesOptional2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L_hTQH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1S1GIF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ReasonForVisitSection" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1S1GIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_L_8KAH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ReasonForVisitSection" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_L_8KAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1TRyEF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ResultsSectionEntriesOptional2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1TRyEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MAVyoH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ResultsSectionEntriesOptional2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MAVyoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1TxhUF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ReviewOfSystemsSection" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1TxhUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MAx3gH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ReviewOfSystemsSection" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MAx3gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1UQCcF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2SocialHistorySection2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1UQCcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MBPKgH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2SocialHistorySection2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MBPKgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1UvxsF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2VitalSignsSectionEntriesOptional2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1UvxsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MBqBQH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2VitalSignsSectionEntriesOptional2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MBqBQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3OYz4F9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2FamilyHistorySection2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3OYz4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NspjcH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2FamilyHistorySection2" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NspjcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8neYcF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2InformationRecipientIntendedRecipient" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8neYcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SuiwAH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2InformationRecipientIntendedRecipient" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SuiwAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.informationRecipient->excluding(null)->reject(intendedRecipient->one(intendedRecipient : cda::IntendedRecipient | not intendedRecipient.oclIsUndefined() and intendedRecipient.oclIsKindOf(rim::Role)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8n-uwF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ParticipantIfParTypeCodeINDThenAEClassCodeIND" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8n-uwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Su9mwH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ParticipantIfParTypeCodeINDThenAEClassCodeIND" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Su9mwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->reject(p : cda::Participant1 | p.typeCode = vocab::ParticipationType::IND and not ( p.associatedEntity.classCode = vocab::RoleClassAssociative::PRS  or p.associatedEntity.classCode = vocab::RoleClassAssociative::NOK or p.associatedEntity.classCode = vocab::RoleClassAssociative::CAREGIVER or p.associatedEntity.classCode = vocab::RoleClassAssociative::AGNT or p.associatedEntity.classCode = vocab::RoleClassAssociative::GUAR or p.associatedEntity.classCode = vocab::RoleClassAssociative::ECON or p.associatedEntity.isNullFlavorDefined() ) or p.associatedEntity.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8o-NQF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheDayIVLTS" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8o-NQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sv2XkH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheDayIVLTS" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sv2XkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ((not value.oclIsUndefined() implies value.size() >= 8) and ((not low.value.oclIsUndefined() and low.isNullFlavorUndefined() implies low.value.size() >= 8) and (not high.value.oclIsUndefined() and high.isNullFlavorUndefined() implies high.value.size() >= 8))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8o-NQl9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheMinuteIVLTS" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8o-NQ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sv2-oH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheMinuteIVLTS" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sv2-oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ((not value.oclIsUndefined() implies value.size() >= 12) and ((not low.value.oclIsUndefined() and low.isNullFlavorUndefined() implies low.value.size() >= 12) and (not high.value.oclIsUndefined() and high.isNullFlavorUndefined() implies high.value.size() >= 12))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8o-0UF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheSecondIVLTS" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8o-0UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sv2-on3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheSecondIVLTS" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sv2-o33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject(isNullFlavorUndefined() implies ((not value.oclIsUndefined() implies value.size() >= 14) and ((not low.value.oclIsUndefined() and low.isNullFlavorUndefined() implies low.value.size() >= 14) and (not high.value.oclIsUndefined() and high.isNullFlavorUndefined() implies high.value.size() >= 14))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8o-0Ul9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTIfMorePreciseThanDayIncludeTimeZoneOffsetIVLTS" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8o-0U19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Sv2-pH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTIfMorePreciseThanDayIncludeTimeZoneOffsetIVLTS" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Sv2-pX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject((not value.oclIsUndefined() and value.size() > 8 implies value.size() >= 15) and ((not low.value.oclIsUndefined() and low.value.size() > 8 implies low.value.size() >= 15) and (not high.value.oclIsUndefined() and high.value.size() > 8 implies high.value.size() >= 15)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8pfKoF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasPersonOrOrganization" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8pfKoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SwR1YH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasPersonOrOrganization" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SwR1YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).responsibleParty->excluding(null)->reject(not assignedEntity.assignedPerson.oclIsUndefined() or not assignedEntity.representedOrganization->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8pfxsF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8pfxsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SwSccH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SwSccX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).responsibleParty->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(rim::Role)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8qAvEF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityHasPersonOrOrganization" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8qAvEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SwvIYH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityHasPersonOrOrganization" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SwvIYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).encounterParticipant->excluding(null)->reject(not assignedEntity.assignedPerson.oclIsUndefined() or not assignedEntity.representedOrganization->isEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8qAvEl9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntity" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8qAvE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SwvIYn3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntity" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SwvIY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).encounterParticipant->excluding(null)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(rim::Role)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8qBWIF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterId" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8qBWIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SwvIZH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterId" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SwvIZX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8qBWIl9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterEffectiveTime" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8qBWI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SwvvcH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterEffectiveTime" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SwvvcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8qBWJF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterResponsibleParty" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8qBWJV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Swvvcn3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterResponsibleParty" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Swvvc33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(responsibleParty->one(responsibleParty : cda::ResponsibleParty | not responsibleParty.oclIsUndefined() and responsibleParty.oclIsKindOf(cda::ResponsibleParty)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8qB9MF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterEncounterParticipant" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8qB9MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SwvvdH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterEncounterParticipant" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SwvvdX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(encounterParticipant->exists(encounterParticipant : cda::EncounterParticipant | not encounterParticipant.oclIsUndefined() and encounterParticipant.oclIsKindOf(cda::EncounterParticipant)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8qB9Ml9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterLocation" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8qB9M19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SwwWgH3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounterLocation" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SwwWgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(location->one(location : cda::Location | not location.oclIsUndefined() and location.oclIsKindOf(rim::Participation)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8qB9NF9xEey5t-mahoHmrg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounter" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8qB9NV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SwwWgn3sEeyivuDeOiJBMg" name="HistoryAndPhysicalNote2ComponentOfEncompassingEncounter" constrainedElement="_4mLhsCluEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SwwWg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null)->reject(encompassingEncounter->one(encompassingEncounter : cda::EncompassingEncounter | not encompassingEncounter.oclIsUndefined() and encompassingEncounter.oclIsKindOf(cda::EncompassingEncounter)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_4mY9ECluEeSoCqqrpX8LzQ" general="_dduXkJ5OEeOr4eM3k36wAg"/>
-      <ownedOperation xmi:id="_1LV-El9xEey5t-mahoHmrg" name="getAllergiesSectionEntriesOptional2" bodyCondition="_1LV-FV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1LV-FV9xEey5t-mahoHmrg" name="body" constrainedElement="_1LV-El9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1LV-Fl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_L5Vywn3sEeyivuDeOiJBMg" name="getAllergiesSectionEntriesOptional2" bodyCondition="_L5VyxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_L5VyxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_L5Vywn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_L5Vyxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::AllergiesSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1LV-E19xEey5t-mahoHmrg" type="_nWAcMAIjEeSVzfoPSatgpg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1LV-FF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_L5Vyw33sEeyivuDeOiJBMg" type="_nWAcMAIjEeSVzfoPSatgpg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L5VyxH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1L1tUl9xEey5t-mahoHmrg" name="getAssessmentSection" bodyCondition="_1L2UYl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1L2UYl9xEey5t-mahoHmrg" name="body" constrainedElement="_1L1tUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1L2UY19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_L5wCcn3sEeyivuDeOiJBMg" name="getAssessmentSection" bodyCondition="_L5wCdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_L5wCdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_L5wCcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_L5wCdn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))->asSequence()->any(true).oclAsType(consol::AssessmentSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1L2UYF9xEey5t-mahoHmrg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1L2UYV9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_L5wCc33sEeyivuDeOiJBMg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L5wCdH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1MUOcl9xEey5t-mahoHmrg" name="getPlanOfTreatmentSection2" bodyCondition="_1MUOdV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1MUOdV9xEey5t-mahoHmrg" name="body" constrainedElement="_1MUOcl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1MUOdl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_L6QYwH3sEeyivuDeOiJBMg" name="getPlanOfTreatmentSection2" bodyCondition="_L6QYw33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_L6QYw33sEeyivuDeOiJBMg" name="body" constrainedElement="_L6QYwH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_L6QYxH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2))->asSequence()->any(true).oclAsType(consol::PlanOfTreatmentSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1MUOc19xEey5t-mahoHmrg" type="_bwml0P4yEeO_Yb9cO8w3bA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1MUOdF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_L6QYwX3sEeyivuDeOiJBMg" type="_bwml0P4yEeO_Yb9cO8w3bA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L6QYwn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1Mxhcl9xEey5t-mahoHmrg" name="getAssessmentAndPlanSection2" bodyCondition="_1MyIgF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1MyIgF9xEey5t-mahoHmrg" name="body" constrainedElement="_1Mxhcl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1MyIgV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_L6sdon3sEeyivuDeOiJBMg" name="getAssessmentAndPlanSection2" bodyCondition="_L6sdpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_L6sdpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_L6sdon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_L6sdpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection2))->asSequence()->any(true).oclAsType(consol::AssessmentAndPlanSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1Mxhc19xEey5t-mahoHmrg" type="_q_8twPvVEeOvZJBdQKQrqQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1MxhdF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_L6sdo33sEeyivuDeOiJBMg" type="_q_8twPvVEeOvZJBdQKQrqQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L6sdpH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1NQCkF9xEey5t-mahoHmrg" name="getChiefComplaintSection" bodyCondition="_1NQCk19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1NQCk19xEey5t-mahoHmrg" name="body" constrainedElement="_1NQCkF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1NQClF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_L7GtUn3sEeyivuDeOiJBMg" name="getChiefComplaintSection" bodyCondition="_L7GtVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_L7GtVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_L7GtUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_L7GtVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))->asSequence()->any(true).oclAsType(consol::ChiefComplaintSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1NQCkV9xEey5t-mahoHmrg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1NQCkl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_L7GtU33sEeyivuDeOiJBMg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L7GtVH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1NrgYl9xEey5t-mahoHmrg" name="getChiefComplaintAndReasonForVisitSection" bodyCondition="_1NrgZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1NrgZV9xEey5t-mahoHmrg" name="body" constrainedElement="_1NrgYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1NrgZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_L7g9An3sEeyivuDeOiJBMg" name="getChiefComplaintAndReasonForVisitSection" bodyCondition="_L7hkEn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_L7hkEn3sEeyivuDeOiJBMg" name="body" constrainedElement="_L7g9An3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_L7hkE33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))->asSequence()->any(true).oclAsType(consol::ChiefComplaintAndReasonForVisitSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1NrgY19xEey5t-mahoHmrg" type="_oI7CQCsaEeGHF88-qhhUMA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1NrgZF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_L7hkEH3sEeyivuDeOiJBMg" type="_oI7CQCsaEeGHF88-qhhUMA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L7hkEX3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1OTygl9xEey5t-mahoHmrg" name="getGeneralStatusSection" bodyCondition="_1OTyhV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1OTyhV9xEey5t-mahoHmrg" name="body" constrainedElement="_1OTygl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1OTyhl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_L7_eIn3sEeyivuDeOiJBMg" name="getGeneralStatusSection" bodyCondition="_L7_eJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_L7_eJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_L7_eIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_L7_eJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::GeneralStatusSection))->asSequence()->any(true).oclAsType(consol::GeneralStatusSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1OTyg19xEey5t-mahoHmrg" type="_2Pxt6xSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1OTyhF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_L7_eI33sEeyivuDeOiJBMg" type="_2Pxt6xSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L7_eJH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1O3MIl9xEey5t-mahoHmrg" name="getHistoryOfPastIllnessSection2" bodyCondition="_1O3MJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1O3MJV9xEey5t-mahoHmrg" name="body" constrainedElement="_1O3MIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1O3MJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_L8cKEn3sEeyivuDeOiJBMg" name="getHistoryOfPastIllnessSection2" bodyCondition="_L8cxIX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_L8cxIX3sEeyivuDeOiJBMg" name="body" constrainedElement="_L8cKEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_L8cxIn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection2))->asSequence()->any(true).oclAsType(consol::HistoryOfPastIllnessSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1O3MI19xEey5t-mahoHmrg" type="_sZlggPyhEeOC19UEcu7MOw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1O3MJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_L8cKE33sEeyivuDeOiJBMg" type="_sZlggPyhEeOC19UEcu7MOw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8cxIH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1PXicl9xEey5t-mahoHmrg" name="getHistoryOfPresentIllnessSection" bodyCondition="_1PXidV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1PXidV9xEey5t-mahoHmrg" name="body" constrainedElement="_1PXicl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1PXidl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_L86EIn3sEeyivuDeOiJBMg" name="getHistoryOfPresentIllnessSection" bodyCondition="_L86EJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_L86EJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_L86EIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_L86EJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))->asSequence()->any(true).oclAsType(consol::HistoryOfPresentIllnessSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1PXic19xEey5t-mahoHmrg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1PXidF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_L86EI33sEeyivuDeOiJBMg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L86EJH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1P4f0F9xEey5t-mahoHmrg" name="getImmunizationsSectionEntriesOptional2" bodyCondition="_1P4f019xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1P4f019xEey5t-mahoHmrg" name="body" constrainedElement="_1P4f0F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1P4f1F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_L9ZMUn3sEeyivuDeOiJBMg" name="getImmunizationsSectionEntriesOptional2" bodyCondition="_L9ZMVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_L9ZMVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_L9ZMUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_L9ZMVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ImmunizationsSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::ImmunizationsSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1P4f0V9xEey5t-mahoHmrg" type="_kdQhIPy3EeO1SvUcmWeLDQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1P4f0l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_L9ZMU33sEeyivuDeOiJBMg" type="_kdQhIPy3EeO1SvUcmWeLDQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L9ZMVH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1QYPEl9xEey5t-mahoHmrg" name="getInstructionsSection2" bodyCondition="_1QYPFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1QYPFV9xEey5t-mahoHmrg" name="body" constrainedElement="_1QYPEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1QYPFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_L914Qn3sEeyivuDeOiJBMg" name="getInstructionsSection2" bodyCondition="_L914RX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_L914RX3sEeyivuDeOiJBMg" name="body" constrainedElement="_L914Qn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_L92fUH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::InstructionsSection2))->asSequence()->any(true).oclAsType(consol::InstructionsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1QYPE19xEey5t-mahoHmrg" type="_k8L2YP1HEeOVx4YMwgfjlA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1QYPFF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_L914Q33sEeyivuDeOiJBMg" type="_k8L2YP1HEeOVx4YMwgfjlA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L914RH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1Q3-Ul9xEey5t-mahoHmrg" name="getMedicationsSectionEntriesOptional2" bodyCondition="_1Q3-VV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1Q3-VV9xEey5t-mahoHmrg" name="body" constrainedElement="_1Q3-Ul9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1Q3-Vl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_L-QvAn3sEeyivuDeOiJBMg" name="getMedicationsSectionEntriesOptional2" bodyCondition="_L-QvBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_L-QvBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_L-QvAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_L-QvBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::MedicationsSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1Q3-U19xEey5t-mahoHmrg" type="_JUvaUAFaEeS0nNJt6oyOyQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1Q3-VF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_L-QvA33sEeyivuDeOiJBMg" type="_JUvaUAFaEeS0nNJt6oyOyQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L-QvBH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1RXtkl9xEey5t-mahoHmrg" name="getPhysicalExamSection2" bodyCondition="_1RYUoF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1RYUoF9xEey5t-mahoHmrg" name="body" constrainedElement="_1RXtkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1RYUoV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_L-rlwn3sEeyivuDeOiJBMg" name="getPhysicalExamSection2" bodyCondition="_L-rlxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_L-rlxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_L-rlwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_L-rlxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection2))->asSequence()->any(true).oclAsType(consol::PhysicalExamSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1RXtk19xEey5t-mahoHmrg" type="_-nZiYP4uEeObaveuCI77uA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1RXtlF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_L-rlw33sEeyivuDeOiJBMg" type="_-nZiYP4uEeObaveuCI77uA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L-rlxH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1R4D4l9xEey5t-mahoHmrg" name="getProblemSectionEntriesOptional2" bodyCondition="_1R4D5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1R4D5V9xEey5t-mahoHmrg" name="body" constrainedElement="_1R4D4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1R4D5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_L_Gcgn3sEeyivuDeOiJBMg" name="getProblemSectionEntriesOptional2" bodyCondition="_L_GchX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_L_GchX3sEeyivuDeOiJBMg" name="body" constrainedElement="_L_Gcgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_L_Gchn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::ProblemSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1R4D419xEey5t-mahoHmrg" type="_ZgLioAFkEeSJ2uHfynwxCw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1R4D5F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_L_Gcg33sEeyivuDeOiJBMg" type="_ZgLioAFkEeSJ2uHfynwxCw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L_GchH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1SV98l9xEey5t-mahoHmrg" name="getProceduresSectionEntriesOptional2" bodyCondition="_1SV99V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1SV99V9xEey5t-mahoHmrg" name="body" constrainedElement="_1SV98l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1SV99l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_L_hTQX3sEeyivuDeOiJBMg" name="getProceduresSectionEntriesOptional2" bodyCondition="_L_hTRH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_L_hTRH3sEeyivuDeOiJBMg" name="body" constrainedElement="_L_hTQX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_L_hTRX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::ProceduresSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1SV9819xEey5t-mahoHmrg" type="_80dMoAB0EeSLOb2O6vSPzg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1SV99F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_L_hTQn3sEeyivuDeOiJBMg" type="_80dMoAB0EeSLOb2O6vSPzg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L_hTQ33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1S1GIl9xEey5t-mahoHmrg" name="getReasonForVisitSection" bodyCondition="_1S1tMF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1S1tMF9xEey5t-mahoHmrg" name="body" constrainedElement="_1S1GIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1S1tMV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_L_8KAn3sEeyivuDeOiJBMg" name="getReasonForVisitSection" bodyCondition="_L_8KBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_L_8KBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_L_8KAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_L_8KBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))->asSequence()->any(true).oclAsType(consol::ReasonForVisitSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1S1GI19xEey5t-mahoHmrg" type="_Nm64UCscEeGHF88-qhhUMA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1S1GJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_L_8KA33sEeyivuDeOiJBMg" type="_Nm64UCscEeGHF88-qhhUMA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L_8KBH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1TRyEl9xEey5t-mahoHmrg" name="getResultsSectionEntriesOptional2" bodyCondition="_1TSZIl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1TSZIl9xEey5t-mahoHmrg" name="body" constrainedElement="_1TRyEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1TSZI19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MAVyon3sEeyivuDeOiJBMg" name="getResultsSectionEntriesOptional2" bodyCondition="_MAVypX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MAVypX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MAVyon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MAVypn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::ResultsSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1TSZIF9xEey5t-mahoHmrg" type="_yaJ3QAFAEeSaVZ5WxWd94w" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1TSZIV9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MAVyo33sEeyivuDeOiJBMg" type="_yaJ3QAFAEeSaVZ5WxWd94w" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MAVypH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1TxhUl9xEey5t-mahoHmrg" name="getReviewOfSystemsSection" bodyCondition="_1TxhVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1TxhVV9xEey5t-mahoHmrg" name="body" constrainedElement="_1TxhUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1TxhVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MAx3gn3sEeyivuDeOiJBMg" name="getReviewOfSystemsSection" bodyCondition="_MAx3hX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MAx3hX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MAx3gn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MAx3hn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))->asSequence()->any(true).oclAsType(consol::ReviewOfSystemsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1TxhU19xEey5t-mahoHmrg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1TxhVF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MAx3g33sEeyivuDeOiJBMg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MAx3hH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1UQpgF9xEey5t-mahoHmrg" name="getSocialHistorySection2" bodyCondition="_1UQpg19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1UQpg19xEey5t-mahoHmrg" name="body" constrainedElement="_1UQpgF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1UQphF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MBPxkH3sEeyivuDeOiJBMg" name="getSocialHistorySection2" bodyCondition="_MBPxk33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MBPxk33sEeyivuDeOiJBMg" name="body" constrainedElement="_MBPxkH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MBPxlH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection2))->asSequence()->any(true).oclAsType(consol::SocialHistorySection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1UQpgV9xEey5t-mahoHmrg" type="_wLWZMAFHEeSG_MJH-zNFRw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1UQpgl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MBPxkX3sEeyivuDeOiJBMg" type="_wLWZMAFHEeSG_MJH-zNFRw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MBPxkn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1UwYwF9xEey5t-mahoHmrg" name="getVitalSignsSectionEntriesOptional2" bodyCondition="_1UwYw19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1UwYw19xEey5t-mahoHmrg" name="body" constrainedElement="_1UwYwF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1UwYxF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MBqBQn3sEeyivuDeOiJBMg" name="getVitalSignsSectionEntriesOptional2" bodyCondition="_MBqBRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MBqBRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MBqBQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MBqBRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::VitalSignsSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1UwYwV9xEey5t-mahoHmrg" type="_8LkzYAFTEeSmasYc71ZgMQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1UwYwl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MBqBQ33sEeyivuDeOiJBMg" type="_8LkzYAFTEeSmasYc71ZgMQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MBqBRH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3OZa8F9xEey5t-mahoHmrg" name="getFamilyHistorySection2" bodyCondition="_3OZa819xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3OZa819xEey5t-mahoHmrg" name="body" constrainedElement="_3OZa8F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3OZa9F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Nspjcn3sEeyivuDeOiJBMg" name="getFamilyHistorySection2" bodyCondition="_NsqKgn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NsqKgn3sEeyivuDeOiJBMg" name="body" constrainedElement="_Nspjcn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NsqKg33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection2))->asSequence()->any(true).oclAsType(consol::FamilyHistorySection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3OZa8V9xEey5t-mahoHmrg" type="_NGivoIevEeSBauRYePLghA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3OZa8l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_NsqKgH3sEeyivuDeOiJBMg" type="_NGivoIevEeSBauRYePLghA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NsqKgX3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -38211,445 +38211,445 @@ The Operative Note is a frequently used type of procedure note with specific req
 The Operative Note is created immediately following a surgical or other high-risk procedure. It records the pre- and post-surgical diagnosis, pertinent events of the procedure, as well as the condition of the patient following the procedure. The report should be sufficiently detailed to support the diagnoses, justify the treatment, document the course of the procedure, and provide continuity of care.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_1UwYxV9xEey5t-mahoHmrg" name="USRealmHeader2TemplateId" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1Uw_0F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MBqBR33sEeyivuDeOiJBMg" name="USRealmHeader2TemplateId" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MBqoUH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.7' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1VRWIF9xEey5t-mahoHmrg" name="OperativeNote2CodeP" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1VRWIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MCHUQH3sEeyivuDeOiJBMg" name="OperativeNote2CodeP" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MCHUQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1Uxm4F9xEey5t-mahoHmrg" name="OperativeNote2Code" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1Uxm4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MBrPYH3sEeyivuDeOiJBMg" name="OperativeNote2Code" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MBrPYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '11504-8' or value.code = '34137-0' or value.code = '28583-3' or value.code = '28624-5' or value.code = '28573-4' or value.code = '34877-1' or value.code = '34874-8' or value.code = '34870-6' or value.code = '34868-0' or value.code = '34818-5'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1YmW8F9xEey5t-mahoHmrg" name="OperativeNote2DocumentationOf" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1YmW8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MFEhoH3sEeyivuDeOiJBMg" name="OperativeNote2DocumentationOf" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MFEhoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->exists(documentationOf : cda::DocumentationOf | not documentationOf.oclIsUndefined() and documentationOf.oclIsKindOf(cda::DocumentationOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1anJIF9xEey5t-mahoHmrg" name="OperativeNote2Authorization" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1anJIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MG5GkH3sEeyivuDeOiJBMg" name="OperativeNote2Authorization" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MG5GkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->one(authorization : cda::Authorization | not authorization.oclIsUndefined() and authorization.oclIsKindOf(cda::Authorization))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1bkycF9xEey5t-mahoHmrg" name="OperativeNote2AnesthesiaSection2" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1bkycV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MHwpQH3sEeyivuDeOiJBMg" name="OperativeNote2AnesthesiaSection2" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MHxQUH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AnesthesiaSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1cCFcF9xEey5t-mahoHmrg" name="OperativeNote2ComplicationsSection2" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1cCFcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MIMHEH3sEeyivuDeOiJBMg" name="OperativeNote2ComplicationsSection2" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MIMHEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ComplicationsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1ch0sF9xEey5t-mahoHmrg" name="OperativeNote2PreoperativeDiagnosisSection2" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1ch0sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MImWwH3sEeyivuDeOiJBMg" name="OperativeNote2PreoperativeDiagnosisSection2" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MImWwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PreoperativeDiagnosisSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1c-goF9xEey5t-mahoHmrg" name="OperativeNote2ProcedureEstimatedBloodLossSection" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1c-goV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MJEQ0H3sEeyivuDeOiJBMg" name="OperativeNote2ProcedureEstimatedBloodLossSection" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MJEQ0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureEstimatedBloodLossSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1dcasF9xEey5t-mahoHmrg" name="OperativeNote2ProcedureFindingsSection2" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1dcasV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MJhj0H3sEeyivuDeOiJBMg" name="OperativeNote2ProcedureFindingsSection2" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MJhj0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureFindingsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1d6UwF9xEey5t-mahoHmrg" name="OperativeNote2ProcedureSpecimensTakenSection" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1d670F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MJ9BoH3sEeyivuDeOiJBMg" name="OperativeNote2ProcedureSpecimensTakenSection" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MJ9BoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureSpecimensTakenSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1eh_0F9xEey5t-mahoHmrg" name="OperativeNote2ProcedureDescriptionSection" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1eh_0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MKWqQH3sEeyivuDeOiJBMg" name="OperativeNote2ProcedureDescriptionSection" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MKWqQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureDescriptionSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1fBIAF9xEey5t-mahoHmrg" name="OperativeNote2PostoperativeDiagnosisSection" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1fBIAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MKw58H3sEeyivuDeOiJBMg" name="OperativeNote2PostoperativeDiagnosisSection" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MKw58X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PostoperativeDiagnosisSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1fg3QF9xEey5t-mahoHmrg" name="OperativeNote2ProcedureImplantsSection" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1fg3QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MLLJoH3sEeyivuDeOiJBMg" name="OperativeNote2ProcedureImplantsSection" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MLLJoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureImplantsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1f-KQF9xEey5t-mahoHmrg" name="OperativeNote2OperativeNoteFluidSection" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1f-KQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MLkyQH3sEeyivuDeOiJBMg" name="OperativeNote2OperativeNoteFluidSection" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MLkyQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::OperativeNoteFluidSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1gdScF9xEey5t-mahoHmrg" name="OperativeNote2OperativeNoteSurgicalProcedureSection" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1gdScV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ML-a4H3sEeyivuDeOiJBMg" name="OperativeNote2OperativeNoteSurgicalProcedureSection" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ML-a4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::OperativeNoteSurgicalProcedureSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1g6lcF9xEey5t-mahoHmrg" name="OperativeNote2PlanOfTreatmentSection2" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1g6lcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MMYqkH3sEeyivuDeOiJBMg" name="OperativeNote2PlanOfTreatmentSection2" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MMYqkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1ha7wF9xEey5t-mahoHmrg" name="OperativeNote2PlannedProcedureSection2" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1ha7wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MM2koH3sEeyivuDeOiJBMg" name="OperativeNote2PlannedProcedureSection2" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MM2koX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlannedProcedureSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1h6D8F9xEey5t-mahoHmrg" name="OperativeNote2ProcedureDispositionSection" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1h6rAF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MNT3oH3sEeyivuDeOiJBMg" name="OperativeNote2ProcedureDispositionSection" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MNT3oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureDispositionSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1iaaQF9xEey5t-mahoHmrg" name="OperativeNote2ProcedureIndicationsSection2" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1iaaQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MNv8gH3sEeyivuDeOiJBMg" name="OperativeNote2ProcedureIndicationsSection2" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MNv8gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureIndicationsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1i4UUF9xEey5t-mahoHmrg" name="OperativeNote2SurgicalDrainsSection" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1i4UUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MOKzQH3sEeyivuDeOiJBMg" name="OperativeNote2SurgicalDrainsSection" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MOKzQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SurgicalDrainsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8rFtIF9xEey5t-mahoHmrg" name="OperativeNote2DocumentationOfServiceEventUSRealmDateAndTimeDTLow" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8rFtIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SxogQH3sEeyivuDeOiJBMg" name="OperativeNote2DocumentationOfServiceEventUSRealmDateAndTimeDTLow" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SxogQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((low.oclIsUndefined() or low.isNullFlavorUndefined()) implies (not low.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8sHA0F9xEey5t-mahoHmrg" name="OperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCodeP" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8sHA0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SymwoH3sEeyivuDeOiJBMg" name="OperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCodeP" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SymwoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8sHA0l9xEey5t-mahoHmrg" name="OperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCode" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8sHA019xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Symwon3sEeyivuDeOiJBMg" name="OperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCode" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Symwo33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8sHn4F9xEey5t-mahoHmrg" name="OperativeNote2DocumentationOfServiceEventPerformerTypeCode" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8sHn4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SymwpH3sEeyivuDeOiJBMg" name="OperativeNote2DocumentationOfServiceEventPerformerTypeCode" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SymwpX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->reject(typeCode=vocab::x_ServiceEventPerformer::PPRF)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8sHn4l9xEey5t-mahoHmrg" name="OperativeNote2DocumentationOfServiceEventPerformerAssignedEntity" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8sHn419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SynXsH3sEeyivuDeOiJBMg" name="OperativeNote2DocumentationOfServiceEventPerformerAssignedEntity" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SynXsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8tQQUF9xEey5t-mahoHmrg" name="OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCodeP" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8tQQUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SzmPIH3sEeyivuDeOiJBMg" name="OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCodeP" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SzmPIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::SPRF).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8tQQUl9xEey5t-mahoHmrg" name="OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCode" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8tQ3YF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SzmPIn3sEeyivuDeOiJBMg" name="OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCode" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SzmPI33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::SPRF).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8tQ3YV9xEey5t-mahoHmrg" name="OperativeNote2DocumentationOfServiceEventPerformerAssistantsTypeCode" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8tQ3Yl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SzmPJH3sEeyivuDeOiJBMg" name="OperativeNote2DocumentationOfServiceEventPerformerAssistantsTypeCode" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SzmPJX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::SPRF)->select(typeCode = vocab::x_ServiceEventPerformer::SPRF)->reject(typeCode=vocab::x_ServiceEventPerformer::SPRF)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8tQ3Y19xEey5t-mahoHmrg" name="OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntity" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8tQ3ZF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Szm2MH3sEeyivuDeOiJBMg" name="OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntity" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Szm2MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::SPRF)->select(typeCode = vocab::x_ServiceEventPerformer::SPRF)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8tRecF9xEey5t-mahoHmrg" name="OperativeNote2DocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8tRecV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Szm2Mn3sEeyivuDeOiJBMg" name="OperativeNote2DocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Szm2M33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(not effectiveTime.width.oclIsUndefined() xor not effectiveTime.high.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8tRecl9xEey5t-mahoHmrg" name="OperativeNote2DocumentationOfServiceEventEffectiveTimeNoHighIfWidth" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8tRec19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Szm2NH3sEeyivuDeOiJBMg" name="OperativeNote2DocumentationOfServiceEventEffectiveTimeNoHighIfWidth" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Szm2NX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(not effectiveTime.width.oclIsUndefined() xor not effectiveTime.high.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8tSFgF9xEey5t-mahoHmrg" name="OperativeNote2DocumentationOfServiceEventProcedureCodes" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8tSFgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Szm2Nn3sEeyivuDeOiJBMg" name="OperativeNote2DocumentationOfServiceEventProcedureCodes" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SzndQH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(code.codeSystem = '2.16.840.1.113883.6.104' or code.codeSystem = '2.16.840.1.113883.6.12' or code.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8tSFgl9xEey5t-mahoHmrg" name="OperativeNote2DocumentationOfServiceEventEffectiveTime" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8tSFg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SzndQX3sEeyivuDeOiJBMg" name="OperativeNote2DocumentationOfServiceEventEffectiveTime" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SzndQn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8tSskF9xEey5t-mahoHmrg" name="OperativeNote2DocumentationOfServiceEventCode" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8tSskV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SzndQ33sEeyivuDeOiJBMg" name="OperativeNote2DocumentationOfServiceEventCode" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SzndRH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8tSskl9xEey5t-mahoHmrg" name="OperativeNote2DocumentationOfServiceEventPerformer" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8tSsk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SzndRX3sEeyivuDeOiJBMg" name="OperativeNote2DocumentationOfServiceEventPerformer" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SzndRn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(performer->select(performer : cda::Performer1 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer1))->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->notEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8tTToF9xEey5t-mahoHmrg" name="OperativeNote2DocumentationOfServiceEventPerformerAssistants" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8tTToV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SzoEUH3sEeyivuDeOiJBMg" name="OperativeNote2DocumentationOfServiceEventPerformerAssistants" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SzoEUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(performer->select(performer : cda::Performer1 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer1))->select(typeCode = vocab::x_ServiceEventPerformer::SPRF)->notEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8tTTol9xEey5t-mahoHmrg" name="OperativeNote2DocumentationOfServiceEvent" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8tTTo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_SzoEUn3sEeyivuDeOiJBMg" name="OperativeNote2DocumentationOfServiceEvent" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_SzoEU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null)->reject(serviceEvent->one(serviceEvent : cda::ServiceEvent | not serviceEvent.oclIsUndefined() and serviceEvent.oclIsKindOf(cda::ServiceEvent)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8uWcgF9xEey5t-mahoHmrg" name="OperativeNote2AuthorizationConsentClassCode" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8uWcgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S0g1IH3sEeyivuDeOiJBMg" name="OperativeNote2AuthorizationConsentClassCode" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S0g1IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->excluding(null).consent->excluding(null)->reject(isDefined('classCode') and classCode=vocab::ActClass::CONS)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8uXDkF9xEey5t-mahoHmrg" name="OperativeNote2AuthorizationConsentMoodCode" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8uXDkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S0hcMH3sEeyivuDeOiJBMg" name="OperativeNote2AuthorizationConsentMoodCode" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S0hcMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->excluding(null).consent->excluding(null)->reject(isDefined('moodCode') and moodCode=vocab::ActMood::EVN)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8uXDkl9xEey5t-mahoHmrg" name="OperativeNote2AuthorizationConsentStatusCode" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8uXDk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S0hcMn3sEeyivuDeOiJBMg" name="OperativeNote2AuthorizationConsentStatusCode" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S0hcM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->excluding(null).consent->excluding(null)->reject((statusCode.oclIsUndefined() or statusCode.isNullFlavorUndefined()) implies (not statusCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8uXDlF9xEey5t-mahoHmrg" name="OperativeNote2AuthorizationTypeCode" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8uXDlV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S0iDQH3sEeyivuDeOiJBMg" name="OperativeNote2AuthorizationTypeCode" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S0iDQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->excluding(null)->reject(isDefined('typeCode') and typeCode=vocab::ActRelationshipType::AUTH)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8uXqoF9xEey5t-mahoHmrg" name="OperativeNote2AuthorizationConsent" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8uXqoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S0iDQn3sEeyivuDeOiJBMg" name="OperativeNote2AuthorizationConsent" constrainedElement="_aH1CYC1fEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S0iDQ33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->excluding(null)->reject(consent->one(consent : cda::Consent | not consent.oclIsUndefined() and consent.oclIsKindOf(cda::Consent)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_aH1pcC1fEeSoCqqrpX8LzQ" general="_dduXkJ5OEeOr4eM3k36wAg"/>
-      <ownedOperation xmi:id="_1bkycl9xEey5t-mahoHmrg" name="getAnesthesiaSection2" bodyCondition="_1bkydV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1bkydV9xEey5t-mahoHmrg" name="body" constrainedElement="_1bkycl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1bkydl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MHxQUX3sEeyivuDeOiJBMg" name="getAnesthesiaSection2" bodyCondition="_MHxQVH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MHxQVH3sEeyivuDeOiJBMg" name="body" constrainedElement="_MHxQUX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MHxQVX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AnesthesiaSection2))->asSequence()->any(true).oclAsType(consol::AnesthesiaSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1bkyc19xEey5t-mahoHmrg" type="_aetyEPu_EeOyiMEKhdqMGA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1bkydF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MHxQUn3sEeyivuDeOiJBMg" type="_aetyEPu_EeOyiMEKhdqMGA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MHxQU33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1cCFcl9xEey5t-mahoHmrg" name="getComplicationsSection2" bodyCondition="_1cCFdV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1cCFdV9xEey5t-mahoHmrg" name="body" constrainedElement="_1cCFcl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1cCFdl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MIMHEn3sEeyivuDeOiJBMg" name="getComplicationsSection2" bodyCondition="_MIMHFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MIMHFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MIMHEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MIMHFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ComplicationsSection2))->asSequence()->any(true).oclAsType(consol::ComplicationsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1cCFc19xEey5t-mahoHmrg" type="_6M-msPvXEeOes-3T-2HryA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1cCFdF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MIMHE33sEeyivuDeOiJBMg" type="_6M-msPvXEeOes-3T-2HryA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MIMHFH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1ch0sl9xEey5t-mahoHmrg" name="getPreoperativeDiagnosisSection2" bodyCondition="_1ch0tV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1ch0tV9xEey5t-mahoHmrg" name="body" constrainedElement="_1ch0sl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1ch0tl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MIm90H3sEeyivuDeOiJBMg" name="getPreoperativeDiagnosisSection2" bodyCondition="_MIm9033sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MIm9033sEeyivuDeOiJBMg" name="body" constrainedElement="_MIm90H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MIm91H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PreoperativeDiagnosisSection2))->asSequence()->any(true).oclAsType(consol::PreoperativeDiagnosisSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1ch0s19xEey5t-mahoHmrg" type="_JFd3MP5EEeOBnLkJOVC8NQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1ch0tF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MIm90X3sEeyivuDeOiJBMg" type="_JFd3MP5EEeOBnLkJOVC8NQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MIm90n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1c_HsF9xEey5t-mahoHmrg" name="getProcedureEstimatedBloodLossSection" bodyCondition="_1c_Hs19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1c_Hs19xEey5t-mahoHmrg" name="body" constrainedElement="_1c_HsF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1c_HtF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MJE34H3sEeyivuDeOiJBMg" name="getProcedureEstimatedBloodLossSection" bodyCondition="_MJE3433sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MJE3433sEeyivuDeOiJBMg" name="body" constrainedElement="_MJE34H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MJE35H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureEstimatedBloodLossSection))->asSequence()->any(true).oclAsType(consol::ProcedureEstimatedBloodLossSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1c_HsV9xEey5t-mahoHmrg" type="_TvcL8DVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1c_Hsl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MJE34X3sEeyivuDeOiJBMg" type="_TvcL8DVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MJE34n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1dcasl9xEey5t-mahoHmrg" name="getProcedureFindingsSection2" bodyCondition="_1ddBwF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1ddBwF9xEey5t-mahoHmrg" name="body" constrainedElement="_1dcasl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1ddBwV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MJiK4H3sEeyivuDeOiJBMg" name="getProcedureFindingsSection2" bodyCondition="_MJiK433sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MJiK433sEeyivuDeOiJBMg" name="body" constrainedElement="_MJiK4H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MJiK5H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureFindingsSection2))->asSequence()->any(true).oclAsType(consol::ProcedureFindingsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1dcas19xEey5t-mahoHmrg" type="_lLOykP5FEeO_r7yO9mhwnA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1dcatF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MJiK4X3sEeyivuDeOiJBMg" type="_lLOykP5FEeO_r7yO9mhwnA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MJiK4n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1d670V9xEey5t-mahoHmrg" name="getProcedureSpecimensTakenSection" bodyCondition="_1d671F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1d671F9xEey5t-mahoHmrg" name="body" constrainedElement="_1d670V9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1d671V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MJ9Bon3sEeyivuDeOiJBMg" name="getProcedureSpecimensTakenSection" bodyCondition="_MJ9BpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MJ9BpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MJ9Bon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MJ9Bpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureSpecimensTakenSection))->asSequence()->any(true).oclAsType(consol::ProcedureSpecimensTakenSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1d670l9xEey5t-mahoHmrg" type="_gSUdsDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1d67019xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MJ9Bo33sEeyivuDeOiJBMg" type="_gSUdsDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MJ9BpH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1eh_0l9xEey5t-mahoHmrg" name="getProcedureDescriptionSection" bodyCondition="_1eh_1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1eh_1V9xEey5t-mahoHmrg" name="body" constrainedElement="_1eh_0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1eh_1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MKXRUH3sEeyivuDeOiJBMg" name="getProcedureDescriptionSection" bodyCondition="_MKXRU33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MKXRU33sEeyivuDeOiJBMg" name="body" constrainedElement="_MKXRUH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MKXRVH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureDescriptionSection))->asSequence()->any(true).oclAsType(consol::ProcedureDescriptionSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1eh_019xEey5t-mahoHmrg" type="_HNUIIDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1eh_1F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MKXRUX3sEeyivuDeOiJBMg" type="_HNUIIDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MKXRUn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1fBIAl9xEey5t-mahoHmrg" name="getPostoperativeDiagnosisSection" bodyCondition="_1fBvEV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1fBvEV9xEey5t-mahoHmrg" name="body" constrainedElement="_1fBIAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1fBvEl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MKw58n3sEeyivuDeOiJBMg" name="getPostoperativeDiagnosisSection" bodyCondition="_MKxhAH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MKxhAH3sEeyivuDeOiJBMg" name="body" constrainedElement="_MKw58n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MKxhAX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PostoperativeDiagnosisSection))->asSequence()->any(true).oclAsType(consol::PostoperativeDiagnosisSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1fBIA19xEey5t-mahoHmrg" type="_7UA-4DVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1fBvEF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MKw5833sEeyivuDeOiJBMg" type="_7UA-4DVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MKw59H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1fg3Ql9xEey5t-mahoHmrg" name="getProcedureImplantsSection" bodyCondition="_1fg3RV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1fg3RV9xEey5t-mahoHmrg" name="body" constrainedElement="_1fg3Ql9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1fg3Rl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MLLJon3sEeyivuDeOiJBMg" name="getProcedureImplantsSection" bodyCondition="_MLLJpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MLLJpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MLLJon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MLLJpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureImplantsSection))->asSequence()->any(true).oclAsType(consol::ProcedureImplantsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1fg3Q19xEey5t-mahoHmrg" type="_Z662wDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1fg3RF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MLLJo33sEeyivuDeOiJBMg" type="_Z662wDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MLLJpH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1f-KQl9xEey5t-mahoHmrg" name="getOperativeNoteFluidSection" bodyCondition="_1f-KRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1f-KRV9xEey5t-mahoHmrg" name="body" constrainedElement="_1f-KQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1f-KRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MLlZUH3sEeyivuDeOiJBMg" name="getOperativeNoteFluidSection" bodyCondition="_MLlZU33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MLlZU33sEeyivuDeOiJBMg" name="body" constrainedElement="_MLlZUH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MLlZVH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::OperativeNoteFluidSection))->asSequence()->any(true).oclAsType(consol::OperativeNoteFluidSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1f-KQ19xEey5t-mahoHmrg" type="_vHfXoDVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1f-KRF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MLlZUX3sEeyivuDeOiJBMg" type="_vHfXoDVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MLlZUn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1gd5gF9xEey5t-mahoHmrg" name="getOperativeNoteSurgicalProcedureSection" bodyCondition="_1gd5g19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1gd5g19xEey5t-mahoHmrg" name="body" constrainedElement="_1gd5gF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1gd5hF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_ML_B8H3sEeyivuDeOiJBMg" name="getOperativeNoteSurgicalProcedureSection" bodyCondition="_ML_B833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ML_B833sEeyivuDeOiJBMg" name="body" constrainedElement="_ML_B8H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ML_B9H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::OperativeNoteSurgicalProcedureSection))->asSequence()->any(true).oclAsType(consol::OperativeNoteSurgicalProcedureSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1gd5gV9xEey5t-mahoHmrg" type="_zel6wDVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1gd5gl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_ML_B8X3sEeyivuDeOiJBMg" type="_zel6wDVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ML_B8n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1g7MgF9xEey5t-mahoHmrg" name="getPlanOfTreatmentSection2" bodyCondition="_1g7Mg19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1g7Mg19xEey5t-mahoHmrg" name="body" constrainedElement="_1g7MgF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1g7MhF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MMYqkn3sEeyivuDeOiJBMg" name="getPlanOfTreatmentSection2" bodyCondition="_MMYqlX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MMYqlX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MMYqkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MMZRoH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2))->asSequence()->any(true).oclAsType(consol::PlanOfTreatmentSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1g7MgV9xEey5t-mahoHmrg" type="_bwml0P4yEeO_Yb9cO8w3bA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1g7Mgl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MMYqk33sEeyivuDeOiJBMg" type="_bwml0P4yEeO_Yb9cO8w3bA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MMYqlH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1ha7wl9xEey5t-mahoHmrg" name="getPlannedProcedureSection2" bodyCondition="_1ha7xV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1ha7xV9xEey5t-mahoHmrg" name="body" constrainedElement="_1ha7wl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1ha7xl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MM2kon3sEeyivuDeOiJBMg" name="getPlannedProcedureSection2" bodyCondition="_MM2kpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MM2kpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MM2kon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MM2kpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlannedProcedureSection2))->asSequence()->any(true).oclAsType(consol::PlannedProcedureSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1ha7w19xEey5t-mahoHmrg" type="_dz0ZwP49EeO_F_2qLv6FWQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1ha7xF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MM2ko33sEeyivuDeOiJBMg" type="_dz0ZwP49EeO_F_2qLv6FWQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MM2kpH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1h6rAV9xEey5t-mahoHmrg" name="getProcedureDispositionSection" bodyCondition="_1h6rBF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1h6rBF9xEey5t-mahoHmrg" name="body" constrainedElement="_1h6rAV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1h6rBV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MNUesH3sEeyivuDeOiJBMg" name="getProcedureDispositionSection" bodyCondition="_MNUes33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MNUes33sEeyivuDeOiJBMg" name="body" constrainedElement="_MNUesH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MNUetH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureDispositionSection))->asSequence()->any(true).oclAsType(consol::ProcedureDispositionSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1h6rAl9xEey5t-mahoHmrg" type="_QhXGYDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1h6rA19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MNUesX3sEeyivuDeOiJBMg" type="_QhXGYDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MNUesn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1iaaQl9xEey5t-mahoHmrg" name="getProcedureIndicationsSection2" bodyCondition="_1ibBUF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1ibBUF9xEey5t-mahoHmrg" name="body" constrainedElement="_1iaaQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1ibBUV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MNv8gn3sEeyivuDeOiJBMg" name="getProcedureIndicationsSection2" bodyCondition="_MNv8hX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MNv8hX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MNv8gn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MNv8hn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureIndicationsSection2))->asSequence()->any(true).oclAsType(consol::ProcedureIndicationsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1iaaQ19xEey5t-mahoHmrg" type="_5_O94AByEeSjnfOPJpFg3A" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1iaaRF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MNv8g33sEeyivuDeOiJBMg" type="_5_O94AByEeSjnfOPJpFg3A" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MNv8hH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1i47YF9xEey5t-mahoHmrg" name="getSurgicalDrainsSection" bodyCondition="_1i47Y19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1i47Y19xEey5t-mahoHmrg" name="body" constrainedElement="_1i47YF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1i47ZF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MOKzQn3sEeyivuDeOiJBMg" name="getSurgicalDrainsSection" bodyCondition="_MOKzRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MOKzRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MOKzQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MOKzRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SurgicalDrainsSection))->asSequence()->any(true).oclAsType(consol::SurgicalDrainsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1i47YV9xEey5t-mahoHmrg" type="_luQh8DVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1i47Yl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MOKzQ33sEeyivuDeOiJBMg" type="_luQh8DVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MOKzRH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -38680,747 +38680,747 @@ The Procedure Note is created immediately following a non-operative procedure. I
           <body>(self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection)) or  self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))) xor self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1i47ZV9xEey5t-mahoHmrg" name="USRealmHeader2TemplateId" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1i47Zl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MOLaUH3sEeyivuDeOiJBMg" name="USRealmHeader2TemplateId" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MOLaUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.6' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1jcVAF9xEey5t-mahoHmrg" name="ProcedureNote2CodeP" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1jcVAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MOpUYH3sEeyivuDeOiJBMg" name="ProcedureNote2CodeP" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MOpUYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1i6wkF9xEey5t-mahoHmrg" name="ProcedureNote2Code" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1i6wkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MONPgH3sEeyivuDeOiJBMg" name="ProcedureNote2Code" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MONPgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '28570-0' or value.code = '11505-5' or value.code = '18744-3' or value.code = '18745-0' or value.code = '18746-8' or value.code = '18751-8' or value.code = '18753-4' or value.code = '18836-7' or value.code = '28577-5' or value.code = '28625-2' or value.code = '29757-2' or value.code = '33721-2' or value.code = '34121-4' or value.code = '34896-1' or value.code = '34899-5' or value.code = '47048-4' or value.code = '48807-2'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1m4DgF9xEey5t-mahoHmrg" name="ProcedureNote2Participant" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1m4DgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MR3ngH3sEeyivuDeOiJBMg" name="ProcedureNote2Participant" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MR3ngX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->select(participant : cda::Participant1 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant1))->select(typeCode = vocab::ParticipationType::IND)->notEmpty()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1oXRQF9xEey5t-mahoHmrg" name="ProcedureNote2DocumentationOf" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1oXRQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MTQHkH3sEeyivuDeOiJBMg" name="ProcedureNote2DocumentationOf" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MTQHkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->exists(documentationOf : cda::DocumentationOf | not documentationOf.oclIsUndefined() and documentationOf.oclIsKindOf(cda::DocumentationOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1qTK8F9xEey5t-mahoHmrg" name="ProcedureNote2Authorization" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1qTK8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MU8wsH3sEeyivuDeOiJBMg" name="ProcedureNote2Authorization" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MU8wsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->one(authorization : cda::Authorization | not authorization.oclIsUndefined() and authorization.oclIsKindOf(cda::Authorization))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1rNw8F9xEey5t-mahoHmrg" name="ProcedureNote2ComponentOf" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1rNw8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MV3WsH3sEeyivuDeOiJBMg" name="ProcedureNote2ComponentOf" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MV3WsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->one(componentOf : cda::Component1 | not componentOf.oclIsUndefined() and componentOf.oclIsKindOf(cda::Component1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1tmWkF9xEey5t-mahoHmrg" name="ProcedureNote2ComplicationsSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1tmWkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MX8aUH3sEeyivuDeOiJBMg" name="ProcedureNote2ComplicationsSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MX8aUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ComplicationsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1uJJIF9xEey5t-mahoHmrg" name="ProcedureNote2ProcedureDescriptionSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1uJJIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MYX4IH3sEeyivuDeOiJBMg" name="ProcedureNote2ProcedureDescriptionSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MYX4IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureDescriptionSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1usiwF9xEey5t-mahoHmrg" name="ProcedureNote2ProcedureIndicationsSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1usiwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MYz9AH3sEeyivuDeOiJBMg" name="ProcedureNote2ProcedureIndicationsSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MYz9AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureIndicationsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1vMSAF9xEey5t-mahoHmrg" name="ProcedureNote2PostprocedureDiagnosisSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1vMSAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MZTsQH3sEeyivuDeOiJBMg" name="ProcedureNote2PostprocedureDiagnosisSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MZTsQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PostprocedureDiagnosisSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1vsoUF9xEey5t-mahoHmrg" name="ProcedureNote2AssessmentSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1vtPYF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MZw_QH3sEeyivuDeOiJBMg" name="ProcedureNote2AssessmentSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MZw_QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1wM-oF9xEey5t-mahoHmrg" name="ProcedureNote2AssessmentAndPlanSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1wM-oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MaNEIH3sEeyivuDeOiJBMg" name="ProcedureNote2AssessmentAndPlanSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MaNEIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1wsG0F9xEey5t-mahoHmrg" name="ProcedureNote2PlanOfTreatmentSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1wsG0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MapwEH3sEeyivuDeOiJBMg" name="ProcedureNote2PlanOfTreatmentSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MapwEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1xJZ0F9xEey5t-mahoHmrg" name="ProcedureNote2AllergiesSectionEntriesOptional2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1xJZ0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MbHDEH3sEeyivuDeOiJBMg" name="ProcedureNote2AllergiesSectionEntriesOptional2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MbHDEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1xoiAF9xEey5t-mahoHmrg" name="ProcedureNote2AnesthesiaSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1xoiAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MbkWEH3sEeyivuDeOiJBMg" name="ProcedureNote2AnesthesiaSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MbkWEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AnesthesiaSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1yFN8F9xEey5t-mahoHmrg" name="ProcedureNote2ChiefComplaintSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1yFN8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_McBCAH3sEeyivuDeOiJBMg" name="ProcedureNote2ChiefComplaintSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_McBCAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1ykWIF9xEey5t-mahoHmrg" name="ProcedureNote2ChiefComplaintAndReasonForVisitSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1ykWIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Mcb4wH3sEeyivuDeOiJBMg" name="ProcedureNote2ChiefComplaintAndReasonForVisitSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mcb4wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1zAbAF9xEey5t-mahoHmrg" name="ProcedureNote2FamilyHistorySection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1zAbAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Mc2IcH3sEeyivuDeOiJBMg" name="ProcedureNote2FamilyHistorySection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mc2IcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1zfjMF9xEey5t-mahoHmrg" name="ProcedureNote2HistoryOfPastIllnessSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1zfjMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MdVQoH3sEeyivuDeOiJBMg" name="ProcedureNote2HistoryOfPastIllnessSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MdVQoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1z8PIF9xEey5t-mahoHmrg" name="ProcedureNote2HistoryOfPresentIllnessSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1z8PIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Mdu5QH3sEeyivuDeOiJBMg" name="ProcedureNote2HistoryOfPresentIllnessSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mdu5QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_10awQF9xEey5t-mahoHmrg" name="ProcedureNote2MedicalHistorySection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_10awQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MeJI8H3sEeyivuDeOiJBMg" name="ProcedureNote2MedicalHistorySection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MeJI8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicalHistorySection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1021IF9xEey5t-mahoHmrg" name="ProcedureNote2MedicationsSectionEntriesOptional2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1021IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MeixkH3sEeyivuDeOiJBMg" name="ProcedureNote2MedicationsSectionEntriesOptional2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MeixkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_11aOwF9xEey5t-mahoHmrg" name="ProcedureNote2MedicationsAdministeredSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_11aOwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Me-PYH3sEeyivuDeOiJBMg" name="ProcedureNote2MedicationsAdministeredSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Me-PYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsAdministeredSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_115W8F9xEey5t-mahoHmrg" name="ProcedureNote2PhysicalExamSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_115W8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MfYfEH3sEeyivuDeOiJBMg" name="ProcedureNote2PhysicalExamSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MfYfEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_12X4EF9xEey5t-mahoHmrg" name="ProcedureNote2PlannedProcedureSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_12X4EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MfyuwH3sEeyivuDeOiJBMg" name="ProcedureNote2PlannedProcedureSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MfyuwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlannedProcedureSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_123nUF9xEey5t-mahoHmrg" name="ProcedureNote2ProcedureDispositionSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_123nUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MgNlgH3sEeyivuDeOiJBMg" name="ProcedureNote2ProcedureDispositionSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MgNlgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureDispositionSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_13WvgF9xEey5t-mahoHmrg" name="ProcedureNote2ProcedureEstimatedBloodLossSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_13WvgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MgpqYH3sEeyivuDeOiJBMg" name="ProcedureNote2ProcedureEstimatedBloodLossSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MgpqYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureEstimatedBloodLossSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_13zbcF9xEey5t-mahoHmrg" name="ProcedureNote2ProcedureFindingsSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_130CgF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MhG9YH3sEeyivuDeOiJBMg" name="ProcedureNote2ProcedureFindingsSection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MhG9YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureFindingsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_14TxwF9xEey5t-mahoHmrg" name="ProcedureNote2ProcedureImplantsSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_14TxwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Mhh0IH3sEeyivuDeOiJBMg" name="ProcedureNote2ProcedureImplantsSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mhh0IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureImplantsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_14yS4F9xEey5t-mahoHmrg" name="ProcedureNote2ProcedureSpecimensTakenSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_14yS4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Mh8D0H3sEeyivuDeOiJBMg" name="ProcedureNote2ProcedureSpecimensTakenSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mh8D0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureSpecimensTakenSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_15Q0AF9xEey5t-mahoHmrg" name="ProcedureNote2ProceduresSectionEntriesOptional2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_15Q0AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MiVscH3sEeyivuDeOiJBMg" name="ProcedureNote2ProceduresSectionEntriesOptional2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MiVscX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_15vVIF9xEey5t-mahoHmrg" name="ProcedureNote2ReasonForVisitSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_15vVIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MiwjMH3sEeyivuDeOiJBMg" name="ProcedureNote2ReasonForVisitSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MiwjMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_16PEYF9xEey5t-mahoHmrg" name="ProcedureNote2ReviewOfSystemsSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_16PEYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MjKL0H3sEeyivuDeOiJBMg" name="ProcedureNote2ReviewOfSystemsSection" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MjKL0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_16rwUF9xEey5t-mahoHmrg" name="ProcedureNote2SocialHistorySection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_16sXYF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Mjj0cH3sEeyivuDeOiJBMg" name="ProcedureNote2SocialHistorySection2" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mjj0cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8xkvoF9xEey5t-mahoHmrg" name="ProcedureNote2ParticipantAssociatedEntityClassCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8xkvoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S3R1QH3sEeyivuDeOiJBMg" name="ProcedureNote2ParticipantAssociatedEntityClassCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S3R1QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::IND).associatedEntity->excluding(null)->reject(classCode=vocab::RoleClassAssociative::PROV)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8xlWsF9xEey5t-mahoHmrg" name="ProcedureNote2ParticipantAssociatedEntityAssociatedPerson" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8xlWsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S3ScUH3sEeyivuDeOiJBMg" name="ProcedureNote2ParticipantAssociatedEntityAssociatedPerson" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S3ScUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::IND).associatedEntity->excluding(null)->reject(associatedPerson->one(associatedPerson : cda::Person | not associatedPerson.oclIsUndefined() and associatedPerson.oclIsKindOf(rim::Entity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8xlWsl9xEey5t-mahoHmrg" name="ProcedureNote2ParticipantTypeCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8xlWs19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S3ScUn3sEeyivuDeOiJBMg" name="ProcedureNote2ParticipantTypeCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S3ScU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::IND)->select(typeCode = vocab::ParticipationType::IND)->reject(typeCode=vocab::ParticipationType::IND)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8xl9wF9xEey5t-mahoHmrg" name="ProcedureNote2ParticipantFunctionCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8xl9wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S3ScVH3sEeyivuDeOiJBMg" name="ProcedureNote2ParticipantFunctionCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S3TDYH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::IND)->select(typeCode = vocab::ParticipationType::IND)->reject((functionCode.oclIsUndefined() or functionCode.isNullFlavorUndefined()) implies (not functionCode.oclIsUndefined() and functionCode.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = functionCode.oclAsType(datatypes::CE) in 
 value.code = 'PCP' and value.codeSystem = '2.16.840.1.113883.5.88'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8xl9wl9xEey5t-mahoHmrg" name="ProcedureNote2ParticipantFunctionCodeP" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8xl9w19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S3TDYX3sEeyivuDeOiJBMg" name="ProcedureNote2ParticipantFunctionCodeP" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S3TDYn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::IND)->select(typeCode = vocab::ParticipationType::IND)->reject((functionCode.oclIsUndefined() or functionCode.isNullFlavorUndefined()) implies (not functionCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8xl9xF9xEey5t-mahoHmrg" name="ProcedureNote2ParticipantAssociatedEntity" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8xl9xV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S3TDY33sEeyivuDeOiJBMg" name="ProcedureNote2ParticipantAssociatedEntity" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S3TDZH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->excluding(null)->select(typeCode = vocab::ParticipationType::IND)->select(typeCode = vocab::ParticipationType::IND)->reject(associatedEntity->one(associatedEntity : cda::AssociatedEntity | not associatedEntity.oclIsUndefined() and associatedEntity.oclIsKindOf(cda::AssociatedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8yn4gF9xEey5t-mahoHmrg" name="ProcedureNote2DocumentationOfServiceEventUSRealmDateAndTimeDTLow" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8yn4gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S4UXEH3sEeyivuDeOiJBMg" name="ProcedureNote2DocumentationOfServiceEventUSRealmDateAndTimeDTLow" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S4UXEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((low.oclIsUndefined() or low.isNullFlavorUndefined()) implies (not low.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8zpzQF9xEey5t-mahoHmrg" name="ProcedureNote2DocumentationOfServiceEventPerformerAssignedEntityCodeP" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8zpzQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S5RZUH3sEeyivuDeOiJBMg" name="ProcedureNote2DocumentationOfServiceEventPerformerAssignedEntityCodeP" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S5RZUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8zpzQl9xEey5t-mahoHmrg" name="ProcedureNote2DocumentationOfServiceEventPerformerAssignedEntityCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8zpzQ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S5RZUn3sEeyivuDeOiJBMg" name="ProcedureNote2DocumentationOfServiceEventPerformerAssignedEntityCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S5RZU33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8zqaUF9xEey5t-mahoHmrg" name="ProcedureNote2DocumentationOfServiceEventPerformerTypeCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8zqaUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S5SAYH3sEeyivuDeOiJBMg" name="ProcedureNote2DocumentationOfServiceEventPerformerTypeCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S5SAYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->reject(typeCode=vocab::x_ServiceEventPerformer::PPRF)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8zqaUl9xEey5t-mahoHmrg" name="ProcedureNote2DocumentationOfServiceEventPerformerAssignedEntity" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8zqaU19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S5SAYn3sEeyivuDeOiJBMg" name="ProcedureNote2DocumentationOfServiceEventPerformerAssignedEntity" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S5SAY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_80sVEF9xEey5t-mahoHmrg" name="ProcedureNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCodeP" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_80sVEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S6PCoH3sEeyivuDeOiJBMg" name="ProcedureNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCodeP" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S6PCoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::SPRF).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_80sVEl9xEey5t-mahoHmrg" name="ProcedureNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_80sVE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S6PCon3sEeyivuDeOiJBMg" name="ProcedureNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S6PCo33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::SPRF).assignedEntity->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.101' and not value.code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_80s8IF9xEey5t-mahoHmrg" name="ProcedureNote2DocumentationOfServiceEventPerformerAssistantsTypeCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_80s8IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S6PpsH3sEeyivuDeOiJBMg" name="ProcedureNote2DocumentationOfServiceEventPerformerAssistantsTypeCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S6PpsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::SPRF)->select(typeCode = vocab::x_ServiceEventPerformer::SPRF)->reject(typeCode=vocab::x_ServiceEventPerformer::SPRF)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_80s8Il9xEey5t-mahoHmrg" name="ProcedureNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntity" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_80s8I19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S6Ppsn3sEeyivuDeOiJBMg" name="ProcedureNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntity" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S6Pps33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).performer->excluding(null)->select(typeCode = vocab::x_ServiceEventPerformer::SPRF)->select(typeCode = vocab::x_ServiceEventPerformer::SPRF)->reject(assignedEntity->one(assignedEntity : cda::AssignedEntity | not assignedEntity.oclIsUndefined() and assignedEntity.oclIsKindOf(cda::AssignedEntity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_80s8JF9xEey5t-mahoHmrg" name="ProcedureNote2DocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_80s8JV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S6PptH3sEeyivuDeOiJBMg" name="ProcedureNote2DocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S6PptX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(not effectiveTime.width.oclIsUndefined() xor not effectiveTime.high.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_80tjMF9xEey5t-mahoHmrg" name="ProcedureNote2DocumentationOfServiceEventEffectiveTimeNoHighIfWidth" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_80tjMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S6QQwH3sEeyivuDeOiJBMg" name="ProcedureNote2DocumentationOfServiceEventEffectiveTimeNoHighIfWidth" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S6QQwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(not effectiveTime.width.oclIsUndefined() xor not effectiveTime.high.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_80tjMl9xEey5t-mahoHmrg" name="ProcedureNote2DocumentationOfServiceEventProcedureCodes" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_80tjM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S6QQwn3sEeyivuDeOiJBMg" name="ProcedureNote2DocumentationOfServiceEventProcedureCodes" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S6QQw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(code.codeSystem = '2.16.840.1.113883.6.104' or code.codeSystem = '2.16.840.1.113883.6.12' or code.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_80uKQF9xEey5t-mahoHmrg" name="ProcedureNote2DocumentationOfServiceEventEffectiveTime" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_80uKQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S6QQxH3sEeyivuDeOiJBMg" name="ProcedureNote2DocumentationOfServiceEventEffectiveTime" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S6QQxX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_80uKQl9xEey5t-mahoHmrg" name="ProcedureNote2DocumentationOfServiceEventCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_80uKQ19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S6Q30H3sEeyivuDeOiJBMg" name="ProcedureNote2DocumentationOfServiceEventCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S6Q30X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_80uKRF9xEey5t-mahoHmrg" name="ProcedureNote2DocumentationOfServiceEventPerformer" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_80uKRV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S6Q30n3sEeyivuDeOiJBMg" name="ProcedureNote2DocumentationOfServiceEventPerformer" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S6Q3033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(performer->select(performer : cda::Performer1 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer1))->select(typeCode = vocab::x_ServiceEventPerformer::PPRF)->notEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_80uxUF9xEey5t-mahoHmrg" name="ProcedureNote2DocumentationOfServiceEventPerformerAssistants" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_80uxUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S6Re4H3sEeyivuDeOiJBMg" name="ProcedureNote2DocumentationOfServiceEventPerformerAssistants" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S6Re4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(performer->select(performer : cda::Performer1 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer1))->select(typeCode = vocab::x_ServiceEventPerformer::SPRF)->notEmpty())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_80uxUl9xEey5t-mahoHmrg" name="ProcedureNote2DocumentationOfServiceEvent" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_80uxU19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S6Re4n3sEeyivuDeOiJBMg" name="ProcedureNote2DocumentationOfServiceEvent" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S6Re433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null)->reject(serviceEvent->one(serviceEvent : cda::ServiceEvent | not serviceEvent.oclIsUndefined() and serviceEvent.oclIsKindOf(cda::ServiceEvent)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_81wsEF9xEey5t-mahoHmrg" name="ProcedureNote2AuthorizationConsentClassCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_81wsEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S7N6EH3sEeyivuDeOiJBMg" name="ProcedureNote2AuthorizationConsentClassCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S7N6EX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->excluding(null).consent->excluding(null)->reject(isDefined('classCode') and classCode=vocab::ActClass::CONS)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_81xTIF9xEey5t-mahoHmrg" name="ProcedureNote2AuthorizationConsentMoodCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_81xTIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S7N6En3sEeyivuDeOiJBMg" name="ProcedureNote2AuthorizationConsentMoodCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S7N6E33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->excluding(null).consent->excluding(null)->reject(isDefined('moodCode') and moodCode=vocab::ActMood::EVN)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_81xTIl9xEey5t-mahoHmrg" name="ProcedureNote2AuthorizationConsentStatusCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_81xTI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S7N6FH3sEeyivuDeOiJBMg" name="ProcedureNote2AuthorizationConsentStatusCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S7N6FX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->excluding(null).consent->excluding(null)->reject((statusCode.oclIsUndefined() or statusCode.isNullFlavorUndefined()) implies (not statusCode.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_81xTJF9xEey5t-mahoHmrg" name="ProcedureNote2AuthorizationTypeCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_81xTJV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S7OhIH3sEeyivuDeOiJBMg" name="ProcedureNote2AuthorizationTypeCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S7OhIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->excluding(null)->reject(isDefined('typeCode') and typeCode=vocab::ActRelationshipType::AUTH)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_81x6MF9xEey5t-mahoHmrg" name="ProcedureNote2AuthorizationConsent" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_81x6MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S7OhIn3sEeyivuDeOiJBMg" name="ProcedureNote2AuthorizationConsent" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S7OhI33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.authorization->excluding(null)->reject(consent->one(consent : cda::Consent | not consent.oclIsUndefined() and consent.oclIsKindOf(cda::Consent)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_83UyUF9xEey5t-mahoHmrg" name="ProcedureNote2ComponentOfEncompassingEncounterEncounterParticipantTypeCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_83UyUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S8uV8H3sEeyivuDeOiJBMg" name="ProcedureNote2ComponentOfEncompassingEncounterEncounterParticipantTypeCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S8uV8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).encounterParticipant->excluding(null)->reject(typeCode=vocab::x_EncounterParticipant::REF)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_84ny0F9xEey5t-mahoHmrg" name="ProcedureNote2ComponentOfEncompassingEncounterLocationHealthCareFacilityId" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_84ny0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S9rYMH3sEeyivuDeOiJBMg" name="ProcedureNote2ComponentOfEncompassingEncounterLocationHealthCareFacilityId" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S9rYMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).location->excluding(null).healthCareFacility->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_84oZ4F9xEey5t-mahoHmrg" name="ProcedureNote2ComponentOfEncompassingEncounterLocationHealthCareFacility" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_84oZ4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S9rYMn3sEeyivuDeOiJBMg" name="ProcedureNote2ComponentOfEncompassingEncounterLocationHealthCareFacility" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S9rYM33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).location->excluding(null)->reject(healthCareFacility->one(healthCareFacility : cda::HealthCareFacility | not healthCareFacility.oclIsUndefined() and healthCareFacility.oclIsKindOf(cda::HealthCareFacility)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_84oZ4l9xEey5t-mahoHmrg" name="ProcedureNote2ComponentOfEncompassingEncounterId" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_84oZ419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S9rYNH3sEeyivuDeOiJBMg" name="ProcedureNote2ComponentOfEncompassingEncounterId" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S9rYNX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_84pA8F9xEey5t-mahoHmrg" name="ProcedureNote2ComponentOfEncompassingEncounterCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_84pA8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S9r_QH3sEeyivuDeOiJBMg" name="ProcedureNote2ComponentOfEncompassingEncounterCode" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S9r_QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_84pA8l9xEey5t-mahoHmrg" name="ProcedureNote2ComponentOfEncompassingEncounterEncounterParticipant" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_84pA819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S9r_Qn3sEeyivuDeOiJBMg" name="ProcedureNote2ComponentOfEncompassingEncounterEncounterParticipant" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S9r_Q33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(encounterParticipant->one(encounterParticipant : cda::EncounterParticipant | not encounterParticipant.oclIsUndefined() and encounterParticipant.oclIsKindOf(cda::EncounterParticipant)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_84poAF9xEey5t-mahoHmrg" name="ProcedureNote2ComponentOfEncompassingEncounterLocation" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_84poAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S9r_RH3sEeyivuDeOiJBMg" name="ProcedureNote2ComponentOfEncompassingEncounterLocation" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S9smUH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(location->exists(location : cda::Location | not location.oclIsUndefined() and location.oclIsKindOf(cda::Location)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_84poAl9xEey5t-mahoHmrg" name="ProcedureNote2ComponentOfEncompassingEncounter" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_84poA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_S9smUX3sEeyivuDeOiJBMg" name="ProcedureNote2ComponentOfEncompassingEncounter" constrainedElement="_JD8b0C4pEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_S9smUn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null)->reject(encompassingEncounter->one(encompassingEncounter : cda::EncompassingEncounter | not encompassingEncounter.oclIsUndefined() and encompassingEncounter.oclIsKindOf(cda::EncompassingEncounter)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_JD8b0S4pEeSoCqqrpX8LzQ" general="_dduXkJ5OEeOr4eM3k36wAg"/>
-      <ownedOperation xmi:id="_1tm9oF9xEey5t-mahoHmrg" name="getComplicationsSection2" bodyCondition="_1tm9o19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1tm9o19xEey5t-mahoHmrg" name="body" constrainedElement="_1tm9oF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1tm9pF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MX8aUn3sEeyivuDeOiJBMg" name="getComplicationsSection2" bodyCondition="_MX9BYX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MX9BYX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MX8aUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MX9BYn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ComplicationsSection2))->asSequence()->any(true).oclAsType(consol::ComplicationsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1tm9oV9xEey5t-mahoHmrg" type="_6M-msPvXEeOes-3T-2HryA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1tm9ol9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MX8aU33sEeyivuDeOiJBMg" type="_6M-msPvXEeOes-3T-2HryA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MX9BYH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1uJwMF9xEey5t-mahoHmrg" name="getProcedureDescriptionSection" bodyCondition="_1uJwM19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1uJwM19xEey5t-mahoHmrg" name="body" constrainedElement="_1uJwMF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1uJwNF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MYX4In3sEeyivuDeOiJBMg" name="getProcedureDescriptionSection" bodyCondition="_MYX4JX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MYX4JX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MYX4In3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MYX4Jn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureDescriptionSection))->asSequence()->any(true).oclAsType(consol::ProcedureDescriptionSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1uJwMV9xEey5t-mahoHmrg" type="_HNUIIDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1uJwMl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MYX4I33sEeyivuDeOiJBMg" type="_HNUIIDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MYX4JH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1usiwl9xEey5t-mahoHmrg" name="getProcedureIndicationsSection2" bodyCondition="_1usixV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1usixV9xEey5t-mahoHmrg" name="body" constrainedElement="_1usiwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1usixl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MY0kEH3sEeyivuDeOiJBMg" name="getProcedureIndicationsSection2" bodyCondition="_MY0kE33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MY0kE33sEeyivuDeOiJBMg" name="body" constrainedElement="_MY0kEH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MY0kFH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureIndicationsSection2))->asSequence()->any(true).oclAsType(consol::ProcedureIndicationsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1usiw19xEey5t-mahoHmrg" type="_5_O94AByEeSjnfOPJpFg3A" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1usixF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MY0kEX3sEeyivuDeOiJBMg" type="_5_O94AByEeSjnfOPJpFg3A" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MY0kEn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1vMSAl9xEey5t-mahoHmrg" name="getPostprocedureDiagnosisSection2" bodyCondition="_1vM5EV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1vM5EV9xEey5t-mahoHmrg" name="body" constrainedElement="_1vMSAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1vM5El9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MZTsQn3sEeyivuDeOiJBMg" name="getPostprocedureDiagnosisSection2" bodyCondition="_MZTsRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MZTsRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MZTsQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MZTsRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PostprocedureDiagnosisSection2))->asSequence()->any(true).oclAsType(consol::PostprocedureDiagnosisSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1vMSA19xEey5t-mahoHmrg" type="_MLNngP5BEeOmw9RN80Tpig" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1vM5EF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MZTsQ33sEeyivuDeOiJBMg" type="_MLNngP5BEeOmw9RN80Tpig" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MZTsRH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1vtPYV9xEey5t-mahoHmrg" name="getAssessmentSection" bodyCondition="_1vtPZF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1vtPZF9xEey5t-mahoHmrg" name="body" constrainedElement="_1vtPYV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1vtPZV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MZw_Qn3sEeyivuDeOiJBMg" name="getAssessmentSection" bodyCondition="_MZw_RX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MZw_RX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MZw_Qn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MZw_Rn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))->asSequence()->any(true).oclAsType(consol::AssessmentSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1vtPYl9xEey5t-mahoHmrg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1vtPY19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MZw_Q33sEeyivuDeOiJBMg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MZw_RH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1wM-ol9xEey5t-mahoHmrg" name="getAssessmentAndPlanSection2" bodyCondition="_1wM-pV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1wM-pV9xEey5t-mahoHmrg" name="body" constrainedElement="_1wM-ol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1wM-pl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MaNEIn3sEeyivuDeOiJBMg" name="getAssessmentAndPlanSection2" bodyCondition="_MaNEJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MaNEJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MaNEIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MaNEJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection2))->asSequence()->any(true).oclAsType(consol::AssessmentAndPlanSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1wM-o19xEey5t-mahoHmrg" type="_q_8twPvVEeOvZJBdQKQrqQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1wM-pF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MaNEI33sEeyivuDeOiJBMg" type="_q_8twPvVEeOvZJBdQKQrqQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MaNEJH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1wsG0l9xEey5t-mahoHmrg" name="getPlanOfTreatmentSection2" bodyCondition="_1wsG1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1wsG1V9xEey5t-mahoHmrg" name="body" constrainedElement="_1wsG0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1wsG1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MapwEn3sEeyivuDeOiJBMg" name="getPlanOfTreatmentSection2" bodyCondition="_MapwFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MapwFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MapwEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MapwFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2))->asSequence()->any(true).oclAsType(consol::PlanOfTreatmentSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1wsG019xEey5t-mahoHmrg" type="_bwml0P4yEeO_Yb9cO8w3bA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1wsG1F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MapwE33sEeyivuDeOiJBMg" type="_bwml0P4yEeO_Yb9cO8w3bA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MapwFH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1xKA4F9xEey5t-mahoHmrg" name="getAllergiesSectionEntriesOptional2" bodyCondition="_1xKA419xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1xKA419xEey5t-mahoHmrg" name="body" constrainedElement="_1xKA4F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1xKA5F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MbHDEn3sEeyivuDeOiJBMg" name="getAllergiesSectionEntriesOptional2" bodyCondition="_MbHqIn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MbHqIn3sEeyivuDeOiJBMg" name="body" constrainedElement="_MbHDEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MbHqI33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::AllergiesSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1xKA4V9xEey5t-mahoHmrg" type="_nWAcMAIjEeSVzfoPSatgpg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1xKA4l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MbHqIH3sEeyivuDeOiJBMg" type="_nWAcMAIjEeSVzfoPSatgpg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MbHqIX3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1xoiAl9xEey5t-mahoHmrg" name="getAnesthesiaSection2" bodyCondition="_1xoiBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1xoiBV9xEey5t-mahoHmrg" name="body" constrainedElement="_1xoiAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1xoiBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Mbk9IH3sEeyivuDeOiJBMg" name="getAnesthesiaSection2" bodyCondition="_Mbk9I33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Mbk9I33sEeyivuDeOiJBMg" name="body" constrainedElement="_Mbk9IH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mbk9JH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AnesthesiaSection2))->asSequence()->any(true).oclAsType(consol::AnesthesiaSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1xoiA19xEey5t-mahoHmrg" type="_aetyEPu_EeOyiMEKhdqMGA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1xoiBF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Mbk9IX3sEeyivuDeOiJBMg" type="_aetyEPu_EeOyiMEKhdqMGA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mbk9In3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1yFN8l9xEey5t-mahoHmrg" name="getChiefComplaintSection" bodyCondition="_1yFN9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1yFN9V9xEey5t-mahoHmrg" name="body" constrainedElement="_1yFN8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1yFN9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_McBCAn3sEeyivuDeOiJBMg" name="getChiefComplaintSection" bodyCondition="_McBCBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_McBCBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_McBCAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_McBCBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))->asSequence()->any(true).oclAsType(consol::ChiefComplaintSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1yFN819xEey5t-mahoHmrg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1yFN9F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_McBCA33sEeyivuDeOiJBMg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_McBCBH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1ykWIl9xEey5t-mahoHmrg" name="getChiefComplaintAndReasonForVisitSection" bodyCondition="_1ykWJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1ykWJV9xEey5t-mahoHmrg" name="body" constrainedElement="_1ykWIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1ykWJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Mccf0H3sEeyivuDeOiJBMg" name="getChiefComplaintAndReasonForVisitSection" bodyCondition="_Mccf033sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Mccf033sEeyivuDeOiJBMg" name="body" constrainedElement="_Mccf0H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mccf1H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintAndReasonForVisitSection))->asSequence()->any(true).oclAsType(consol::ChiefComplaintAndReasonForVisitSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1ykWI19xEey5t-mahoHmrg" type="_oI7CQCsaEeGHF88-qhhUMA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1ykWJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Mccf0X3sEeyivuDeOiJBMg" type="_oI7CQCsaEeGHF88-qhhUMA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mccf0n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1zBCEF9xEey5t-mahoHmrg" name="getFamilyHistorySection2" bodyCondition="_1zBCE19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1zBCE19xEey5t-mahoHmrg" name="body" constrainedElement="_1zBCEF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1zBCFF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Mc2Icn3sEeyivuDeOiJBMg" name="getFamilyHistorySection2" bodyCondition="_Mc2IdX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Mc2IdX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Mc2Icn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mc2Idn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::FamilyHistorySection2))->asSequence()->any(true).oclAsType(consol::FamilyHistorySection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1zBCEV9xEey5t-mahoHmrg" type="_NGivoIevEeSBauRYePLghA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1zBCEl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Mc2Ic33sEeyivuDeOiJBMg" type="_NGivoIevEeSBauRYePLghA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mc2IdH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1zfjMl9xEey5t-mahoHmrg" name="getHistoryOfPastIllnessSection2" bodyCondition="_1zfjNV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1zfjNV9xEey5t-mahoHmrg" name="body" constrainedElement="_1zfjMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1zfjNl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MdVQon3sEeyivuDeOiJBMg" name="getHistoryOfPastIllnessSection2" bodyCondition="_MdVQpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MdVQpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MdVQon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MdVQpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPastIllnessSection2))->asSequence()->any(true).oclAsType(consol::HistoryOfPastIllnessSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1zfjM19xEey5t-mahoHmrg" type="_sZlggPyhEeOC19UEcu7MOw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1zfjNF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MdVQo33sEeyivuDeOiJBMg" type="_sZlggPyhEeOC19UEcu7MOw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MdVQpH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1z82MF9xEey5t-mahoHmrg" name="getHistoryOfPresentIllnessSection" bodyCondition="_1z82M19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1z82M19xEey5t-mahoHmrg" name="body" constrainedElement="_1z82MF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1z82NF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Mdu5Qn3sEeyivuDeOiJBMg" name="getHistoryOfPresentIllnessSection" bodyCondition="_MdvgUn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MdvgUn3sEeyivuDeOiJBMg" name="body" constrainedElement="_Mdu5Qn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MdvgU33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::HistoryOfPresentIllnessSection))->asSequence()->any(true).oclAsType(consol::HistoryOfPresentIllnessSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1z82MV9xEey5t-mahoHmrg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1z82Ml9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MdvgUH3sEeyivuDeOiJBMg" type="_2PcWsRSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MdvgUX3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_10bXUF9xEey5t-mahoHmrg" name="getMedicalHistorySection" bodyCondition="_10bXU19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_10bXU19xEey5t-mahoHmrg" name="body" constrainedElement="_10bXUF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_10bXVF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MeJI8n3sEeyivuDeOiJBMg" name="getMedicalHistorySection" bodyCondition="_MeJI9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MeJI9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_MeJI8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MeJI9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicalHistorySection))->asSequence()->any(true).oclAsType(consol::MedicalHistorySection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_10bXUV9xEey5t-mahoHmrg" type="_mEIgwDVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_10bXUl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MeJI833sEeyivuDeOiJBMg" type="_mEIgwDVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MeJI9H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_1021Il9xEey5t-mahoHmrg" name="getMedicationsSectionEntriesOptional2" bodyCondition="_1021JV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1021JV9xEey5t-mahoHmrg" name="body" constrainedElement="_1021Il9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1021Jl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MejYoH3sEeyivuDeOiJBMg" name="getMedicationsSectionEntriesOptional2" bodyCondition="_MejYo33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MejYo33sEeyivuDeOiJBMg" name="body" constrainedElement="_MejYoH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MejYpH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::MedicationsSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1021I19xEey5t-mahoHmrg" type="_JUvaUAFaEeS0nNJt6oyOyQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1021JF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MejYoX3sEeyivuDeOiJBMg" type="_JUvaUAFaEeS0nNJt6oyOyQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MejYon3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_11aOwl9xEey5t-mahoHmrg" name="getMedicationsAdministeredSection2" bodyCondition="_11aOxV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_11aOxV9xEey5t-mahoHmrg" name="body" constrainedElement="_11aOwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_11aOxl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Me-PYn3sEeyivuDeOiJBMg" name="getMedicationsAdministeredSection2" bodyCondition="_Me-2cn3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Me-2cn3sEeyivuDeOiJBMg" name="body" constrainedElement="_Me-PYn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Me-2c33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsAdministeredSection2))->asSequence()->any(true).oclAsType(consol::MedicationsAdministeredSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_11aOw19xEey5t-mahoHmrg" type="_F37nMP4jEeOwFalSp0fRiw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_11aOxF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Me-2cH3sEeyivuDeOiJBMg" type="_F37nMP4jEeOwFalSp0fRiw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Me-2cX3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_115W8l9xEey5t-mahoHmrg" name="getPhysicalExamSection2" bodyCondition="_115W9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_115W9V9xEey5t-mahoHmrg" name="body" constrainedElement="_115W8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_115W9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MfYfEn3sEeyivuDeOiJBMg" name="getPhysicalExamSection2" bodyCondition="_MfYfFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MfYfFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MfYfEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MfZGIH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection2))->asSequence()->any(true).oclAsType(consol::PhysicalExamSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_115W819xEey5t-mahoHmrg" type="_-nZiYP4uEeObaveuCI77uA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_115W9F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MfYfE33sEeyivuDeOiJBMg" type="_-nZiYP4uEeObaveuCI77uA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MfYfFH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_12X4El9xEey5t-mahoHmrg" name="getPlannedProcedureSection2" bodyCondition="_12YfIl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_12YfIl9xEey5t-mahoHmrg" name="body" constrainedElement="_12X4El9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_12YfI19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MfzV0H3sEeyivuDeOiJBMg" name="getPlannedProcedureSection2" bodyCondition="_MfzV033sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MfzV033sEeyivuDeOiJBMg" name="body" constrainedElement="_MfzV0H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MfzV1H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlannedProcedureSection2))->asSequence()->any(true).oclAsType(consol::PlannedProcedureSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_12YfIF9xEey5t-mahoHmrg" type="_dz0ZwP49EeO_F_2qLv6FWQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_12YfIV9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MfzV0X3sEeyivuDeOiJBMg" type="_dz0ZwP49EeO_F_2qLv6FWQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MfzV0n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_123nUl9xEey5t-mahoHmrg" name="getProcedureDispositionSection" bodyCondition="_123nVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_123nVV9xEey5t-mahoHmrg" name="body" constrainedElement="_123nUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_123nVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MgNlgn3sEeyivuDeOiJBMg" name="getProcedureDispositionSection" bodyCondition="_MgNlhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MgNlhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MgNlgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MgNlhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureDispositionSection))->asSequence()->any(true).oclAsType(consol::ProcedureDispositionSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_123nU19xEey5t-mahoHmrg" type="_QhXGYDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_123nVF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MgNlg33sEeyivuDeOiJBMg" type="_QhXGYDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MgNlhH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_13XWkF9xEey5t-mahoHmrg" name="getProcedureEstimatedBloodLossSection" bodyCondition="_13XWk19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_13XWk19xEey5t-mahoHmrg" name="body" constrainedElement="_13XWkF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_13XWlF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MgqRcH3sEeyivuDeOiJBMg" name="getProcedureEstimatedBloodLossSection" bodyCondition="_MgqRc33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MgqRc33sEeyivuDeOiJBMg" name="body" constrainedElement="_MgqRcH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MgqRdH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureEstimatedBloodLossSection))->asSequence()->any(true).oclAsType(consol::ProcedureEstimatedBloodLossSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_13XWkV9xEey5t-mahoHmrg" type="_TvcL8DVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_13XWkl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MgqRcX3sEeyivuDeOiJBMg" type="_TvcL8DVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MgqRcn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_130CgV9xEey5t-mahoHmrg" name="getProcedureFindingsSection2" bodyCondition="_130ChF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_130ChF9xEey5t-mahoHmrg" name="body" constrainedElement="_130CgV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_130ChV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MhG9Yn3sEeyivuDeOiJBMg" name="getProcedureFindingsSection2" bodyCondition="_MhHkcX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MhHkcX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MhG9Yn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MhHkcn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureFindingsSection2))->asSequence()->any(true).oclAsType(consol::ProcedureFindingsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_130Cgl9xEey5t-mahoHmrg" type="_lLOykP5FEeO_r7yO9mhwnA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_130Cg19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MhG9Y33sEeyivuDeOiJBMg" type="_lLOykP5FEeO_r7yO9mhwnA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MhHkcH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_14Txwl9xEey5t-mahoHmrg" name="getProcedureImplantsSection" bodyCondition="_14TxxV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_14TxxV9xEey5t-mahoHmrg" name="body" constrainedElement="_14Txwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_14UY0F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Mhh0In3sEeyivuDeOiJBMg" name="getProcedureImplantsSection" bodyCondition="_Mhh0JX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Mhh0JX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Mhh0In3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mhh0Jn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureImplantsSection))->asSequence()->any(true).oclAsType(consol::ProcedureImplantsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_14Txw19xEey5t-mahoHmrg" type="_Z662wDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_14TxxF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Mhh0I33sEeyivuDeOiJBMg" type="_Z662wDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mhh0JH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_14y58F9xEey5t-mahoHmrg" name="getProcedureSpecimensTakenSection" bodyCondition="_14y5819xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_14y5819xEey5t-mahoHmrg" name="body" constrainedElement="_14y58F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_14y59F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Mh8q4H3sEeyivuDeOiJBMg" name="getProcedureSpecimensTakenSection" bodyCondition="_Mh8q433sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Mh8q433sEeyivuDeOiJBMg" name="body" constrainedElement="_Mh8q4H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mh8q5H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProcedureSpecimensTakenSection))->asSequence()->any(true).oclAsType(consol::ProcedureSpecimensTakenSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_14y58V9xEey5t-mahoHmrg" type="_gSUdsDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_14y58l9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Mh8q4X3sEeyivuDeOiJBMg" type="_gSUdsDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mh8q4n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_15Q0Al9xEey5t-mahoHmrg" name="getProceduresSectionEntriesOptional2" bodyCondition="_15Q0BV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_15Q0BV9xEey5t-mahoHmrg" name="body" constrainedElement="_15Q0Al9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_15Q0Bl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MiWTgH3sEeyivuDeOiJBMg" name="getProceduresSectionEntriesOptional2" bodyCondition="_MiWTg33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MiWTg33sEeyivuDeOiJBMg" name="body" constrainedElement="_MiWTgH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MiWThH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProceduresSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::ProceduresSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_15Q0A19xEey5t-mahoHmrg" type="_80dMoAB0EeSLOb2O6vSPzg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_15Q0BF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MiWTgX3sEeyivuDeOiJBMg" type="_80dMoAB0EeSLOb2O6vSPzg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MiWTgn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_15vVIl9xEey5t-mahoHmrg" name="getReasonForVisitSection" bodyCondition="_15vVJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_15vVJV9xEey5t-mahoHmrg" name="body" constrainedElement="_15vVIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_15vVJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MiwjMn3sEeyivuDeOiJBMg" name="getReasonForVisitSection" bodyCondition="_MiwjNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MiwjNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MiwjMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MiwjNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReasonForVisitSection))->asSequence()->any(true).oclAsType(consol::ReasonForVisitSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_15vVI19xEey5t-mahoHmrg" type="_Nm64UCscEeGHF88-qhhUMA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_15vVJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MiwjM33sEeyivuDeOiJBMg" type="_Nm64UCscEeGHF88-qhhUMA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MiwjNH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_16PrcF9xEey5t-mahoHmrg" name="getReviewOfSystemsSection" bodyCondition="_16Prc19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_16Prc19xEey5t-mahoHmrg" name="body" constrainedElement="_16PrcF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_16PrdF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MjKL0n3sEeyivuDeOiJBMg" name="getReviewOfSystemsSection" bodyCondition="_MjKL1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MjKL1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_MjKL0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MjKL1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))->asSequence()->any(true).oclAsType(consol::ReviewOfSystemsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_16PrcV9xEey5t-mahoHmrg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_16Prcl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MjKL033sEeyivuDeOiJBMg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MjKL1H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_16sXYV9xEey5t-mahoHmrg" name="getSocialHistorySection2" bodyCondition="_16sXZF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_16sXZF9xEey5t-mahoHmrg" name="body" constrainedElement="_16sXYV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_16sXZV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Mjj0cn3sEeyivuDeOiJBMg" name="getSocialHistorySection2" bodyCondition="_Mjj0dX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Mjj0dX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Mjj0cn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mjj0dn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SocialHistorySection2))->asSequence()->any(true).oclAsType(consol::SocialHistorySection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_16sXYl9xEey5t-mahoHmrg" type="_wLWZMAFHEeSG_MJH-zNFRw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_16sXY19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Mjj0c33sEeyivuDeOiJBMg" type="_wLWZMAFHEeSG_MJH-zNFRw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mjj0dH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -39451,387 +39451,387 @@ A Progress Note is not a re-evaluation note. A Progress Note is not intended to
           <body>(self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2)) or  self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))) xor self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_16sXZl9xEey5t-mahoHmrg" name="USRealmHeader2TemplateId" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_16s-cF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MjkbgH3sEeyivuDeOiJBMg" name="USRealmHeader2TemplateId" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MjkbgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.9' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_17N70F9xEey5t-mahoHmrg" name="ProgressNote2CodeP" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_17N70V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MkBugH3sEeyivuDeOiJBMg" name="ProgressNote2CodeP" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MkBugX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_16uMkF9xEey5t-mahoHmrg" name="ProgressNote2Code" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_16uMkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MjlpoH3sEeyivuDeOiJBMg" name="ProgressNote2Code" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MjlpoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '11506-3' or value.code = '18733-6' or value.code = '18762-5' or value.code = '28569-2' or value.code = '28617-9' or value.code = '34900-1' or value.code = '34904-3' or value.code = '18764-1' or value.code = '28623-7' or value.code = '11507-1' or value.code = '11508-9' or value.code = '11509-7' or value.code = '28627-8' or value.code = '11510-5' or value.code = '28656-7' or value.code = '11512-1' or value.code = '34126-3' or value.code = '15507-7' or value.code = '34129-7' or value.code = '34125-5' or value.code = '34130-5' or value.code = '34131-3' or value.code = '34124-8' or value.code = '34127-1' or value.code = '34128-9' or value.code = '34901-9' or value.code = '34132-1'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_18d5AF9xEey5t-mahoHmrg" name="ProgressNote2DocumentationOf" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_18d5AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MlMMIH3sEeyivuDeOiJBMg" name="ProgressNote2DocumentationOf" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MlMzMH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->one(documentationOf : cda::DocumentationOf | not documentationOf.oclIsUndefined() and documentationOf.oclIsKindOf(cda::DocumentationOf))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_19d-kF9xEey5t-mahoHmrg" name="ProgressNote2ComponentOf" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_19d-kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MmKcgH3sEeyivuDeOiJBMg" name="ProgressNote2ComponentOf" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MmKcgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->one(componentOf : cda::Component1 | not componentOf.oclIsUndefined() and componentOf.oclIsKindOf(cda::Component1))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_1_pI0F9xEey5t-mahoHmrg" name="ProgressNote2AssessmentSection" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_1_pI0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Mn3ssH3sEeyivuDeOiJBMg" name="ProgressNote2AssessmentSection" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mn3ssX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2AKtQF9xEey5t-mahoHmrg" name="ProgressNote2PlanOfTreatmentSection2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2AKtQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MoR8YH3sEeyivuDeOiJBMg" name="ProgressNote2PlanOfTreatmentSection2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MoR8YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2Ap1cF9xEey5t-mahoHmrg" name="ProgressNote2AssessmentAndPlanSection2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2Ap1cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Mov2cH3sEeyivuDeOiJBMg" name="ProgressNote2AssessmentAndPlanSection2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mov2cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2BJksF9xEey5t-mahoHmrg" name="ProgressNote2AllergiesSectionEntriesOptional2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2BJksV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MpNJcH3sEeyivuDeOiJBMg" name="ProgressNote2AllergiesSectionEntriesOptional2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MpNJcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2BnewF9xEey5t-mahoHmrg" name="ProgressNote2ChiefComplaintSection" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2BnewV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MponQH3sEeyivuDeOiJBMg" name="ProgressNote2ChiefComplaintSection" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MponQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2CHOAF9xEey5t-mahoHmrg" name="ProgressNote2InterventionsSection2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2CHOAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MqEFEH3sEeyivuDeOiJBMg" name="ProgressNote2InterventionsSection2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MqEFEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::InterventionsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2CjS4F9xEey5t-mahoHmrg" name="ProgressNote2InstructionsSection2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2CjS4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MqeUwH3sEeyivuDeOiJBMg" name="ProgressNote2InstructionsSection2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MqeUwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::InstructionsSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2DCbEF9xEey5t-mahoHmrg" name="ProgressNote2MedicationsSectionEntriesOptional2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2DCbEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Mq5ykH3sEeyivuDeOiJBMg" name="ProgressNote2MedicationsSectionEntriesOptional2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mq5ykX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2DfuEF9xEey5t-mahoHmrg" name="ProgressNote2ObjectiveSection" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2DfuEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MrTbMH3sEeyivuDeOiJBMg" name="ProgressNote2ObjectiveSection" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MrTbMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ObjectiveSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2D-PMF9xEey5t-mahoHmrg" name="ProgressNote2PhysicalExamSection2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2D-PMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Mrtq4H3sEeyivuDeOiJBMg" name="ProgressNote2PhysicalExamSection2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mrtq4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2EbiMF9xEey5t-mahoHmrg" name="ProgressNote2ProblemSectionEntriesOptional2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2EbiMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MsIhoH3sEeyivuDeOiJBMg" name="ProgressNote2ProblemSectionEntriesOptional2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MsIhoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2E7RcF9xEey5t-mahoHmrg" name="ProgressNote2ResultsSectionEntriesOptional2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2E7RcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Msnp0H3sEeyivuDeOiJBMg" name="ProgressNote2ResultsSectionEntriesOptional2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Msnp0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2FZLgF9xEey5t-mahoHmrg" name="ProgressNote2ReviewOfSystemsSection" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2FZLgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MtEVwH3sEeyivuDeOiJBMg" name="ProgressNote2ReviewOfSystemsSection" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MtEVwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2F5h0F9xEey5t-mahoHmrg" name="ProgressNote2SubjectiveSection" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2F5h0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MtfMgH3sEeyivuDeOiJBMg" name="ProgressNote2SubjectiveSection" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MtfMgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SubjectiveSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2GW00F9xEey5t-mahoHmrg" name="ProgressNote2VitalSignsSectionEntriesOptional2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2GXb4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Mt5cMH3sEeyivuDeOiJBMg" name="ProgressNote2VitalSignsSectionEntriesOptional2" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mt5cMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSectionEntriesOptional2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3RRv0F9xEey5t-mahoHmrg" name="ProgressNote2NutritionSection" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3RRv0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Nu0GoH3sEeyivuDeOiJBMg" name="ProgressNote2NutritionSection" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Nu0GoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.getAllSections()->one(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::NutritionSection))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_875wUF9xEey5t-mahoHmrg" name="ProgressNote2DocumentationOfServiceEventUSRealmDateAndTimeDTLow" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_875wUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TAy9oH3sEeyivuDeOiJBMg" name="ProgressNote2DocumentationOfServiceEventUSRealmDateAndTimeDTLow" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TAy9oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((low.oclIsUndefined() or low.isNullFlavorUndefined()) implies (not low.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_875wUl9xEey5t-mahoHmrg" name="ProgressNote2DocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_875wU19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TAy9on3sEeyivuDeOiJBMg" name="ProgressNote2DocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TAy9o33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(not effectiveTime.width.oclIsUndefined() xor not effectiveTime.high.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_876XYF9xEey5t-mahoHmrg" name="ProgressNote2DocumentationOfServiceEventTemplateId" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_876XYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TAzksH3sEeyivuDeOiJBMg" name="ProgressNote2DocumentationOfServiceEventTemplateId" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TAzksX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.21.3.1'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_876-cF9xEey5t-mahoHmrg" name="ProgressNote2DocumentationOfServiceEventClassCode" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_876-cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TAzksn3sEeyivuDeOiJBMg" name="ProgressNote2DocumentationOfServiceEventClassCode" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TAzks33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject(isDefined('classCode') and classCode=vocab::ActClassRoot::PCPR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_876-cl9xEey5t-mahoHmrg" name="ProgressNote2DocumentationOfServiceEventEffectiveTime" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_876-c19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TA0LwH3sEeyivuDeOiJBMg" name="ProgressNote2DocumentationOfServiceEventEffectiveTime" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TA0LwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null).serviceEvent->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_877lgF9xEey5t-mahoHmrg" name="ProgressNote2DocumentationOfServiceEvent" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_877lgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TA0Lwn3sEeyivuDeOiJBMg" name="ProgressNote2DocumentationOfServiceEvent" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TA0Lw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.documentationOf->excluding(null)->reject(serviceEvent->one(serviceEvent : cda::ServiceEvent | not serviceEvent.oclIsUndefined() and serviceEvent.oclIsKindOf(cda::ServiceEvent)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_88-uYF9xEey5t-mahoHmrg" name="ProgressNote2ComponentOfEncompassingEncounterUSRealmDateAndTimeDTLow" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_88-uYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TBycIH3sEeyivuDeOiJBMg" name="ProgressNote2ComponentOfEncompassingEncounterUSRealmDateAndTimeDTLow" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TBzDMH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((low.oclIsUndefined() or low.isNullFlavorUndefined()) implies (not low.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8-DFYF9xEey5t-mahoHmrg" name="ProgressNote2ComponentOfEncompassingEncounterLocationHealthCareFacilityId" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8-DFYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TCzv0H3sEeyivuDeOiJBMg" name="ProgressNote2ComponentOfEncompassingEncounterLocationHealthCareFacilityId" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TCzv0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).location->excluding(null).healthCareFacility->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8-DFYl9xEey5t-mahoHmrg" name="ProgressNote2ComponentOfEncompassingEncounterLocationHealthCareFacility" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8-DFY19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TCzv0n3sEeyivuDeOiJBMg" name="ProgressNote2ComponentOfEncompassingEncounterLocationHealthCareFacility" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TCzv033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null).location->excluding(null)->reject(healthCareFacility->one(healthCareFacility : cda::HealthCareFacility | not healthCareFacility.oclIsUndefined() and healthCareFacility.oclIsKindOf(cda::HealthCareFacility)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8-DscF9xEey5t-mahoHmrg" name="ProgressNote2ComponentOfEncompassingEncounterId" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8-DscV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TCzv1H3sEeyivuDeOiJBMg" name="ProgressNote2ComponentOfEncompassingEncounterId" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TCzv1X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (( not id->isEmpty()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8-Dscl9xEey5t-mahoHmrg" name="ProgressNote2ComponentOfEncompassingEncounterEffectiveTime" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8-Dsc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TC0W4H3sEeyivuDeOiJBMg" name="ProgressNote2ComponentOfEncompassingEncounterEffectiveTime" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TC0W4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject((effectiveTime.oclIsUndefined() or effectiveTime.isNullFlavorUndefined()) implies (not effectiveTime.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8-DsdF9xEey5t-mahoHmrg" name="ProgressNote2ComponentOfEncompassingEncounterLocation" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8-DsdV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TC0W4n3sEeyivuDeOiJBMg" name="ProgressNote2ComponentOfEncompassingEncounterLocation" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TC0W433sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null).encompassingEncounter->excluding(null)->reject(location->one(location : cda::Location | not location.oclIsUndefined() and location.oclIsKindOf(cda::Location)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8-ETgF9xEey5t-mahoHmrg" name="ProgressNote2ComponentOfEncompassingEncounter" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8-ETgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TC0W5H3sEeyivuDeOiJBMg" name="ProgressNote2ComponentOfEncompassingEncounter" constrainedElement="_qVEVkC-aEeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TC0W5X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.componentOf->excluding(null)->reject(encompassingEncounter->one(encompassingEncounter : cda::EncompassingEncounter | not encompassingEncounter.oclIsUndefined() and encompassingEncounter.oclIsKindOf(cda::EncompassingEncounter)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_qVE8oC-aEeSoCqqrpX8LzQ" general="_dduXkJ5OEeOr4eM3k36wAg"/>
-      <ownedOperation xmi:id="_1_pI0l9xEey5t-mahoHmrg" name="getAssessmentSection" bodyCondition="_1_pI1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_1_pI1V9xEey5t-mahoHmrg" name="body" constrainedElement="_1_pI0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_1_pI1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Mn3ssn3sEeyivuDeOiJBMg" name="getAssessmentSection" bodyCondition="_Mn3stX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Mn3stX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Mn3ssn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mn3stn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentSection))->asSequence()->any(true).oclAsType(consol::AssessmentSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_1_pI019xEey5t-mahoHmrg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1_pI1F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Mn3ss33sEeyivuDeOiJBMg" type="_W8pI4DszEeGvzMYhXuqAEA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mn3stH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2AKtQl9xEey5t-mahoHmrg" name="getPlanOfTreatmentSection2" bodyCondition="_2AKtRV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2AKtRV9xEey5t-mahoHmrg" name="body" constrainedElement="_2AKtQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2AKtRl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MoR8Yn3sEeyivuDeOiJBMg" name="getPlanOfTreatmentSection2" bodyCondition="_MoR8ZX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MoR8ZX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MoR8Yn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MoR8Zn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PlanOfTreatmentSection2))->asSequence()->any(true).oclAsType(consol::PlanOfTreatmentSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2AKtQ19xEey5t-mahoHmrg" type="_bwml0P4yEeO_Yb9cO8w3bA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2AKtRF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MoR8Y33sEeyivuDeOiJBMg" type="_bwml0P4yEeO_Yb9cO8w3bA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MoR8ZH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2Ap1cl9xEey5t-mahoHmrg" name="getAssessmentAndPlanSection2" bodyCondition="_2Ap1dV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2Ap1dV9xEey5t-mahoHmrg" name="body" constrainedElement="_2Ap1cl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2Ap1dl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MowdgH3sEeyivuDeOiJBMg" name="getAssessmentAndPlanSection2" bodyCondition="_Mowdg33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Mowdg33sEeyivuDeOiJBMg" name="body" constrainedElement="_MowdgH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MowdhH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AssessmentAndPlanSection2))->asSequence()->any(true).oclAsType(consol::AssessmentAndPlanSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2Ap1c19xEey5t-mahoHmrg" type="_q_8twPvVEeOvZJBdQKQrqQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Ap1dF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MowdgX3sEeyivuDeOiJBMg" type="_q_8twPvVEeOvZJBdQKQrqQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mowdgn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2BJksl9xEey5t-mahoHmrg" name="getAllergiesSectionEntriesOptional2" bodyCondition="_2BJktV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2BJktV9xEey5t-mahoHmrg" name="body" constrainedElement="_2BJksl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2BJktl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MpNwgH3sEeyivuDeOiJBMg" name="getAllergiesSectionEntriesOptional2" bodyCondition="_MpNwg33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MpNwg33sEeyivuDeOiJBMg" name="body" constrainedElement="_MpNwgH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MpNwhH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::AllergiesSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::AllergiesSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2BJks19xEey5t-mahoHmrg" type="_nWAcMAIjEeSVzfoPSatgpg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2BJktF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MpNwgX3sEeyivuDeOiJBMg" type="_nWAcMAIjEeSVzfoPSatgpg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MpNwgn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2Bnewl9xEey5t-mahoHmrg" name="getChiefComplaintSection" bodyCondition="_2BnexV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2BnexV9xEey5t-mahoHmrg" name="body" constrainedElement="_2Bnewl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2Bnexl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MponQn3sEeyivuDeOiJBMg" name="getChiefComplaintSection" bodyCondition="_MponRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MponRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MponQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MponRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ChiefComplaintSection))->asSequence()->any(true).oclAsType(consol::ChiefComplaintSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2Bnew19xEey5t-mahoHmrg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2BnexF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MponQ33sEeyivuDeOiJBMg" type="_2PWQCBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MponRH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2CHOAl9xEey5t-mahoHmrg" name="getInterventionsSection2" bodyCondition="_2CH1El9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2CH1El9xEey5t-mahoHmrg" name="body" constrainedElement="_2CHOAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2CH1E19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MqEFEn3sEeyivuDeOiJBMg" name="getInterventionsSection2" bodyCondition="_MqEFFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MqEFFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MqEFEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MqEFFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::InterventionsSection2))->asSequence()->any(true).oclAsType(consol::InterventionsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2CH1EF9xEey5t-mahoHmrg" type="_YCS1AP1WEeOW-qBXb0kbTA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2CH1EV9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MqEFE33sEeyivuDeOiJBMg" type="_YCS1AP1WEeOW-qBXb0kbTA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MqEFFH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2CjS4l9xEey5t-mahoHmrg" name="getInstructionsSection2" bodyCondition="_2CjS5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2CjS5V9xEey5t-mahoHmrg" name="body" constrainedElement="_2CjS4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2CjS5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Mqe70H3sEeyivuDeOiJBMg" name="getInstructionsSection2" bodyCondition="_Mqe7033sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Mqe7033sEeyivuDeOiJBMg" name="body" constrainedElement="_Mqe70H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mqe71H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::InstructionsSection2))->asSequence()->any(true).oclAsType(consol::InstructionsSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2CjS419xEey5t-mahoHmrg" type="_k8L2YP1HEeOVx4YMwgfjlA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2CjS5F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Mqe70X3sEeyivuDeOiJBMg" type="_k8L2YP1HEeOVx4YMwgfjlA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mqe70n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2DCbEl9xEey5t-mahoHmrg" name="getMedicationsSectionEntriesOptional2" bodyCondition="_2DCbFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2DCbFV9xEey5t-mahoHmrg" name="body" constrainedElement="_2DCbEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2DCbFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Mq5ykn3sEeyivuDeOiJBMg" name="getMedicationsSectionEntriesOptional2" bodyCondition="_Mq5ylX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Mq5ylX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Mq5ykn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mq5yln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::MedicationsSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::MedicationsSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2DCbE19xEey5t-mahoHmrg" type="_JUvaUAFaEeS0nNJt6oyOyQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2DCbFF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Mq5yk33sEeyivuDeOiJBMg" type="_JUvaUAFaEeS0nNJt6oyOyQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mq5ylH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2DfuEl9xEey5t-mahoHmrg" name="getObjectiveSection" bodyCondition="_2DfuFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2DfuFV9xEey5t-mahoHmrg" name="body" constrainedElement="_2DfuEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2DfuFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MrTbMn3sEeyivuDeOiJBMg" name="getObjectiveSection" bodyCondition="_MrTbNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MrTbNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MrTbMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MrTbNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ObjectiveSection))->asSequence()->any(true).oclAsType(consol::ObjectiveSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2DfuE19xEey5t-mahoHmrg" type="_rNJpADVyEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2DfuFF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MrTbM33sEeyivuDeOiJBMg" type="_rNJpADVyEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MrTbNH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2D-PMl9xEey5t-mahoHmrg" name="getPhysicalExamSection2" bodyCondition="_2D-2Ql9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2D-2Ql9xEey5t-mahoHmrg" name="body" constrainedElement="_2D-PMl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2D-2Q19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MruR8H3sEeyivuDeOiJBMg" name="getPhysicalExamSection2" bodyCondition="_MruR833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MruR833sEeyivuDeOiJBMg" name="body" constrainedElement="_MruR8H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MruR9H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::PhysicalExamSection2))->asSequence()->any(true).oclAsType(consol::PhysicalExamSection2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2D-2QF9xEey5t-mahoHmrg" type="_-nZiYP4uEeObaveuCI77uA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2D-2QV9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MruR8X3sEeyivuDeOiJBMg" type="_-nZiYP4uEeObaveuCI77uA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MruR8n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2EcJQF9xEey5t-mahoHmrg" name="getProblemSectionEntriesOptional2" bodyCondition="_2EcJQ19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2EcJQ19xEey5t-mahoHmrg" name="body" constrainedElement="_2EcJQF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2EcJRF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MsIhon3sEeyivuDeOiJBMg" name="getProblemSectionEntriesOptional2" bodyCondition="_MsJIsH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MsJIsH3sEeyivuDeOiJBMg" name="body" constrainedElement="_MsIhon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MsJIsX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ProblemSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::ProblemSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2EcJQV9xEey5t-mahoHmrg" type="_ZgLioAFkEeSJ2uHfynwxCw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2EcJQl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MsIho33sEeyivuDeOiJBMg" type="_ZgLioAFkEeSJ2uHfynwxCw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MsIhpH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2E7Rcl9xEey5t-mahoHmrg" name="getResultsSectionEntriesOptional2" bodyCondition="_2E7RdV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2E7RdV9xEey5t-mahoHmrg" name="body" constrainedElement="_2E7Rcl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2E7Rdl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Msnp0n3sEeyivuDeOiJBMg" name="getResultsSectionEntriesOptional2" bodyCondition="_Msnp1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Msnp1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_Msnp0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Msnp1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ResultsSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::ResultsSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2E7Rc19xEey5t-mahoHmrg" type="_yaJ3QAFAEeSaVZ5WxWd94w" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2E7RdF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Msnp033sEeyivuDeOiJBMg" type="_yaJ3QAFAEeSaVZ5WxWd94w" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Msnp1H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2FZLgl9xEey5t-mahoHmrg" name="getReviewOfSystemsSection" bodyCondition="_2FZykF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2FZykF9xEey5t-mahoHmrg" name="body" constrainedElement="_2FZLgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2FZykV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MtEVwn3sEeyivuDeOiJBMg" name="getReviewOfSystemsSection" bodyCondition="_MtEVxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_MtEVxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_MtEVwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MtEVxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::ReviewOfSystemsSection))->asSequence()->any(true).oclAsType(consol::ReviewOfSystemsSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2FZLg19xEey5t-mahoHmrg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2FZLhF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MtEVw33sEeyivuDeOiJBMg" type="_2RqkMBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MtEVxH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2F5h0l9xEey5t-mahoHmrg" name="getSubjectiveSection" bodyCondition="_2F5h1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2F5h1V9xEey5t-mahoHmrg" name="body" constrainedElement="_2F5h0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2F5h1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_MtfzkH3sEeyivuDeOiJBMg" name="getSubjectiveSection" bodyCondition="_Mtfzk33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Mtfzk33sEeyivuDeOiJBMg" name="body" constrainedElement="_MtfzkH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_MtfzlH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::SubjectiveSection))->asSequence()->any(true).oclAsType(consol::SubjectiveSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2F5h019xEey5t-mahoHmrg" type="_iy8nYDVzEeGaW4kr-GbV8Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2F5h1F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_MtfzkX3sEeyivuDeOiJBMg" type="_iy8nYDVzEeGaW4kr-GbV8Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mtfzkn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_2GXb4V9xEey5t-mahoHmrg" name="getVitalSignsSectionEntriesOptional2" bodyCondition="_2GXb5F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_2GXb5F9xEey5t-mahoHmrg" name="body" constrainedElement="_2GXb4V9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_2GXb5V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Mt5cMn3sEeyivuDeOiJBMg" name="getVitalSignsSectionEntriesOptional2" bodyCondition="_Mt5cNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Mt5cNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Mt5cMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mt5cNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::VitalSignsSectionEntriesOptional2))->asSequence()->any(true).oclAsType(consol::VitalSignsSectionEntriesOptional2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_2GXb4l9xEey5t-mahoHmrg" type="_8LkzYAFTEeSmasYc71ZgMQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2GXb419xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Mt5cM33sEeyivuDeOiJBMg" type="_8LkzYAFTEeSmasYc71ZgMQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mt5cNH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3RRv0l9xEey5t-mahoHmrg" name="getNutritionSection" bodyCondition="_3RSW4V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3RSW4V9xEey5t-mahoHmrg" name="body" constrainedElement="_3RRv0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3RSW4l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Nu0Gon3sEeyivuDeOiJBMg" name="getNutritionSection" bodyCondition="_Nu0GpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Nu0GpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Nu0Gon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Nu0Gpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getAllSections()->select(section : cda::Section | not section.oclIsUndefined() and section.oclIsKindOf(consol::NutritionSection))->asSequence()->any(true).oclAsType(consol::NutritionSection)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3RRv019xEey5t-mahoHmrg" type="_MlM4IJ2GEeORR8_YW0n_jQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3RSW4F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_Nu0Go33sEeyivuDeOiJBMg" type="_MlM4IJ2GEeORR8_YW0n_jQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Nu0GpH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -39849,80 +39849,80 @@ IHE's XDS-SD (Cross-Transaction Specifications and Content Specifications, Scann
 For conformance with both specifications, implementers need to ensure that their documents at a minimum conform with the SHALL constraints from either specification.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_2GXb5l9xEey5t-mahoHmrg" name="USRealmHeader2TemplateId" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2GYC8F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Mt6DQH3sEeyivuDeOiJBMg" name="USRealmHeader2TemplateId" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mt6DQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.1.10' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2G-f4F9xEey5t-mahoHmrg" name="UnstructuredDocument2RecordTarget" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2G-f4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MubAoH3sEeyivuDeOiJBMg" name="UnstructuredDocument2RecordTarget" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MubAoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->exists(recordTarget : cda::RecordTarget | not recordTarget.oclIsUndefined() and recordTarget.oclIsKindOf(cda::RecordTarget))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2IC24F9xEey5t-mahoHmrg" name="UnstructuredDocument2Custodian" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2IC24V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MvW0wH3sEeyivuDeOiJBMg" name="UnstructuredDocument2Custodian" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MvW0wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->one(custodian : cda::Custodian | not custodian.oclIsUndefined() and custodian.oclIsKindOf(cda::Custodian))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2JmWEF9xEey5t-mahoHmrg" name="UnstructuredDocument2Component" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2JmWEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Mwwi8H3sEeyivuDeOiJBMg" name="UnstructuredDocument2Component" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Mwwi8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->one(component : cda::Component2 | not component.oclIsUndefined() and component.oclIsKindOf(cda::Component2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8_R0cF9xEey5t-mahoHmrg" name="UnstructuredDocument2RecordTargetPatientRoleId" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8_R0cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TD58AH3sEeyivuDeOiJBMg" name="UnstructuredDocument2RecordTargetPatientRoleId" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TD58AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null).patientRole->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_8_R0cl9xEey5t-mahoHmrg" name="UnstructuredDocument2RecordTargetPatientRole" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8_R0c19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TD58An3sEeyivuDeOiJBMg" name="UnstructuredDocument2RecordTargetPatientRole" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TD58A33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.recordTarget->excluding(null)->reject(patientRole->one(patientRole : cda::PatientRole | not patientRole.oclIsUndefined() and patientRole.oclIsKindOf(cda::PatientRole)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9AU9UF9xEey5t-mahoHmrg" name="UnstructuredDocument2CustodianAssignedCustodianRepresentedCustodianOrganization" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9AU9UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TFDLgH3sEeyivuDeOiJBMg" name="UnstructuredDocument2CustodianAssignedCustodianRepresentedCustodianOrganization" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TFDLgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null).assignedCustodian->excluding(null)->reject(representedCustodianOrganization->one(representedCustodianOrganization : cda::CustodianOrganization | not representedCustodianOrganization.oclIsUndefined() and representedCustodianOrganization.oclIsKindOf(rim::Entity)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9AU9Ul9xEey5t-mahoHmrg" name="UnstructuredDocument2CustodianAssignedCustodian" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9AU9U19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TFDykH3sEeyivuDeOiJBMg" name="UnstructuredDocument2CustodianAssignedCustodian" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TFDykX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.custodian->excluding(null)->reject(assignedCustodian->one(assignedCustodian : cda::AssignedCustodian | not assignedCustodian.oclIsUndefined() and assignedCustodian.oclIsKindOf(cda::AssignedCustodian)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9BaicF9xEey5t-mahoHmrg" name="UnstructuredDocument2ComponentNonXMLBodyEDMediaType" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9BaicV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TGShoH3sEeyivuDeOiJBMg" name="UnstructuredDocument2ComponentNonXMLBodyEDMediaType" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TGShoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).nonXMLBody->excluding(null).text->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not mediaType.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9Baicl9xEey5t-mahoHmrg" name="UnstructuredDocument2ComponentNonXMLBodyHasReferenceOrRepresentation" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9Baic19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TGShon3sEeyivuDeOiJBMg" name="UnstructuredDocument2ComponentNonXMLBodyHasReferenceOrRepresentation" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TGSho33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).nonXMLBody->excluding(null)->reject(not text.reference.value.oclIsUndefined() xor ( text.isDefined('representation') and text.representation = datatypes::BinaryDataEncoding::B64 and (not text.mediaType.oclIsUndefined()) ))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9BbJgF9xEey5t-mahoHmrg" name="UnstructuredDocument2ComponentNonXMLBodyMediaTypeFileFormats" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9BbJgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TGTIsH3sEeyivuDeOiJBMg" name="UnstructuredDocument2ComponentNonXMLBodyMediaTypeFileFormats" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TGTIsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).nonXMLBody->excluding(null)->reject(not text.mediaType.oclIsUndefined()  implies (text.mediaType = 'application/msword' or text.mediaType = 'application/pdf' or text.mediaType = 'text/plain' or text.mediaType = 'text/rtf' or text.mediaType = 'text/html' or text.mediaType = 'image/gif' or text.mediaType = 'image/tiff' or text.mediaType = 'image/jpeg' or text.mediaType = 'image/png'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9BbJgl9xEey5t-mahoHmrg" name="UnstructuredDocument2ComponentNonXMLBodyText" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9BbJg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TGTIsn3sEeyivuDeOiJBMg" name="UnstructuredDocument2ComponentNonXMLBodyText" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TGTIs33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null).nonXMLBody->excluding(null)->reject((text.oclIsUndefined() or text.isNullFlavorUndefined()) implies (not text.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9BbJhF9xEey5t-mahoHmrg" name="UnstructuredDocument2ComponentNonXMLBody" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9BbJhV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TGTItH3sEeyivuDeOiJBMg" name="UnstructuredDocument2ComponentNonXMLBody" constrainedElement="_MrNuQC-6EeSoCqqrpX8LzQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TGTItX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->excluding(null)->reject(nonXMLBody->one(nonXMLBody : cda::NonXMLBody | not nonXMLBody.oclIsUndefined() and nonXMLBody.oclIsKindOf(cda::NonXMLBody)))</body>
         </specification>
@@ -39933,42 +39933,42 @@ For conformance with both specifications, implementers need to ensure that their
       <ownedComment xmi:id="_ro_uMDhDEeS1WeMhbm6GZw">
         <body>A criterion for administration can be used to record that the medication is to be administered only when the associated criteria are met.</body>
       </ownedComment>
-      <ownedRule xmi:id="_2KHTcV9xEey5t-mahoHmrg" name="PreconditionForSubstanceAdministration2TemplateId" constrainedElement="_XA96QDhDEeS1WeMhbm6GZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2KHTcl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MxMn0n3sEeyivuDeOiJBMg" name="PreconditionForSubstanceAdministration2TemplateId" constrainedElement="_XA96QDhDEeS1WeMhbm6GZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MxMn033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.25' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2KIhkF9xEey5t-mahoHmrg" name="PreconditionForSubstanceAdministrationCode" constrainedElement="_XA96QDhDEeS1WeMhbm6GZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2KIhkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MxN18H3sEeyivuDeOiJBMg" name="PreconditionForSubstanceAdministrationCode" constrainedElement="_XA96QDhDEeS1WeMhbm6GZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MxN18X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2KJvsF9xEey5t-mahoHmrg" name="PreconditionForSubstanceAdministrationCodeP" constrainedElement="_XA96QDhDEeS1WeMhbm6GZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2KJvsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MxPEEH3sEeyivuDeOiJBMg" name="PreconditionForSubstanceAdministrationCodeP" constrainedElement="_XA96QDhDEeS1WeMhbm6GZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MxPEEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2KLk4F9xEey5t-mahoHmrg" name="PreconditionForSubstanceAdministrationText" constrainedElement="_XA96QDhDEeS1WeMhbm6GZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2KLk4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MxQSMH3sEeyivuDeOiJBMg" name="PreconditionForSubstanceAdministrationText" constrainedElement="_XA96QDhDEeS1WeMhbm6GZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MxQSMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2KMzAF9xEey5t-mahoHmrg" name="PreconditionForSubstanceAdministrationValue" constrainedElement="_XA96QDhDEeS1WeMhbm6GZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2KMzAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MxQ5QH3sEeyivuDeOiJBMg" name="PreconditionForSubstanceAdministrationValue" constrainedElement="_XA96QDhDEeS1WeMhbm6GZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MxQ5QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value.oclIsUndefined() or self.value.isNullFlavorUndefined()) implies (not self.value.oclIsUndefined() and self.value.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.value.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2KtwYF9xEey5t-mahoHmrg" name="PreconditionForSubstanceAdministrationValueP" constrainedElement="_XA96QDhDEeS1WeMhbm6GZw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2KtwYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_MxrwAH3sEeyivuDeOiJBMg" name="PreconditionForSubstanceAdministrationValueP" constrainedElement="_XA96QDhDEeS1WeMhbm6GZw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MxrwAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value.oclIsUndefined() or self.value.isNullFlavorUndefined()) implies (not self.value.oclIsUndefined())</body>
         </specification>
@@ -39979,94 +39979,94 @@ value.codeSystem = '2.16.840.1.113883.6.96' and not value.code.oclIsUndefined())
       <ownedComment xmi:id="_awOMkIC4EeS108flGLVEBA">
         <body>This template represents the number of pressure ulcers observed at a particular stage.</body>
       </ownedComment>
-      <ownedRule xmi:id="_28iO4F9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservation2TemplateId" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_28iO4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NcluMH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservation2TemplateId" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NcluMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.76' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_28krIF9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationCodeP" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_28krIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NcoKcH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationCodeP" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NcoKcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_28i18F9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationCode" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_28i18V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NcmVQH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationCode" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NcmVQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '2264892003' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2-cTYF9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationEntryRelationship" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2-cTYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NeMQsH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationEntryRelationship" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NeMQsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->select(entryRelationship : cda::EntryRelationship | not entryRelationship.oclIsUndefined() and entryRelationship.oclIsKindOf(cda::EntryRelationship))->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->size() = 1</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9BdlwF9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservation2CDTranslation" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9BdlwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TGWMAH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservation2CDTranslation" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TGWMAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->size() = 1 and translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.code = '75277-4' and value.codeSystem = '2.16.840.1.113883.6.1')) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9Bdlwl9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservation2CDTranslationP" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9Bdlw19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TGWMAn3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservation2CDTranslationP" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TGWMA33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9CfggF9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationEntryRelationshipObservationClassCode" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9CfggV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_THajAH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationEntryRelationshipObservationClassCode" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_THajAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject(classCode=vocab::ActClassObservation::OBS)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9Cfggl9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationEntryRelationshipObservationMoodCode" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9Cfgg19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_THajAn3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationEntryRelationshipObservationMoodCode" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_THbKEH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject(moodCode=vocab::x_ActMoodDocumentObservation::EVN)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9CgHkF9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservation2EntryRelationshipObservationCodeP" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9CgHkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_THbKEX3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservation2EntryRelationshipObservationCodeP" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_THbKEn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9CgHkl9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservation2EntryRelationshipObservationCode" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9CgHk19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_THbKE33sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservation2EntryRelationshipObservationCode" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_THbKFH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = code.oclAsType(datatypes::CD) in 
 value.code = 'ASSERTION' and value.codeSystem = '2.16.840.1.113883.5.4'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9CgHlF9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationEntryRelationshipObservationValueP" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9CgHlV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_THbKFX3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationEntryRelationshipObservationValueP" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_THbxIH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject((value->isEmpty() or value->exists(element | element.isNullFlavorUndefined())) implies (not value->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9CguoF9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationEntryRelationshipObservationValue" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9CguoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_THbxIX3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationEntryRelationshipObservationValue" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_THbxIn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ).observation->excluding(null)->reject((value->isEmpty() or value->exists(element | element.isNullFlavorUndefined())) implies (value->size() = 1 and value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '421076008' or value.code = '420324007' or value.code = '421927004' or value.code = '420597008' or value.code = '421594008'))))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9Cguol9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationEntryRelationshipTypeCode" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9Cguo19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_THbxI33sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationEntryRelationshipTypeCode" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_THbxJH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->reject(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9CgupF9xEey5t-mahoHmrg" name="NumberOfPressureUlcersObservationEntryRelationshipObservation" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9CgupV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_THcYMH3sEeyivuDeOiJBMg" name="NumberOfPressureUlcersObservationEntryRelationshipObservation" constrainedElement="_YYgjwIC3EeS108flGLVEBA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_THcYMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->excluding(null)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->select(typeCode=vocab::x_ActRelationshipEntryRelationship::SUBJ)->reject(observation->one(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(cda::Observation)))</body>
         </specification>
@@ -40077,36 +40077,36 @@ value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '421076008' or val
       <ownedComment xmi:id="_Kb53EIV6EeSRBMdZotACQg">
         <body>Family History Observations related to a particular family member are contained within a Family History Organizer. The effectiveTime in the Family History Observation is the biologically or clinically relevant time of the observation. The biologically or clinically relevant time is the time at which the observation holds (is effective) for the family member (the subject of the observation).</body>
       </ownedComment>
-      <ownedRule xmi:id="_2_hRcF9xEey5t-mahoHmrg" name="FamilyHistoryObservation2TemplateId" constrainedElement="_YvV88IV5EeSRBMdZotACQg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2_hRcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NfM9UH3sEeyivuDeOiJBMg" name="FamilyHistoryObservation2TemplateId" constrainedElement="_YvV88IV5EeSRBMdZotACQg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NfM9UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.46' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3AC14F9xEey5t-mahoHmrg" name="FamilyHistoryObservationCodeP" constrainedElement="_YvV88IV5EeSRBMdZotACQg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3AC14V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NfsskH3sEeyivuDeOiJBMg" name="FamilyHistoryObservationCodeP" constrainedElement="_YvV88IV5EeSRBMdZotACQg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NfsskX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_2_h4gF9xEey5t-mahoHmrg" name="FamilyHistoryObservationCode" constrainedElement="_YvV88IV5EeSRBMdZotACQg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_2_h4gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NfNkYH3sEeyivuDeOiJBMg" name="FamilyHistoryObservationCode" constrainedElement="_YvV88IV5EeSRBMdZotACQg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NfNkYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '404684003' or value.code = '409586006' or value.code = '282291009' or value.code = '64572001' or value.code = '248536006' or value.code = '418799008' or value.code = '55607006' or value.code = '373930000'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9DCTEF9xEey5t-mahoHmrg" name="FamilyHistoryObservation2CDTranslation" constrainedElement="_YvV88IV5EeSRBMdZotACQg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9DCTEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TH-jsH3sEeyivuDeOiJBMg" name="FamilyHistoryObservation2CDTranslation" constrainedElement="_YvV88IV5EeSRBMdZotACQg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TH-jsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (not translation->isEmpty() and translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '75326-9' or value.code = '75325-1' or value.code = '75324-4' or value.code = '75323-6' or value.code = '29308-4' or value.code = '75322-8' or value.code = '75275-8' or value.code = '75321-0' or value.code = '75319-4' or value.code = '75318-6' or value.code = '75317-8' or value.code = '75316-0' or value.code = '75315-2' or value.code = '75314-5' or value.code = '75313-7' or value.code = '75312-9'))) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9DCTEl9xEey5t-mahoHmrg" name="FamilyHistoryObservation2CDTranslationP" constrainedElement="_YvV88IV5EeSRBMdZotACQg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9DCTE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TH_KwH3sEeyivuDeOiJBMg" name="FamilyHistoryObservation2CDTranslationP" constrainedElement="_YvV88IV5EeSRBMdZotACQg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TH_KwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (( not translation->isEmpty()) ) )))</body>
         </specification>
@@ -40117,34 +40117,34 @@ value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '75326-9' or value.
       <ownedComment xmi:id="_2ylZ4Ib0EeSxzopshBnQuw">
         <body>The Family History Organizer associates a set of observations with a family member. For example, the Family History Organizer can group a set of observations about the patient's father.</body>
       </ownedComment>
-      <ownedRule xmi:id="_3BlG8F9xEey5t-mahoHmrg" name="FamilyHistoryOrganizer2TemplateId" constrainedElement="_6whQEIbpEeSxzopshBnQuw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3BlG8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NhMhYH3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizer2TemplateId" constrainedElement="_6whQEIbpEeSxzopshBnQuw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NhMhYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.45' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3BmVEF9xEey5t-mahoHmrg" name="FamilyHistoryOrganizer2Id" constrainedElement="_6whQEIbpEeSxzopshBnQuw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3BmVEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NhNvgH3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizer2Id" constrainedElement="_6whQEIbpEeSxzopshBnQuw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NhNvgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3CHScF9xEey5t-mahoHmrg" name="FamilyHistoryOrganizerFamilyHistoryObservation" constrainedElement="_6whQEIbpEeSxzopshBnQuw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3CHScV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NhsQoH3sEeyivuDeOiJBMg" name="FamilyHistoryOrganizerFamilyHistoryObservation" constrainedElement="_6whQEIbpEeSxzopshBnQuw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NhsQoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->exists(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::FamilyHistoryObservation2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_6wieMIbpEeSxzopshBnQuw" general="_2IbIoBSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_3CH5gF9xEey5t-mahoHmrg" name="getConsolFamilyHistoryObservation2s" bodyCondition="_3CH5g19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3CH5g19xEey5t-mahoHmrg" name="body" constrainedElement="_3CH5gF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3CH5hF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NhsQon3sEeyivuDeOiJBMg" name="getConsolFamilyHistoryObservation2s" bodyCondition="_NhsQpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NhsQpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_NhsQon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NhsQpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::FamilyHistoryObservation2)).oclAsType(consol::FamilyHistoryObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3CH5gV9xEey5t-mahoHmrg" type="_YvV88IV5EeSRBMdZotACQg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3CH5gl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_NhsQo33sEeyivuDeOiJBMg" type="_YvV88IV5EeSRBMdZotACQg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NhsQpH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -40152,28 +40152,28 @@ value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '75326-9' or value.
       <ownedComment xmi:id="_q8o1oIevEeSBauRYePLghA">
         <body>This section contains data defining the patient's genetic relatives in terms of possible or relevant health risk factors that have a potential impact on the patient's healthcare risk profile.</body>
       </ownedComment>
-      <ownedRule xmi:id="_3CH5hV9xEey5t-mahoHmrg" name="FamilyHistorySection2TemplateId" constrainedElement="_NGivoIevEeSBauRYePLghA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3CH5hl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Nhs3sH3sEeyivuDeOiJBMg" name="FamilyHistorySection2TemplateId" constrainedElement="_NGivoIevEeSBauRYePLghA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Nhs3sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.15' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3Cpd8F9xEey5t-mahoHmrg" name="FamilyHistorySectionFamilyHistory" constrainedElement="_NGivoIevEeSBauRYePLghA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3Cpd8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NiLY0H3sEeyivuDeOiJBMg" name="FamilyHistorySectionFamilyHistory" constrainedElement="_NGivoIevEeSBauRYePLghA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NiLY0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.organizer.oclIsUndefined() and entry.organizer.oclIsKindOf(consol::FamilyHistoryOrganizer2))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_NGjWsIevEeSBauRYePLghA" general="_2IWQIxSVEeGGzu7fmW9pXw"/>
-      <ownedOperation xmi:id="_3Cpd8l9xEey5t-mahoHmrg" name="getConsolFamilyHistoryOrganizer2s" bodyCondition="_3Cpd9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3Cpd9V9xEey5t-mahoHmrg" name="body" constrainedElement="_3Cpd8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3Cpd9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_NiLY0n3sEeyivuDeOiJBMg" name="getConsolFamilyHistoryOrganizer2s" bodyCondition="_NiLY1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_NiLY1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_NiLY0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_NiLY1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::FamilyHistoryOrganizer2)).oclAsType(consol::FamilyHistoryOrganizer2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3Cpd819xEey5t-mahoHmrg" type="_6whQEIbpEeSxzopshBnQuw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3Cpd9F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_NiLY033sEeyivuDeOiJBMg" type="_6whQEIbpEeSxzopshBnQuw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NiLY1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -40181,8 +40181,8 @@ value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '75326-9' or value.
       <ownedComment xmi:id="__iuAcIe9EeSBauRYePLghA">
         <body>This participant is the Physician Reading Study Performer defined in documentationOf/serviceEvent. It is usually different from the attending physician. The reading physician interprets the images and evidence of the study (DICOM Definition).</body>
       </ownedComment>
-      <ownedRule xmi:id="_3Cpd919xEey5t-mahoHmrg" name="PhysicianReadingStudyPerformer2TemplateId" constrainedElement="_zKKIUIe9EeSBauRYePLghA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3CqFAF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NiL_4H3sEeyivuDeOiJBMg" name="PhysicianReadingStudyPerformer2TemplateId" constrainedElement="_zKKIUIe9EeSBauRYePLghA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NiL_4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.6.2.1' and id.extension.oclIsUndefined())</body>
         </specification>
@@ -40193,34 +40193,34 @@ value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = '75326-9' or value.
       <ownedComment xmi:id="_2fYPUIfLEeSBauRYePLghA">
         <body>The Course of Care section describes what happened during the course of an encounter.</body>
       </ownedComment>
-      <ownedRule xmi:id="_3CqsEF9xEey5t-mahoHmrg" name="CourseOfCareSectionTemplateId" constrainedElement="_S0oqIIfLEeSBauRYePLghA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3CqsEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NiMm8H3sEeyivuDeOiJBMg" name="CourseOfCareSectionTemplateId" constrainedElement="_S0oqIIfLEeSBauRYePLghA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NiMm8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.64')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3CrTIF9xEey5t-mahoHmrg" name="CourseOfCareSectionCode" constrainedElement="_S0oqIIfLEeSBauRYePLghA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3CrTIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NiNOAH3sEeyivuDeOiJBMg" name="CourseOfCareSectionCode" constrainedElement="_S0oqIIfLEeSBauRYePLghA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NiNOAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '8648-8' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3CtIUF9xEey5t-mahoHmrg" name="CourseOfCareSectionCodeP" constrainedElement="_S0oqIIfLEeSBauRYePLghA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3CtIUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NiOcIH3sEeyivuDeOiJBMg" name="CourseOfCareSectionCodeP" constrainedElement="_S0oqIIfLEeSBauRYePLghA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NiOcIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3Cu9gF9xEey5t-mahoHmrg" name="CourseOfCareSectionTitle" constrainedElement="_S0oqIIfLEeSBauRYePLghA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3Cu9gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NiQRUH3sEeyivuDeOiJBMg" name="CourseOfCareSectionTitle" constrainedElement="_S0oqIIfLEeSBauRYePLghA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NiQRUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3CwLoF9xEey5t-mahoHmrg" name="CourseOfCareSectionText" constrainedElement="_S0oqIIfLEeSBauRYePLghA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3CwLoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_NiRfcH3sEeyivuDeOiJBMg" name="CourseOfCareSectionText" constrainedElement="_S0oqIIfLEeSBauRYePLghA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_NiRfcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
@@ -40244,218 +40244,218 @@ Planned Intervention Acts can be related to each other or to Intervention Acts.
 All interventions referenced in a Planned Intervention Act must have moodCodes indicating that that are planned (have not yet occurred).&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_3lfFQF9xEey5t-mahoHmrg" name="PlannedInterventionActTemplateId" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3lfFQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OAiIwn3sEeyivuDeOiJBMg" name="PlannedInterventionActTemplateId" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OAiIw33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.146' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3lgTYF9xEey5t-mahoHmrg" name="PlannedInterventionActClassCode" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3lgTYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OAjW4H3sEeyivuDeOiJBMg" name="PlannedInterventionActClassCode" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OAjW4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3l_bkF9xEey5t-mahoHmrg" name="PlannedInterventionActMoodCodeP" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3l_bkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OBAC0H3sEeyivuDeOiJBMg" name="PlannedInterventionActMoodCodeP" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OBAC0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('moodCode')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3lg6cF9xEey5t-mahoHmrg" name="PlannedInterventionActMoodCode" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3lhhgF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OAklAH3sEeyivuDeOiJBMg" name="PlannedInterventionActMoodCode" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OAklAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentActMood) and 
 let value : vocab::x_DocumentActMood = self.moodCode.oclAsType(vocab::x_DocumentActMood) in 
 value = vocab::x_DocumentActMood::APT or value = vocab::x_DocumentActMood::ARQ or value = vocab::x_DocumentActMood::INT or value = vocab::x_DocumentActMood::PRMS or value = vocab::x_DocumentActMood::PRP or value = vocab::x_DocumentActMood::RQO</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3mhAAF9xEey5t-mahoHmrg" name="PlannedInterventionActId" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3mhAAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OBa5kH3sEeyivuDeOiJBMg" name="PlannedInterventionActId" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OBa5kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3mkDUF9xEey5t-mahoHmrg" name="PlannedInterventionActCodeP" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3mkDUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OBcuwH3sEeyivuDeOiJBMg" name="PlannedInterventionActCodeP" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OBcuwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3miOIF9xEey5t-mahoHmrg" name="PlannedInterventionActCode" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3miOIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OBbgoH3sEeyivuDeOiJBMg" name="PlannedInterventionActCode" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OBbgoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '362956003' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3mlRcF9xEey5t-mahoHmrg" name="PlannedInterventionActStatusCode" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3mlRcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OBdV0H3sEeyivuDeOiJBMg" name="PlannedInterventionActStatusCode" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OBdV0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'active')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3mmfkF9xEey5t-mahoHmrg" name="PlannedInterventionActStatusCodeP" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3mmfkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OBej8H3sEeyivuDeOiJBMg" name="PlannedInterventionActStatusCodeP" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OBej8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3mntsF9xEey5t-mahoHmrg" name="PlannedInterventionActEffectiveTime" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3mntsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OBfyEH3sEeyivuDeOiJBMg" name="PlannedInterventionActEffectiveTime" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OBfyEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3nLuYF9xEey5t-mahoHmrg" name="PlannedInterventionActAuthorParticipation" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3nLuYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OB9sIH3sEeyivuDeOiJBMg" name="PlannedInterventionActAuthorParticipation" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OB9sIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3nsEsF9xEey5t-mahoHmrg" name="PlannedInterventionActAdvanceDirectiveObservation2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3nsEsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OCXUwH3sEeyivuDeOiJBMg" name="PlannedInterventionActAdvanceDirectiveObservation2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OCX70H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AdvanceDirectiveObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3oLz8F9xEey5t-mahoHmrg" name="PlannedInterventionActImmunizationActivity2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3oLz8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OCyLgH3sEeyivuDeOiJBMg" name="PlannedInterventionActImmunizationActivity2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OCyLgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::ImmunizationActivity2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3osKQF9xEey5t-mahoHmrg" name="PlannedInterventionActMedicationActivity2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3osKQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ODNpUH3sEeyivuDeOiJBMg" name="PlannedInterventionActMedicationActivity2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ODNpUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::MedicationActivity2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3pNHoF9xEey5t-mahoHmrg" name="PlannedInterventionActProcedureActivityAct2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3pNHoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ODpHIH3sEeyivuDeOiJBMg" name="PlannedInterventionActProcedureActivityAct2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ODpHIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::ProcedureActivityAct2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3ps24F9xEey5t-mahoHmrg" name="PlannedInterventionActInterventionAct" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3ptd8F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OEFMAH3sEeyivuDeOiJBMg" name="PlannedInterventionActInterventionAct" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OEFzEH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::InterventionAct) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3qObUF9xEey5t-mahoHmrg" name="PlannedInterventionActProcedureActivityObservation2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3qObUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OEkUMH3sEeyivuDeOiJBMg" name="PlannedInterventionActProcedureActivityObservation2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OEkUMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProcedureActivityObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3qs8cF9xEey5t-mahoHmrg" name="PlannedInterventionActProcedureActivityProcedure2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3qs8cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OFCOQH3sEeyivuDeOiJBMg" name="PlannedInterventionActProcedureActivityProcedure2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OFCOQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.procedure.oclIsUndefined() and entryRelationship.procedure.oclIsKindOf(consol::ProcedureActivityProcedure2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3rMrsF9xEey5t-mahoHmrg" name="PlannedInterventionActEncounterActivity2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3rMrsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OFdsEH3sEeyivuDeOiJBMg" name="PlannedInterventionActEncounterActivity2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OFdsEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.encounter.oclIsUndefined() and entryRelationship.encounter.oclIsKindOf(consol::EncounterActivity2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3rsa8F9xEey5t-mahoHmrg" name="PlannedInterventionActInstruction2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3rsa8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OF6YAH3sEeyivuDeOiJBMg" name="PlannedInterventionActInstruction2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OF6YAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::Instruction2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3sNYUF9xEey5t-mahoHmrg" name="PlannedInterventionActNonMedicinalSupplyActivity2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3sNYUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OGVOwH3sEeyivuDeOiJBMg" name="PlannedInterventionActNonMedicinalSupplyActivity2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OGVOwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::NonMedicinalSupplyActivity2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3suVsF9xEey5t-mahoHmrg" name="PlannedInterventionActPlannedAct2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3suVsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OGxToH3sEeyivuDeOiJBMg" name="PlannedInterventionActPlannedAct2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OGxToX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::PlannedAct2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3tOsAF9xEey5t-mahoHmrg" name="PlannedInterventionActPlannedEncounter2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3tOsAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OHK8QH3sEeyivuDeOiJBMg" name="PlannedInterventionActPlannedEncounter2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OHK8QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.encounter.oclIsUndefined() and entryRelationship.encounter.oclIsKindOf(consol::PlannedEncounter2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3tvCUF9xEey5t-mahoHmrg" name="PlannedInterventionActPlannedObservation2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3tvCUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OHlzAH3sEeyivuDeOiJBMg" name="PlannedInterventionActPlannedObservation2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OHlzAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PlannedObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3uTqEF9xEey5t-mahoHmrg" name="PlannedInterventionActPlannedProcedure2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3uTqEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OIApwH3sEeyivuDeOiJBMg" name="PlannedInterventionActPlannedProcedure2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OIApwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.procedure.oclIsUndefined() and entryRelationship.procedure.oclIsKindOf(consol::PlannedProcedure2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3u78MF9xEey5t-mahoHmrg" name="PlannedInterventionActPlannedMedicationActivity2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3u78MV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OIej0H3sEeyivuDeOiJBMg" name="PlannedInterventionActPlannedMedicationActivity2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OIej0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::PlannedMedicationActivity2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3vfV0F9xEey5t-mahoHmrg" name="PlannedInterventionActPlannedSupply2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3vfV0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OI4zgH3sEeyivuDeOiJBMg" name="PlannedInterventionActPlannedSupply2" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OI4zgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.supply.oclIsUndefined() and entryRelationship.supply.oclIsKindOf(consol::PlannedSupply2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3wJdIF9xEey5t-mahoHmrg" name="PlannedInterventionActNutritionRecommendation" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3wJdIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OJTqQH3sEeyivuDeOiJBMg" name="PlannedInterventionActNutritionRecommendation" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OJTqQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::NutritionRecommendation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3wpzcF9xEey5t-mahoHmrg" name="PlannedInterventionActEntryReferenceDocInstance" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3wpzcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OJtS4H3sEeyivuDeOiJBMg" name="PlannedInterventionActEntryReferenceDocInstance" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OJtS4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EntryReference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3xKJwF9xEey5t-mahoHmrg" name="PlannedInterventionActEntryReferenceGoalObs" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3xKJwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OKHikH3sEeyivuDeOiJBMg" name="PlannedInterventionActEntryReferenceGoalObs" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OKHikX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EntryReference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::RSON)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3xqgEF9xEey5t-mahoHmrg" name="PlannedInterventionActHandoffCommunicationParticipants" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3xqgEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OKiZUH3sEeyivuDeOiJBMg" name="PlannedInterventionActHandoffCommunicationParticipants" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OKiZUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::HandoffCommunicationParticipants) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3yLdcF9xEey5t-mahoHmrg" name="PlannedInterventionActPlannedImmunizationActivity" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3yLdcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OK8pAH3sEeyivuDeOiJBMg" name="PlannedInterventionActPlannedImmunizationActivity" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OK8pAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.substanceAdministration.oclIsUndefined() and entryRelationship.substanceAdministration.oclIsKindOf(consol::PlannedImmunizationActivity) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3ytB4F9xEey5t-mahoHmrg" name="PlannedInterventionActReference" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3ytB4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OLZU8H3sEeyivuDeOiJBMg" name="PlannedInterventionActReference" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OLZU8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->exists(reference : cda::Reference | not reference.oclIsUndefined() and reference.oclIsKindOf(cda::Reference))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9Dj3gF9xEey5t-mahoHmrg" name="PlannedInterventionActReferenceTypeCode" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9Dj3gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TIe6AH3sEeyivuDeOiJBMg" name="PlannedInterventionActReferenceTypeCode" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TIe6AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null)->reject(typeCode=vocab::x_ActRelationshipExternalReference::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9Dj3gl9xEey5t-mahoHmrg" name="PlannedInterventionActReferenceExternalDocumentReference" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9Dj3g19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TIe6An3sEeyivuDeOiJBMg" name="PlannedInterventionActReferenceExternalDocumentReference" constrainedElement="_dGARYOLSEeS505YV9ux2XA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TIe6A33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null)->reject(externalDocument->one(externalDocument : cda::ExternalDocument | not externalDocument.oclIsUndefined() and externalDocument.oclIsKindOf(consol::ExternalDocumentReference)))</body>
         </specification>
@@ -40463,235 +40463,235 @@ value.code = 'active')</body>
       <generalization xmi:id="_dGCtoOLSEeS505YV9ux2XA">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_3nsEsl9xEey5t-mahoHmrg" name="getAdvanceDirectiveObservation2s" bodyCondition="_3nsEtV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3nsEtV9xEey5t-mahoHmrg" name="body" constrainedElement="_3nsEsl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3nsEtl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OCX70X3sEeyivuDeOiJBMg" name="getAdvanceDirectiveObservation2s" bodyCondition="_OCX71H3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OCX71H3sEeyivuDeOiJBMg" name="body" constrainedElement="_OCX70X3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OCX71X3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AdvanceDirectiveObservation2)).oclAsType(consol::AdvanceDirectiveObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3nsEs19xEey5t-mahoHmrg" type="_GnllUK-9EeO8duI_7f6kZw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3nsEtF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OCX70n3sEeyivuDeOiJBMg" type="_GnllUK-9EeO8duI_7f6kZw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OCX7033sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3oMbAF9xEey5t-mahoHmrg" name="getImmunizationActivity2s" bodyCondition="_3oMbA19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3oMbA19xEey5t-mahoHmrg" name="body" constrainedElement="_3oMbAF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3oMbBF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OCyLgn3sEeyivuDeOiJBMg" name="getImmunizationActivity2s" bodyCondition="_OCyLhX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OCyLhX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OCyLgn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OCyLhn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::ImmunizationActivity2)).oclAsType(consol::ImmunizationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3oMbAV9xEey5t-mahoHmrg" type="_zI6vcOE7EeOTq9XEMvvkWw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3oMbAl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OCyLg33sEeyivuDeOiJBMg" type="_zI6vcOE7EeOTq9XEMvvkWw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OCyLhH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3osxUF9xEey5t-mahoHmrg" name="getMedicationActivity2s" bodyCondition="_3osxU19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3osxU19xEey5t-mahoHmrg" name="body" constrainedElement="_3osxUF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3osxVF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_ODNpUn3sEeyivuDeOiJBMg" name="getMedicationActivity2s" bodyCondition="_ODNpVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ODNpVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_ODNpUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ODNpVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::MedicationActivity2)).oclAsType(consol::MedicationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3osxUV9xEey5t-mahoHmrg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3osxUl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_ODNpU33sEeyivuDeOiJBMg" type="_WnSCMOLAEeOc7-TVP7Wi6w" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ODNpVH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3pNHol9xEey5t-mahoHmrg" name="getProcedureActivityAct2s" bodyCondition="_3pNusl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3pNusl9xEey5t-mahoHmrg" name="body" constrainedElement="_3pNHol9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3pNus19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_ODpHIn3sEeyivuDeOiJBMg" name="getProcedureActivityAct2s" bodyCondition="_ODpHJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ODpHJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_ODpHIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ODpHJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::ProcedureActivityAct2)).oclAsType(consol::ProcedureActivityAct2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3pNusF9xEey5t-mahoHmrg" type="_CFMuYPDbEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3pNusV9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_ODpHI33sEeyivuDeOiJBMg" type="_CFMuYPDbEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ODpHJH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3ptd8V9xEey5t-mahoHmrg" name="getInterventionActs" bodyCondition="_3ptd9F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3ptd9F9xEey5t-mahoHmrg" name="body" constrainedElement="_3ptd8V9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3ptd9V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OEFzEX3sEeyivuDeOiJBMg" name="getInterventionActs" bodyCondition="_OEFzFH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OEFzFH3sEeyivuDeOiJBMg" name="body" constrainedElement="_OEFzEX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OEFzFX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::InterventionAct)).oclAsType(consol::InterventionAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3ptd8l9xEey5t-mahoHmrg" type="_XD5vgJA8EeOZX935IVJfOg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3ptd819xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OEFzEn3sEeyivuDeOiJBMg" type="_XD5vgJA8EeOZX935IVJfOg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OEFzE33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3qObUl9xEey5t-mahoHmrg" name="getProcedureActivityObservation2s" bodyCondition="_3qObVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3qObVV9xEey5t-mahoHmrg" name="body" constrainedElement="_3qObUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3qObVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OEkUMn3sEeyivuDeOiJBMg" name="getProcedureActivityObservation2s" bodyCondition="_OEkUNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OEkUNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OEkUMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OEkUNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProcedureActivityObservation2)).oclAsType(consol::ProcedureActivityObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3qObU19xEey5t-mahoHmrg" type="_QoLWAPDjEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3qObVF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OEkUM33sEeyivuDeOiJBMg" type="_QoLWAPDjEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OEkUNH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3qs8cl9xEey5t-mahoHmrg" name="getProcedureActivityProcedure2s" bodyCondition="_3qs8dV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3qs8dV9xEey5t-mahoHmrg" name="body" constrainedElement="_3qs8cl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3qs8dl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OFCOQn3sEeyivuDeOiJBMg" name="getProcedureActivityProcedure2s" bodyCondition="_OFCORX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OFCORX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OFCOQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OFCORn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getProcedures()->select(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::ProcedureActivityProcedure2)).oclAsType(consol::ProcedureActivityProcedure2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3qs8c19xEey5t-mahoHmrg" type="_fCVOQPDqEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3qs8dF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OFCOQ33sEeyivuDeOiJBMg" type="_fCVOQPDqEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OFCORH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3rMrsl9xEey5t-mahoHmrg" name="getEncounterActivity2s" bodyCondition="_3rMrtV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3rMrtV9xEey5t-mahoHmrg" name="body" constrainedElement="_3rMrsl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3rMrtl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OFdsEn3sEeyivuDeOiJBMg" name="getEncounterActivity2s" bodyCondition="_OFdsFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OFdsFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OFdsEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OFdsFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getEncounters()->select(encounter : cda::Encounter | not encounter.oclIsUndefined() and encounter.oclIsKindOf(consol::EncounterActivity2)).oclAsType(consol::EncounterActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3rMrs19xEey5t-mahoHmrg" type="_RGU34MzDEeO93sHu8pHB2g" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3rMrtF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OFdsE33sEeyivuDeOiJBMg" type="_RGU34MzDEeO93sHu8pHB2g" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OFdsFH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3rsa8l9xEey5t-mahoHmrg" name="getInstruction2s" bodyCondition="_3rsa9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3rsa9V9xEey5t-mahoHmrg" name="body" constrainedElement="_3rsa8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3rsa9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OF6YAn3sEeyivuDeOiJBMg" name="getInstruction2s" bodyCondition="_OF6YBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OF6YBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OF6YAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OF6YBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::Instruction2)).oclAsType(consol::Instruction2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3rsa819xEey5t-mahoHmrg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3rsa9F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OF6YA33sEeyivuDeOiJBMg" type="_D62NwOH7EeO04sHNODkHmQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OF6YBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3sNYUl9xEey5t-mahoHmrg" name="getNonMedicinalSupplyActivity2s" bodyCondition="_3sNYVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3sNYVV9xEey5t-mahoHmrg" name="body" constrainedElement="_3sNYUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3sNYVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OGVOwn3sEeyivuDeOiJBMg" name="getNonMedicinalSupplyActivity2s" bodyCondition="_OGVOxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OGVOxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OGVOwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OGVOxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::NonMedicinalSupplyActivity2)).oclAsType(consol::NonMedicinalSupplyActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3sNYU19xEey5t-mahoHmrg" type="_k_C20OaCEeOmzetP5oaH3A" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3sNYVF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OGVOw33sEeyivuDeOiJBMg" type="_k_C20OaCEeOmzetP5oaH3A" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OGVOxH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3suVsl9xEey5t-mahoHmrg" name="getPlannedAct2s" bodyCondition="_3suVtV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3suVtV9xEey5t-mahoHmrg" name="body" constrainedElement="_3suVsl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3suVtl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OGxTon3sEeyivuDeOiJBMg" name="getPlannedAct2s" bodyCondition="_OGxTpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OGxTpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OGxTon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OGxTpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PlannedAct2)).oclAsType(consol::PlannedAct2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3suVs19xEey5t-mahoHmrg" type="_lLnRMOaYEeOmzetP5oaH3A" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3suVtF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OGxTo33sEeyivuDeOiJBMg" type="_lLnRMOaYEeOmzetP5oaH3A" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OGxTpH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3tOsAl9xEey5t-mahoHmrg" name="getPlannedEncounter2s" bodyCondition="_3tOsBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3tOsBV9xEey5t-mahoHmrg" name="body" constrainedElement="_3tOsAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3tOsBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OHLjUH3sEeyivuDeOiJBMg" name="getPlannedEncounter2s" bodyCondition="_OHLjU33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OHLjU33sEeyivuDeOiJBMg" name="body" constrainedElement="_OHLjUH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OHLjVH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getEncounters()->select(encounter : cda::Encounter | not encounter.oclIsUndefined() and encounter.oclIsKindOf(consol::PlannedEncounter2)).oclAsType(consol::PlannedEncounter2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3tOsA19xEey5t-mahoHmrg" type="_bDPFMOdXEeOqBOMhgDlycQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3tOsBF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OHLjUX3sEeyivuDeOiJBMg" type="_bDPFMOdXEeOqBOMhgDlycQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OHLjUn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3tvCUl9xEey5t-mahoHmrg" name="getPlannedObservation2s" bodyCondition="_3tvCVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3tvCVV9xEey5t-mahoHmrg" name="body" constrainedElement="_3tvCUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3tvCVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OHlzAn3sEeyivuDeOiJBMg" name="getPlannedObservation2s" bodyCondition="_OHlzBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OHlzBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OHlzAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OHlzBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PlannedObservation2)).oclAsType(consol::PlannedObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3tvCU19xEey5t-mahoHmrg" type="_jKZssOdvEeOqBOMhgDlycQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3tvCVF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OHlzA33sEeyivuDeOiJBMg" type="_jKZssOdvEeOqBOMhgDlycQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OHlzBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3uTqEl9xEey5t-mahoHmrg" name="getPlannedProcedure2s" bodyCondition="_3uTqFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3uTqFV9xEey5t-mahoHmrg" name="body" constrainedElement="_3uTqEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3uTqFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OIApwn3sEeyivuDeOiJBMg" name="getPlannedProcedure2s" bodyCondition="_OIApxX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OIApxX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OIApwn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OIApxn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getProcedures()->select(procedure : cda::Procedure | not procedure.oclIsUndefined() and procedure.oclIsKindOf(consol::PlannedProcedure2)).oclAsType(consol::PlannedProcedure2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3uTqE19xEey5t-mahoHmrg" type="_cs0YsOeEEeOqBOMhgDlycQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3uTqFF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OIApw33sEeyivuDeOiJBMg" type="_cs0YsOeEEeOqBOMhgDlycQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OIApxH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3u8jQF9xEey5t-mahoHmrg" name="getPlannedMedicationActivity2s" bodyCondition="_3u8jQ19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3u8jQ19xEey5t-mahoHmrg" name="body" constrainedElement="_3u8jQF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3u8jRF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OIej0n3sEeyivuDeOiJBMg" name="getPlannedMedicationActivity2s" bodyCondition="_OIej1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OIej1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_OIej0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OIej1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::PlannedMedicationActivity2)).oclAsType(consol::PlannedMedicationActivity2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3u8jQV9xEey5t-mahoHmrg" type="_Yj45YOgREeO-iJTuAv7BKQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3u8jQl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OIej033sEeyivuDeOiJBMg" type="_Yj45YOgREeO-iJTuAv7BKQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OIej1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3vfV0l9xEey5t-mahoHmrg" name="getPlannedSupply2s" bodyCondition="_3vfV1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3vfV1V9xEey5t-mahoHmrg" name="body" constrainedElement="_3vfV0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3vfV1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OI5akH3sEeyivuDeOiJBMg" name="getPlannedSupply2s" bodyCondition="_OI5ak33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OI5ak33sEeyivuDeOiJBMg" name="body" constrainedElement="_OI5akH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OI5alH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSupplies()->select(supply : cda::Supply | not supply.oclIsUndefined() and supply.oclIsKindOf(consol::PlannedSupply2)).oclAsType(consol::PlannedSupply2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3vfV019xEey5t-mahoHmrg" type="_vEd1cOg0EeO-iJTuAv7BKQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3vfV1F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OI5akX3sEeyivuDeOiJBMg" type="_vEd1cOg0EeO-iJTuAv7BKQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OI5akn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3wJdIl9xEey5t-mahoHmrg" name="getNutritionRecommendations" bodyCondition="_3wJdJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3wJdJV9xEey5t-mahoHmrg" name="body" constrainedElement="_3wJdIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3wJdJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OJTqQn3sEeyivuDeOiJBMg" name="getNutritionRecommendations" bodyCondition="_OJTqRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OJTqRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OJTqQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OJTqRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::NutritionRecommendation)).oclAsType(consol::NutritionRecommendation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3wJdI19xEey5t-mahoHmrg" type="_FhAIMI3FEeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3wJdJF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OJTqQ33sEeyivuDeOiJBMg" type="_FhAIMI3FEeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OJTqRH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3wqagF9xEey5t-mahoHmrg" name="getEntryReferenceDocInstances" bodyCondition="_3wqag19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3wqag19xEey5t-mahoHmrg" name="body" constrainedElement="_3wqagF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3wqahF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OJt58H3sEeyivuDeOiJBMg" name="getEntryReferenceDocInstances" bodyCondition="_OJt5833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OJt5833sEeyivuDeOiJBMg" name="body" constrainedElement="_OJt58H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OJt59H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::EntryReference)).oclAsType(consol::EntryReference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3wqagV9xEey5t-mahoHmrg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3wqagl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OJt58X3sEeyivuDeOiJBMg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OJt58n3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3xKJwl9xEey5t-mahoHmrg" name="getEntryReferenceGoalObss" bodyCondition="_3xKJxV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3xKJxV9xEey5t-mahoHmrg" name="body" constrainedElement="_3xKJwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3xKJxl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OKIJoH3sEeyivuDeOiJBMg" name="getEntryReferenceGoalObss" bodyCondition="_OKIJo33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OKIJo33sEeyivuDeOiJBMg" name="body" constrainedElement="_OKIJoH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OKIJpH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::EntryReference)).oclAsType(consol::EntryReference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3xKJw19xEey5t-mahoHmrg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3xKJxF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OKIJoX3sEeyivuDeOiJBMg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OKIJon3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3xrHIF9xEey5t-mahoHmrg" name="getHandoffCommunicationParticipantss" bodyCondition="_3xrHI19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3xrHI19xEey5t-mahoHmrg" name="body" constrainedElement="_3xrHIF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3xrHJF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OKiZUn3sEeyivuDeOiJBMg" name="getHandoffCommunicationParticipantss" bodyCondition="_OKiZVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OKiZVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OKiZUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OKiZVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::HandoffCommunicationParticipants)).oclAsType(consol::HandoffCommunicationParticipants)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3xrHIV9xEey5t-mahoHmrg" type="_POfwAIz7EeOoMZgUoTghIg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3xrHIl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OKiZU33sEeyivuDeOiJBMg" type="_POfwAIz7EeOoMZgUoTghIg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OKiZVH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3yLdcl9xEey5t-mahoHmrg" name="getPlannedImmunizationActivities" bodyCondition="_3yLddV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3yLddV9xEey5t-mahoHmrg" name="body" constrainedElement="_3yLdcl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3yLddl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OK9QEH3sEeyivuDeOiJBMg" name="getPlannedImmunizationActivities" bodyCondition="_OK9QE33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OK9QE33sEeyivuDeOiJBMg" name="body" constrainedElement="_OK9QEH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OK9QFH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getSubstanceAdministrations()->select(substanceAdministration : cda::SubstanceAdministration | not substanceAdministration.oclIsUndefined() and substanceAdministration.oclIsKindOf(consol::PlannedImmunizationActivity)).oclAsType(consol::PlannedImmunizationActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3yLdc19xEey5t-mahoHmrg" type="_KRcPwJXFEeOgXcDbh8Igkw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3yLddF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OK9QEX3sEeyivuDeOiJBMg" type="_KRcPwJXFEeOgXcDbh8Igkw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OK9QEn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -40707,306 +40707,306 @@ It is a wrapper for a single risk concern which may be derived from a variety of
 A Risk Concern Act represents a health concern that is a risk. A risk is a clinical or socioeconomic condition that the patient does not currently have, but the probability of developing that condition rises to the level of concern such that an intervention and/or monitoring is needed.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_3zNYMV9xEey5t-mahoHmrg" name="RiskConcernActTemplateId" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3zNYMl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OL32En3sEeyivuDeOiJBMg" name="RiskConcernActTemplateId" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OL32E33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.136' and id.extension = '2015-08-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3zOmUF9xEey5t-mahoHmrg" name="RiskConcernActClassCode" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3zPNYF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OL5EMH3sEeyivuDeOiJBMg" name="RiskConcernActClassCode" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OL5EMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::x_ActClassDocumentEntryAct::ACT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3zQbgF9xEey5t-mahoHmrg" name="RiskConcernActMoodCode" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3zQbgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OL6SUH3sEeyivuDeOiJBMg" name="RiskConcernActMoodCode" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OL6SUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_DocumentActMood::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3zSQsF9xEey5t-mahoHmrg" name="RiskConcernActId" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3zSQsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OL7gcH3sEeyivuDeOiJBMg" name="RiskConcernActId" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OL7gcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3zUs8F9xEey5t-mahoHmrg" name="RiskConcernActCodeP" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3zUs8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OL98sH3sEeyivuDeOiJBMg" name="RiskConcernActCodeP" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OL98sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3zTe0F9xEey5t-mahoHmrg" name="RiskConcernActCode" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3zTe0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OL8ukH3sEeyivuDeOiJBMg" name="RiskConcernActCode" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OL8ukX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '281694009' and value.codeSystem = '2.16.840.1.113883.6.96')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3zV7EF9xEey5t-mahoHmrg" name="RiskConcernActStatusCode" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3zV7EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OL-jwH3sEeyivuDeOiJBMg" name="RiskConcernActStatusCode" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OL_K0H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'active' or value.code = 'suspended' or value.code = 'aborted' or value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3z24cF9xEey5t-mahoHmrg" name="RiskConcernActStatusCodeP" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3z24cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OMb2wH3sEeyivuDeOiJBMg" name="RiskConcernActStatusCodeP" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OMb2wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_30X10F9xEey5t-mahoHmrg" name="RiskConcernActEffectiveTime" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_30X10V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OM2tgH3sEeyivuDeOiJBMg" name="RiskConcernActEffectiveTime" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OM2tgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_309rsF9xEey5t-mahoHmrg" name="RiskConcernActAuthorParticipation" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_309rsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ONUAgH3sEeyivuDeOiJBMg" name="RiskConcernActAuthorParticipation" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ONUAgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_31cM0F9xEey5t-mahoHmrg" name="RiskConcernActProblemObservation2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_31cM0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ONuQMH3sEeyivuDeOiJBMg" name="RiskConcernActProblemObservation2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ONuQMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_317VAF9xEey5t-mahoHmrg" name="RiskConcernActAllergyObservation2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_317VAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OOJG8H3sEeyivuDeOiJBMg" name="RiskConcernActAllergyObservation2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OOJG8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AllergyObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_32cSYF9xEey5t-mahoHmrg" name="RiskConcernActEntryReferenceRelatesTo" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_32cSYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OOj9sH3sEeyivuDeOiJBMg" name="RiskConcernActEntryReferenceRelatesTo" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OOj9sX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EntryReference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_328osF9xEey5t-mahoHmrg" name="RiskConcernActEntryReferenceHasComponent" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_328osV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OO-0cH3sEeyivuDeOiJBMg" name="RiskConcernActEntryReferenceHasComponent" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OO-0cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EntryReference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::COMP)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_33c_AF9xEey5t-mahoHmrg" name="RiskConcernActAssessmentScaleObservation" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_33c_AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OPaSQH3sEeyivuDeOiJBMg" name="RiskConcernActAssessmentScaleObservation" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OPaSQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::AssessmentScaleObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_339VUF9xEey5t-mahoHmrg" name="RiskConcernActMentalStatusObservation2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_339VUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OP2XIH3sEeyivuDeOiJBMg" name="RiskConcernActMentalStatusObservation2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OP2XIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::MentalStatusObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_34dEkF9xEey5t-mahoHmrg" name="RiskConcernActSelfCareActivities" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_34dEkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OQTqIH3sEeyivuDeOiJBMg" name="RiskConcernActSelfCareActivities" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OQTqIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SelfCareActivities) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_348MwF9xEey5t-mahoHmrg" name="RiskConcernActMentalStatusObservation2B" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_348MwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OQug4H3sEeyivuDeOiJBMg" name="RiskConcernActMentalStatusObservation2B" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OQug4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::MentalStatusObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_35cjEF9xEey5t-mahoHmrg" name="RiskConcernActSmokingStatusMeaningfulUse2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_35cjEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ORIwkH3sEeyivuDeOiJBMg" name="RiskConcernActSmokingStatusMeaningfulUse2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ORIwkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SmokingStatusMeaningfulUse2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_357rQF9xEey5t-mahoHmrg" name="RiskConcernActEncounterDiagnosis2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_357rQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ORk1cH3sEeyivuDeOiJBMg" name="RiskConcernActEncounterDiagnosis2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ORk1cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EncounterDiagnosis2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_36pc8F9xEey5t-mahoHmrg" name="RiskConcernActFamilyHistoryOrganizer2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_36pc8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OR-eEH3sEeyivuDeOiJBMg" name="RiskConcernActFamilyHistoryOrganizer2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OR-eEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.organizer.oclIsUndefined() and entryRelationship.organizer.oclIsKindOf(consol::FamilyHistoryOrganizer2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_37LBYF9xEey5t-mahoHmrg" name="RiskConcernActFunctionalStatusObservation2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_37LBYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OSai8H3sEeyivuDeOiJBMg" name="RiskConcernActFunctionalStatusObservation2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OSai8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::FunctionalStatusObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_37r-wF9xEey5t-mahoHmrg" name="RiskConcernActHospitalAdmissionDiagnosis2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_37r-wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OS4dAH3sEeyivuDeOiJBMg" name="RiskConcernActHospitalAdmissionDiagnosis2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OS4dAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::HospitalAdmissionDiagnosis2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_38MVEF9xEey5t-mahoHmrg" name="RiskConcernActMentalStatusObservation2C" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_38MVEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OTWXEH3sEeyivuDeOiJBMg" name="RiskConcernActMentalStatusObservation2C" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OTWXEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::MentalStatusObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_38srYF9xEey5t-mahoHmrg" name="RiskConcernActNutritionAssessment" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_38srYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OT04MH3sEeyivuDeOiJBMg" name="RiskConcernActNutritionAssessment" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OT04MX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::NutritionAssessment) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_39NBsF9xEey5t-mahoHmrg" name="RiskConcernActNutritionAssessmentB" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_39NBsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OURkIH3sEeyivuDeOiJBMg" name="RiskConcernActNutritionAssessmentB" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OURkIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::NutritionAssessment) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_39tYAF9xEey5t-mahoHmrg" name="RiskConcernActPostprocedureDiagnosis2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_39tYAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OUrz0H3sEeyivuDeOiJBMg" name="RiskConcernActPostprocedureDiagnosis2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OUrz0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::PostprocedureDiagnosis2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3-NuUF9xEey5t-mahoHmrg" name="RiskConcernActPregnancyObservation" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3-NuUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OVFccH3sEeyivuDeOiJBMg" name="RiskConcernActPregnancyObservation" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OVGDgH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PregnancyObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3-ursF9xEey5t-mahoHmrg" name="RiskConcernActPreoperativeDiagnosis2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3-ursV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OVgTMH3sEeyivuDeOiJBMg" name="RiskConcernActPreoperativeDiagnosis2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OVgTMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::PreoperativeDiagnosis2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3_Oa8F9xEey5t-mahoHmrg" name="RiskConcernActReactionObservation2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3_Oa8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OV8YEH3sEeyivuDeOiJBMg" name="RiskConcernActReactionObservation2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OV8YEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ReactionObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_3_sVAF9xEey5t-mahoHmrg" name="RiskConcernActResultObservation2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_3_sVAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OWXO0H3sEeyivuDeOiJBMg" name="RiskConcernActResultObservation2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OWXO0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ResultObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4AMEQF9xEey5t-mahoHmrg" name="RiskConcernActSensoryStatus" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4AMEQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OWw3cH3sEeyivuDeOiJBMg" name="RiskConcernActSensoryStatus" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OWw3cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SensoryStatus) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4A1kgF9xEey5t-mahoHmrg" name="RiskConcernActSocialHistoryObservation2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4A1kgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OXLHIH3sEeyivuDeOiJBMg" name="RiskConcernActSocialHistoryObservation2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OXLHIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SocialHistoryObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4BV60F9xEey5t-mahoHmrg" name="RiskConcernActSubstanceOrDeviceAllergyObservation2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4BV60V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OXoaIH3sEeyivuDeOiJBMg" name="RiskConcernActSubstanceOrDeviceAllergyObservation2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OXoaIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::SubstanceOrDeviceAllergyObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4B2RIF9xEey5t-mahoHmrg" name="RiskConcernActTobaccoUse2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4B2RIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OYFGEH3sEeyivuDeOiJBMg" name="RiskConcernActTobaccoUse2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OYFGEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::TobaccoUse2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4CUyQF9xEey5t-mahoHmrg" name="RiskConcernActVitalSignObservation2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4CUyQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OYf80H3sEeyivuDeOiJBMg" name="RiskConcernActVitalSignObservation2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OYf80X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::VitalSignObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4Cz6cF9xEey5t-mahoHmrg" name="RiskConcernActWoundObservation" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4Cz6cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OY6zkH3sEeyivuDeOiJBMg" name="RiskConcernActWoundObservation" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OY6zkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::LongitudinalCareWoundObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4DVe4F9xEey5t-mahoHmrg" name="RiskConcernActProblemObservation2HasSupport" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4DVe4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OZVDQH3sEeyivuDeOiJBMg" name="RiskConcernActProblemObservation2HasSupport" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OZVDQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::ProblemObservation2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::SPRT)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4DyK0F9xEey5t-mahoHmrg" name="RiskConcernActCaregiverCharacteristics" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4DyK0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OZvS8H3sEeyivuDeOiJBMg" name="RiskConcernActCaregiverCharacteristics" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OZvS8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::CaregiverCharacteristics) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4EU9YF9xEey5t-mahoHmrg" name="RiskConcernActCulturalAndReligiousObservation" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4EU9YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OaMl8H3sEeyivuDeOiJBMg" name="RiskConcernActCulturalAndReligiousObservation" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OaMl8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::CulturalAndReligiousObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4E0FkF9xEey5t-mahoHmrg" name="RiskConcernActCharacteristicsOfHomeEnvironment" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4E0FkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Oaoq0H3sEeyivuDeOiJBMg" name="RiskConcernActCharacteristicsOfHomeEnvironment" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Oaoq0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::CharacteristicsOfHomeEnvironment) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4FT00F9xEey5t-mahoHmrg" name="RiskConcernActNutritionalStatusObservation" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4FT00V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_ObEvsH3sEeyivuDeOiJBMg" name="RiskConcernActNutritionalStatusObservation" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_ObEvsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::NutritionalStatusObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4FyV8F9xEey5t-mahoHmrg" name="RiskConcernActResultOrganizer2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4FyV8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Obj34H3sEeyivuDeOiJBMg" name="RiskConcernActResultOrganizer2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Obj34X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.organizer.oclIsUndefined() and entryRelationship.organizer.oclIsKindOf(consol::ResultOrganizer2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4GReIF9xEey5t-mahoHmrg" name="RiskConcernActPriorityPreferencePatient" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4GReIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OcAj0H3sEeyivuDeOiJBMg" name="RiskConcernActPriorityPreferencePatient" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OcAj0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PriorityPreference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4GwmUF9xEey5t-mahoHmrg" name="RiskConcernActPriorityPreferenceProvider" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4GwmUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OccosH3sEeyivuDeOiJBMg" name="RiskConcernActPriorityPreferenceProvider" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OccosX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::PriorityPreference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4HSKwF9xEey5t-mahoHmrg" name="RiskConcernActProblemConcernAct2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4HSKwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Oc5UoH3sEeyivuDeOiJBMg" name="RiskConcernActProblemConcernAct2" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Oc5UoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::ProblemConcernAct2) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4HzIIF9xEey5t-mahoHmrg" name="RiskConcernActEntryReferenceHealthConcern" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4HzIIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OdUycH3sEeyivuDeOiJBMg" name="RiskConcernActEntryReferenceHealthConcern" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OdUycX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->exists(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::EntryReference) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4IUFgF9xEey5t-mahoHmrg" name="RiskConcernActReference" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4IUFgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OdysgH3sEeyivuDeOiJBMg" name="RiskConcernActReference" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OdysgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->exists(reference : cda::Reference | not reference.oclIsUndefined() and reference.oclIsKindOf(cda::Reference))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9EGqEF9xEey5t-mahoHmrg" name="RiskConcernActReferenceTypeCode" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9EGqEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TI-pQH3sEeyivuDeOiJBMg" name="RiskConcernActReferenceTypeCode" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TI-pQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null)->reject(typeCode=vocab::x_ActRelationshipExternalReference::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9EGqEl9xEey5t-mahoHmrg" name="RiskConcernActReferenceExternalDocumentReference" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9EGqE19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TI_QUH3sEeyivuDeOiJBMg" name="RiskConcernActReferenceExternalDocumentReference" constrainedElement="_mMk3QON1EeS_XOr-dz_KWA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TI_QUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->excluding(null)->reject(externalDocument->one(externalDocument : cda::ExternalDocument | not externalDocument.oclIsUndefined() and externalDocument.oclIsKindOf(consol::ExternalDocumentReference)))</body>
         </specification>
@@ -41014,411 +41014,411 @@ value.code = 'active' or value.code = 'suspended' or value.code = 'aborted' or v
       <generalization xmi:id="_mMszEON1EeS_XOr-dz_KWA">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_31cz4F9xEey5t-mahoHmrg" name="getProblemObservation2s" bodyCondition="_31cz419xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_31cz419xEey5t-mahoHmrg" name="body" constrainedElement="_31cz4F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_31cz5F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_ONu3QH3sEeyivuDeOiJBMg" name="getProblemObservation2s" bodyCondition="_ONu3Q33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ONu3Q33sEeyivuDeOiJBMg" name="body" constrainedElement="_ONu3QH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ONu3RH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation2)).oclAsType(consol::ProblemObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_31cz4V9xEey5t-mahoHmrg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_31cz4l9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_ONu3QX3sEeyivuDeOiJBMg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ONu3Qn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_317VAl9xEey5t-mahoHmrg" name="getAllergyObservation2s" bodyCondition="_317VBV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_317VBV9xEey5t-mahoHmrg" name="body" constrainedElement="_317VAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_317VBl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OOJG8n3sEeyivuDeOiJBMg" name="getAllergyObservation2s" bodyCondition="_OOJG9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OOJG9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_OOJG8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OOJG9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AllergyObservation2)).oclAsType(consol::AllergyObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_317VA19xEey5t-mahoHmrg" type="_uVJogLj5EeODDJAC5t5vpw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_317VBF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OOJG833sEeyivuDeOiJBMg" type="_uVJogLj5EeODDJAC5t5vpw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OOJG9H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_32c5cF9xEey5t-mahoHmrg" name="getEntryReferenceRelatesTos" bodyCondition="_32c5c19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_32c5c19xEey5t-mahoHmrg" name="body" constrainedElement="_32c5cF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_32c5dF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OOj9sn3sEeyivuDeOiJBMg" name="getEntryReferenceRelatesTos" bodyCondition="_OOj9tX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OOj9tX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OOj9sn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OOj9tn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::EntryReference)).oclAsType(consol::EntryReference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_32c5cV9xEey5t-mahoHmrg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_32c5cl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OOj9s33sEeyivuDeOiJBMg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OOj9tH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_329PwF9xEey5t-mahoHmrg" name="getEntryReferenceHasComponents" bodyCondition="_329Pw19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_329Pw19xEey5t-mahoHmrg" name="body" constrainedElement="_329PwF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_329PxF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OO-0cn3sEeyivuDeOiJBMg" name="getEntryReferenceHasComponents" bodyCondition="_OO-0dX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OO-0dX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OO-0cn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OO-0dn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::EntryReference)).oclAsType(consol::EntryReference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_329PwV9xEey5t-mahoHmrg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_329Pwl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OO-0c33sEeyivuDeOiJBMg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OO-0dH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_33c_Al9xEey5t-mahoHmrg" name="getAssessmentScaleObservations" bodyCondition="_33c_BV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_33c_BV9xEey5t-mahoHmrg" name="body" constrainedElement="_33c_Al9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_33c_Bl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OPaSQn3sEeyivuDeOiJBMg" name="getAssessmentScaleObservations" bodyCondition="_OPaSRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OPaSRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OPaSQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OPaSRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::AssessmentScaleObservation)).oclAsType(consol::AssessmentScaleObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_33c_A19xEey5t-mahoHmrg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_33c_BF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OPaSQ33sEeyivuDeOiJBMg" type="_Zi33YOYxEeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OPaSRH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_339VUl9xEey5t-mahoHmrg" name="getMentalStatusObservation2s" bodyCondition="_339VVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_339VVV9xEey5t-mahoHmrg" name="body" constrainedElement="_339VUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_339VVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OP2-MH3sEeyivuDeOiJBMg" name="getMentalStatusObservation2s" bodyCondition="_OP2-M33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OP2-M33sEeyivuDeOiJBMg" name="body" constrainedElement="_OP2-MH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OP2-NH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::MentalStatusObservation2)).oclAsType(consol::MentalStatusObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_339VU19xEey5t-mahoHmrg" type="_ze150PitEeOXlK95I8tUew" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_339VVF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OP2-MX3sEeyivuDeOiJBMg" type="_ze150PitEeOXlK95I8tUew" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OP2-Mn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_34dEkl9xEey5t-mahoHmrg" name="getSelfCareActivitiess" bodyCondition="_34dElV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_34dElV9xEey5t-mahoHmrg" name="body" constrainedElement="_34dEkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_34dEll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OQTqIn3sEeyivuDeOiJBMg" name="getSelfCareActivitiess" bodyCondition="_OQTqJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OQTqJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OQTqIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OQTqJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SelfCareActivities)).oclAsType(consol::SelfCareActivities)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_34dEk19xEey5t-mahoHmrg" type="_nC0xUJmzEeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_34dElF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OQTqI33sEeyivuDeOiJBMg" type="_nC0xUJmzEeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OQTqJH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_348z0F9xEey5t-mahoHmrg" name="getMentalStatusObservation2Bs" bodyCondition="_348z019xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_348z019xEey5t-mahoHmrg" name="body" constrainedElement="_348z0F9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_348z1F9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OQvH8H3sEeyivuDeOiJBMg" name="getMentalStatusObservation2Bs" bodyCondition="_OQvH833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OQvH833sEeyivuDeOiJBMg" name="body" constrainedElement="_OQvH8H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OQvH9H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::MentalStatusObservation2)).oclAsType(consol::MentalStatusObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_348z0V9xEey5t-mahoHmrg" type="_ze150PitEeOXlK95I8tUew" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_348z0l9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OQvH8X3sEeyivuDeOiJBMg" type="_ze150PitEeOXlK95I8tUew" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OQvH8n3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_35cjEl9xEey5t-mahoHmrg" name="getSmokingStatusMeaningfulUse2s" bodyCondition="_35cjFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_35cjFV9xEey5t-mahoHmrg" name="body" constrainedElement="_35cjEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_35cjFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_ORJXoH3sEeyivuDeOiJBMg" name="getSmokingStatusMeaningfulUse2s" bodyCondition="_ORJXo33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ORJXo33sEeyivuDeOiJBMg" name="body" constrainedElement="_ORJXoH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ORJXpH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SmokingStatusMeaningfulUse2)).oclAsType(consol::SmokingStatusMeaningfulUse2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_35cjE19xEey5t-mahoHmrg" type="_Hl3ScLk0EeODDJAC5t5vpw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_35cjFF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_ORJXoX3sEeyivuDeOiJBMg" type="_Hl3ScLk0EeODDJAC5t5vpw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ORJXon3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_358SUF9xEey5t-mahoHmrg" name="getEncounterDiagnosis2s" bodyCondition="_358SU19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_358SU19xEey5t-mahoHmrg" name="body" constrainedElement="_358SUF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_358SVF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_ORk1cn3sEeyivuDeOiJBMg" name="getEncounterDiagnosis2s" bodyCondition="_ORk1dX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ORk1dX3sEeyivuDeOiJBMg" name="body" constrainedElement="_ORk1cn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ORk1dn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::EncounterDiagnosis2)).oclAsType(consol::EncounterDiagnosis2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_358SUV9xEey5t-mahoHmrg" type="_jH6CcMzNEeO93sHu8pHB2g" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_358SUl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_ORk1c33sEeyivuDeOiJBMg" type="_jH6CcMzNEeO93sHu8pHB2g" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ORk1dH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_36pc8l9xEey5t-mahoHmrg" name="getFamilyHistoryOrganizer2s" bodyCondition="_36pc9V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_36pc9V9xEey5t-mahoHmrg" name="body" constrainedElement="_36pc8l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_36pc9l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OR_FIH3sEeyivuDeOiJBMg" name="getFamilyHistoryOrganizer2s" bodyCondition="_OR_FI33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OR_FI33sEeyivuDeOiJBMg" name="body" constrainedElement="_OR_FIH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OR_FJH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::FamilyHistoryOrganizer2)).oclAsType(consol::FamilyHistoryOrganizer2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_36pc819xEey5t-mahoHmrg" type="_6whQEIbpEeSxzopshBnQuw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_36pc9F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OR_FIX3sEeyivuDeOiJBMg" type="_6whQEIbpEeSxzopshBnQuw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OR_FIn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_37LBYl9xEey5t-mahoHmrg" name="getFunctionalStatusObservation2s" bodyCondition="_37LBZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_37LBZV9xEey5t-mahoHmrg" name="body" constrainedElement="_37LBYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_37LBZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OSai8n3sEeyivuDeOiJBMg" name="getFunctionalStatusObservation2s" bodyCondition="_OSai9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OSai9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_OSai8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OSai9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::FunctionalStatusObservation2)).oclAsType(consol::FunctionalStatusObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_37LBY19xEey5t-mahoHmrg" type="_3WqogMzSEeO93sHu8pHB2g" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_37LBZF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OSai833sEeyivuDeOiJBMg" type="_3WqogMzSEeO93sHu8pHB2g" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OSai9H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_37r-wl9xEey5t-mahoHmrg" name="getHospitalAdmissionDiagnosis2s" bodyCondition="_37r-xV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_37r-xV9xEey5t-mahoHmrg" name="body" constrainedElement="_37r-wl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_37r-xl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OS4dAn3sEeyivuDeOiJBMg" name="getHospitalAdmissionDiagnosis2s" bodyCondition="_OS4dBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OS4dBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OS4dAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OS5EEH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::HospitalAdmissionDiagnosis2)).oclAsType(consol::HospitalAdmissionDiagnosis2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_37r-w19xEey5t-mahoHmrg" type="_GM6icOEIEeOmBMTtnrPqww" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_37r-xF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OS4dA33sEeyivuDeOiJBMg" type="_GM6icOEIEeOmBMTtnrPqww" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OS4dBH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_38MVEl9xEey5t-mahoHmrg" name="getMentalStatusObservation2Cs" bodyCondition="_38MVFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_38MVFV9xEey5t-mahoHmrg" name="body" constrainedElement="_38MVEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_38M8IF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OTWXEn3sEeyivuDeOiJBMg" name="getMentalStatusObservation2Cs" bodyCondition="_OTW-In3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OTW-In3sEeyivuDeOiJBMg" name="body" constrainedElement="_OTWXEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OTW-I33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::MentalStatusObservation2)).oclAsType(consol::MentalStatusObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_38MVE19xEey5t-mahoHmrg" type="_ze150PitEeOXlK95I8tUew" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_38MVFF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OTW-IH3sEeyivuDeOiJBMg" type="_ze150PitEeOXlK95I8tUew" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OTW-IX3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_38srYl9xEey5t-mahoHmrg" name="getNutritionAssessments" bodyCondition="_38srZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_38srZV9xEey5t-mahoHmrg" name="body" constrainedElement="_38srYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_38srZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OT04Mn3sEeyivuDeOiJBMg" name="getNutritionAssessments" bodyCondition="_OT04NX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OT04NX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OT04Mn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OT1fQH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::NutritionAssessment)).oclAsType(consol::NutritionAssessment)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_38srY19xEey5t-mahoHmrg" type="_NP5zMI05EeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_38srZF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OT04M33sEeyivuDeOiJBMg" type="_NP5zMI05EeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OT04NH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_39NowF9xEey5t-mahoHmrg" name="getNutritionAssessmentBs" bodyCondition="_39Now19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_39Now19xEey5t-mahoHmrg" name="body" constrainedElement="_39NowF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_39NoxF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OURkIn3sEeyivuDeOiJBMg" name="getNutritionAssessmentBs" bodyCondition="_OURkJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OURkJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OURkIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OURkJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::NutritionAssessment)).oclAsType(consol::NutritionAssessment)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_39NowV9xEey5t-mahoHmrg" type="_NP5zMI05EeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_39Nowl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OURkI33sEeyivuDeOiJBMg" type="_NP5zMI05EeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OURkJH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_39tYAl9xEey5t-mahoHmrg" name="getPostprocedureDiagnosis2s" bodyCondition="_39t_El9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_39t_El9xEey5t-mahoHmrg" name="body" constrainedElement="_39tYAl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_39t_E19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OUrz0n3sEeyivuDeOiJBMg" name="getPostprocedureDiagnosis2s" bodyCondition="_OUrz1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OUrz1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_OUrz0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OUrz1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PostprocedureDiagnosis2)).oclAsType(consol::PostprocedureDiagnosis2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_39t_EF9xEey5t-mahoHmrg" type="__SgUwOwuEeOqa975IP2wug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_39t_EV9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OUrz033sEeyivuDeOiJBMg" type="__SgUwOwuEeOqa975IP2wug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OUrz1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3-OVYF9xEey5t-mahoHmrg" name="getPregnancyObservations" bodyCondition="_3-OVY19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3-OVY19xEey5t-mahoHmrg" name="body" constrainedElement="_3-OVYF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3-OVZF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OVGDgX3sEeyivuDeOiJBMg" name="getPregnancyObservations" bodyCondition="_OVGDhH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OVGDhH3sEeyivuDeOiJBMg" name="body" constrainedElement="_OVGDgX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OVGDhX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PregnancyObservation)).oclAsType(consol::PregnancyObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3-OVYV9xEey5t-mahoHmrg" type="_2N6soBSVEeGGzu7fmW9pXw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3-OVYl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OVGDgn3sEeyivuDeOiJBMg" type="_2N6soBSVEeGGzu7fmW9pXw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OVGDg33sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3-ursl9xEey5t-mahoHmrg" name="getPreoperativeDiagnosis2s" bodyCondition="_3-urtV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3-urtV9xEey5t-mahoHmrg" name="body" constrainedElement="_3-ursl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3-urtl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OVgTMn3sEeyivuDeOiJBMg" name="getPreoperativeDiagnosis2s" bodyCondition="_OVgTNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OVgTNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OVgTMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OVgTNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::PreoperativeDiagnosis2)).oclAsType(consol::PreoperativeDiagnosis2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3-urs19xEey5t-mahoHmrg" type="_5l3g0OzYEeOnE-G4kptBiw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3-urtF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OVgTM33sEeyivuDeOiJBMg" type="_5l3g0OzYEeOnE-G4kptBiw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OVgTNH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3_PCAF9xEey5t-mahoHmrg" name="getReactionObservation2s" bodyCondition="_3_PCA19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3_PCA19xEey5t-mahoHmrg" name="body" constrainedElement="_3_PCAF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3_PCBF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OV8YEn3sEeyivuDeOiJBMg" name="getReactionObservation2s" bodyCondition="_OV8_In3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OV8_In3sEeyivuDeOiJBMg" name="body" constrainedElement="_OV8YEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OV8_I33sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ReactionObservation2)).oclAsType(consol::ReactionObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3_PCAV9xEey5t-mahoHmrg" type="_U3yosPDxEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3_PCAl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OV8_IH3sEeyivuDeOiJBMg" type="_U3yosPDxEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OV8_IX3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_3_s8EF9xEey5t-mahoHmrg" name="getResultObservation2s" bodyCondition="_3_s8E19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_3_s8E19xEey5t-mahoHmrg" name="body" constrainedElement="_3_s8EF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_3_s8FF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OWXO0n3sEeyivuDeOiJBMg" name="getResultObservation2s" bodyCondition="_OWXO1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OWXO1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_OWXO0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OWXO1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ResultObservation2)).oclAsType(consol::ResultObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_3_s8EV9xEey5t-mahoHmrg" type="_H85E0PF7EeOmsLWmq5fnqQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3_s8El9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OWXO033sEeyivuDeOiJBMg" type="_H85E0PF7EeOmsLWmq5fnqQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OWXO1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4AMEQl9xEey5t-mahoHmrg" name="getSensoryStatuss" bodyCondition="_4AMrUl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4AMrUl9xEey5t-mahoHmrg" name="body" constrainedElement="_4AMEQl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4AMrU19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OWw3cn3sEeyivuDeOiJBMg" name="getSensoryStatuss" bodyCondition="_OWw3dX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OWw3dX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OWw3cn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OWw3dn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SensoryStatus)).oclAsType(consol::SensoryStatus)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4AMrUF9xEey5t-mahoHmrg" type="_kyeGAJm4EeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4AMrUV9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OWw3c33sEeyivuDeOiJBMg" type="_kyeGAJm4EeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OWw3dH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4A1kgl9xEey5t-mahoHmrg" name="getSocialHistoryObservation2s" bodyCondition="_4A1khV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4A1khV9xEey5t-mahoHmrg" name="body" constrainedElement="_4A1kgl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4A1khl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OXLHIn3sEeyivuDeOiJBMg" name="getSocialHistoryObservation2s" bodyCondition="_OXLHJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OXLHJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OXLHIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OXLHJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SocialHistoryObservation2)).oclAsType(consol::SocialHistoryObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4A1kg19xEey5t-mahoHmrg" type="_b_iGIPJfEeO2NaSiicarcg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4A1khF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OXLHI33sEeyivuDeOiJBMg" type="_b_iGIPJfEeO2NaSiicarcg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OXLHJH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4BV60l9xEey5t-mahoHmrg" name="getSubstanceOrDeviceAllergyObservation2s" bodyCondition="_4BWh4F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4BWh4F9xEey5t-mahoHmrg" name="body" constrainedElement="_4BV60l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4BWh4V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OXoaIn3sEeyivuDeOiJBMg" name="getSubstanceOrDeviceAllergyObservation2s" bodyCondition="_OXoaJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OXoaJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OXoaIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OXoaJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SubstanceOrDeviceAllergyObservation2)).oclAsType(consol::SubstanceOrDeviceAllergyObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4BV6019xEey5t-mahoHmrg" type="_K3M6IPKJEeOn7bMsPcStOw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4BV61F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OXoaI33sEeyivuDeOiJBMg" type="_K3M6IPKJEeOn7bMsPcStOw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OXoaJH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4B2RIl9xEey5t-mahoHmrg" name="getTobaccoUse2s" bodyCondition="_4B2RJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4B2RJV9xEey5t-mahoHmrg" name="body" constrainedElement="_4B2RIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4B2RJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OYFGEn3sEeyivuDeOiJBMg" name="getTobaccoUse2s" bodyCondition="_OYFGFX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OYFGFX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OYFGEn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OYFGFn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::TobaccoUse2)).oclAsType(consol::TobaccoUse2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4B2RI19xEey5t-mahoHmrg" type="_qHUXwPMxEeOUvapeh9bVvQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4B2RJF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OYFGE33sEeyivuDeOiJBMg" type="_qHUXwPMxEeOUvapeh9bVvQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OYFGFH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4CVZUF9xEey5t-mahoHmrg" name="getVitalSignObservation2s" bodyCondition="_4CVZU19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4CVZU19xEey5t-mahoHmrg" name="body" constrainedElement="_4CVZUF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4CVZVF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OYf80n3sEeyivuDeOiJBMg" name="getVitalSignObservation2s" bodyCondition="_OYf81X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OYf81X3sEeyivuDeOiJBMg" name="body" constrainedElement="_OYf80n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OYf81n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::VitalSignObservation2)).oclAsType(consol::VitalSignObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4CVZUV9xEey5t-mahoHmrg" type="__zeTcPM3EeOUvapeh9bVvQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4CVZUl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OYf8033sEeyivuDeOiJBMg" type="__zeTcPM3EeOUvapeh9bVvQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OYf81H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4C0hgF9xEey5t-mahoHmrg" name="getWoundObservations" bodyCondition="_4C0hg19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4C0hg19xEey5t-mahoHmrg" name="body" constrainedElement="_4C0hgF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4C0hhF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OY6zkn3sEeyivuDeOiJBMg" name="getWoundObservations" bodyCondition="_OY7aoH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OY7aoH3sEeyivuDeOiJBMg" name="body" constrainedElement="_OY6zkn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OY7aoX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::LongitudinalCareWoundObservation)).oclAsType(consol::LongitudinalCareWoundObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4C0hgV9xEey5t-mahoHmrg" type="_09uFMJp_EeOK6dzbL4VoTA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4C0hgl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OY6zk33sEeyivuDeOiJBMg" type="_09uFMJp_EeOK6dzbL4VoTA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OY6zlH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4DVe4l9xEey5t-mahoHmrg" name="getProblemObservation2HasSupports" bodyCondition="_4DVe5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4DVe5V9xEey5t-mahoHmrg" name="body" constrainedElement="_4DVe4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4DVe5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OZVDQn3sEeyivuDeOiJBMg" name="getProblemObservation2HasSupports" bodyCondition="_OZVDRX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OZVDRX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OZVDQn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OZVDRn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ProblemObservation2)).oclAsType(consol::ProblemObservation2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4DVe419xEey5t-mahoHmrg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4DVe5F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OZVDQ33sEeyivuDeOiJBMg" type="_prDAkPDCEeOKPKE9au0oug" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OZVDRH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4DyK0l9xEey5t-mahoHmrg" name="getCaregiverCharacteristicss" bodyCondition="_4DyK1V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4DyK1V9xEey5t-mahoHmrg" name="body" constrainedElement="_4DyK0l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4DyK1l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OZvS8n3sEeyivuDeOiJBMg" name="getCaregiverCharacteristicss" bodyCondition="_OZvS9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OZvS9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_OZvS8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OZvS9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CaregiverCharacteristics)).oclAsType(consol::CaregiverCharacteristics)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4DyK019xEey5t-mahoHmrg" type="__pNCUOY-EeGINOJ_SD9_dA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4DyK1F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OZvS833sEeyivuDeOiJBMg" type="__pNCUOY-EeGINOJ_SD9_dA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OZvS9H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4EU9Yl9xEey5t-mahoHmrg" name="getCulturalAndReligiousObservations" bodyCondition="_4EU9ZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4EU9ZV9xEey5t-mahoHmrg" name="body" constrainedElement="_4EU9Yl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4EU9Zl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OaMl8n3sEeyivuDeOiJBMg" name="getCulturalAndReligiousObservations" bodyCondition="_OaMl9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OaMl9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_OaMl8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OaMl9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CulturalAndReligiousObservation)).oclAsType(consol::CulturalAndReligiousObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4EU9Y19xEey5t-mahoHmrg" type="_H2EzIIqZEeOoMZgUoTghIg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4EU9ZF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OaMl833sEeyivuDeOiJBMg" type="_H2EzIIqZEeOoMZgUoTghIg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OaMl9H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4E0Fkl9xEey5t-mahoHmrg" name="getCharacteristicsOfHomeEnvironments" bodyCondition="_4E0FlV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4E0FlV9xEey5t-mahoHmrg" name="body" constrainedElement="_4E0Fkl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4E0Fll9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OapR4H3sEeyivuDeOiJBMg" name="getCharacteristicsOfHomeEnvironments" bodyCondition="_OapR433sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OapR433sEeyivuDeOiJBMg" name="body" constrainedElement="_OapR4H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OapR5H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CharacteristicsOfHomeEnvironment)).oclAsType(consol::CharacteristicsOfHomeEnvironment)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4E0Fk19xEey5t-mahoHmrg" type="_O-O-IInUEeOJGtGyq_dBbA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4E0FlF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OapR4X3sEeyivuDeOiJBMg" type="_O-O-IInUEeOJGtGyq_dBbA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OapR4n3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4FT00l9xEey5t-mahoHmrg" name="getNutritionalStatusObservations" bodyCondition="_4FT01V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4FT01V9xEey5t-mahoHmrg" name="body" constrainedElement="_4FT00l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4FT01l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_ObEvsn3sEeyivuDeOiJBMg" name="getNutritionalStatusObservations" bodyCondition="_ObEvtX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_ObEvtX3sEeyivuDeOiJBMg" name="body" constrainedElement="_ObEvsn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_ObEvtn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::NutritionalStatusObservation)).oclAsType(consol::NutritionalStatusObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4FT0019xEey5t-mahoHmrg" type="_T1dcwI37EeOB0eBUISUB4Q" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4FT01F9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_ObEvs33sEeyivuDeOiJBMg" type="_T1dcwI37EeOB0eBUISUB4Q" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ObEvtH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4Fy9AF9xEey5t-mahoHmrg" name="getResultOrganizer2s" bodyCondition="_4Fy9A19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4Fy9A19xEey5t-mahoHmrg" name="body" constrainedElement="_4Fy9AF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4Fy9BF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Obj34n3sEeyivuDeOiJBMg" name="getResultOrganizer2s" bodyCondition="_Obj35X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Obj35X3sEeyivuDeOiJBMg" name="body" constrainedElement="_Obj34n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Obj35n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::ResultOrganizer2)).oclAsType(consol::ResultOrganizer2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4Fy9AV9xEey5t-mahoHmrg" type="_gU40UPGEEeOmsLWmq5fnqQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4Fy9Al9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Obj3433sEeyivuDeOiJBMg" type="_gU40UPGEEeOmsLWmq5fnqQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Obj35H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4GReIl9xEey5t-mahoHmrg" name="getPriorityPreferencePatients" bodyCondition="_4GReJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4GReJV9xEey5t-mahoHmrg" name="body" constrainedElement="_4GReIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4GSFMF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OcAj0n3sEeyivuDeOiJBMg" name="getPriorityPreferencePatients" bodyCondition="_OcAj1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OcAj1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_OcAj0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OcAj1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PriorityPreference)).oclAsType(consol::PriorityPreference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4GReI19xEey5t-mahoHmrg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4GReJF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OcAj033sEeyivuDeOiJBMg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OcAj1H3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4GwmUl9xEey5t-mahoHmrg" name="getPriorityPreferenceProviders" bodyCondition="_4GwmVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4GwmVV9xEey5t-mahoHmrg" name="body" constrainedElement="_4GwmUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4GwmVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Occosn3sEeyivuDeOiJBMg" name="getPriorityPreferenceProviders" bodyCondition="_OccotX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OccotX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Occosn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Occotn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::PriorityPreference)).oclAsType(consol::PriorityPreference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4GwmU19xEey5t-mahoHmrg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4GwmVF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Occos33sEeyivuDeOiJBMg" type="_ncafYJmaEeOLJeQez13EkQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OccotH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4HSKwl9xEey5t-mahoHmrg" name="getProblemConcernAct2s" bodyCondition="_4HSKxV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4HSKxV9xEey5t-mahoHmrg" name="body" constrainedElement="_4HSKwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4HSKxl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_Oc5Uon3sEeyivuDeOiJBMg" name="getProblemConcernAct2s" bodyCondition="_Oc5UpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_Oc5UpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_Oc5Uon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_Oc5Upn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::ProblemConcernAct2)).oclAsType(consol::ProblemConcernAct2)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4HSKw19xEey5t-mahoHmrg" type="_y5C8IOzbEeOnE-G4kptBiw" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4HSKxF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_Oc5Uo33sEeyivuDeOiJBMg" type="_y5C8IOzbEeOnE-G4kptBiw" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Oc5UpH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_4HzIIl9xEey5t-mahoHmrg" name="getEntryReferenceHealthConcerns" bodyCondition="_4HzIJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4HzIJV9xEey5t-mahoHmrg" name="body" constrainedElement="_4HzIIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4HzIJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_OdUycn3sEeyivuDeOiJBMg" name="getEntryReferenceHealthConcerns" bodyCondition="_OdVZgX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_OdVZgX3sEeyivuDeOiJBMg" name="body" constrainedElement="_OdUycn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_OdVZgn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::EntryReference)).oclAsType(consol::EntryReference)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4HzII19xEey5t-mahoHmrg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4HzIJF9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_OdUyc33sEeyivuDeOiJBMg" type="_u_keoIkOEeOJGtGyq_dBbA" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OdVZgH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -41437,78 +41437,78 @@ An example free text sig: Thyroxin 150 ug, take one tab by mouth every morning&#
           <body>not self.text.reference.value.oclIsUndefined() implies not self.getSection().text.getText(self.text.reference.value.substring(2, self.text.reference.value.size())).oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4apLoF9xEey5t-mahoHmrg" name="MedicationFreeTextSigTemplateId" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4apLoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Os77w33sEeyivuDeOiJBMg" name="MedicationFreeTextSigTemplateId" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Os77xH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.147')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4arA0F9xEey5t-mahoHmrg" name="MedicationFreeTextSigClassCode" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4arA0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Os9J4H3sEeyivuDeOiJBMg" name="MedicationFreeTextSigClassCode" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Os9J4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClass::SBADM</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4asO8F9xEey5t-mahoHmrg" name="MedicationFreeTextSigMoodCode" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4asO8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Os-YAH3sEeyivuDeOiJBMg" name="MedicationFreeTextSigMoodCode" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Os-YAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.moodCode.oclIsUndefined() and self.moodCode.oclIsKindOf(vocab::x_DocumentSubstanceMood) and 
 let value : vocab::x_DocumentSubstanceMood = self.moodCode.oclAsType(vocab::x_DocumentSubstanceMood) in 
 value = vocab::x_DocumentSubstanceMood::EVN or value = vocab::x_DocumentSubstanceMood::INT</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4bOacF9xEey5t-mahoHmrg" name="MedicationFreeTextSigCode" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4bOacV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OtbD8H3sEeyivuDeOiJBMg" name="MedicationFreeTextSigCode" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OtbD8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '76662-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4bPokF9xEey5t-mahoHmrg" name="MedicationFreeTextSigCodeP" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4bPokV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OtbrAH3sEeyivuDeOiJBMg" name="MedicationFreeTextSigCodeP" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OtbrAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4bQ2sF9xEey5t-mahoHmrg" name="MedicationFreeTextSigText" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4bQ2sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Otc5IH3sEeyivuDeOiJBMg" name="MedicationFreeTextSigText" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Otc5IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4b3ToF9xEey5t-mahoHmrg" name="MedicationFreeTextSigConsumable" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4b3ToV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ot6MIH3sEeyivuDeOiJBMg" name="MedicationFreeTextSigConsumable" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ot6MIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.consumable->one(consumable : cda::Consumable | not consumable.oclIsUndefined() and consumable.oclIsKindOf(cda::Consumable))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9EIfQF9xEey5t-mahoHmrg" name="MedicationFreeTextSigEDTELValue" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9EIfQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TJBFgH3sEeyivuDeOiJBMg" name="MedicationFreeTextSigEDTELValue" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TJBFgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.text->excluding(null)->select(isNullFlavorUndefined()).reference->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not value.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9EJGUF9xEey5t-mahoHmrg" name="MedicationFreeTextSigEDReference" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9EJGUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TJBFgn3sEeyivuDeOiJBMg" name="MedicationFreeTextSigEDReference" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TJBFg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.text->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((reference.oclIsUndefined() or reference.isNullFlavorUndefined()) implies (not reference.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9FqwUF9xEey5t-mahoHmrg" name="MedicationFreeTextSigConsumableManufacturedProductManufacturedLabeledDrugNullFlavor" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9FqwUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TKdP8H3sEeyivuDeOiJBMg" name="MedicationFreeTextSigConsumableManufacturedProductManufacturedLabeledDrugNullFlavor" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TKdP8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.consumable->excluding(null).manufacturedProduct->excluding(null).manufacturedLabeledDrug->excluding(null)->reject(isDefined('nullFlavor'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9FrXYF9xEey5t-mahoHmrg" name="MedicationFreeTextSigConsumableManufacturedProductManufacturedLabeledDrug" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9FrXYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TKdP8n3sEeyivuDeOiJBMg" name="MedicationFreeTextSigConsumableManufacturedProductManufacturedLabeledDrug" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TKdP833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.consumable->excluding(null).manufacturedProduct->excluding(null)->reject(manufacturedLabeledDrug->one(manufacturedLabeledDrug : cda::LabeledDrug | not manufacturedLabeledDrug.oclIsUndefined() and manufacturedLabeledDrug.oclIsKindOf(cda::LabeledDrug)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9FrXYl9xEey5t-mahoHmrg" name="MedicationFreeTextSigConsumableManufacturedProduct" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9FrXY19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TKd3AH3sEeyivuDeOiJBMg" name="MedicationFreeTextSigConsumableManufacturedProduct" constrainedElement="_kowjcDr-EeWD4MX6K2c_gA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TKd3AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.consumable->excluding(null)->reject(manufacturedProduct->one(manufacturedProduct : cda::ManufacturedProduct | not manufacturedProduct.oclIsUndefined() and manufacturedProduct.oclIsKindOf(cda::ManufacturedProduct)))</body>
         </specification>
@@ -41522,62 +41522,62 @@ value.code = '76662-6' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         <body>&lt;p>This observation represents the sex of the patient at birth. It is the sex that is entered on the person's birth certificate at time of birth.&lt;/p>&#xD;
 &lt;p>This observation is not appropriate for recording patient gender (administrativeGender).&lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_4dZktV9xEey5t-mahoHmrg" name="BirthSexObservationTemplateId" constrainedElement="_8fGTcD-qEeaJttsCYk-pKw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4dZktl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OvOawH3sEeyivuDeOiJBMg" name="BirthSexObservationTemplateId" constrainedElement="_8fGTcD-qEeaJttsCYk-pKw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OvOawX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.200' and id.extension = '2016-06-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4day0F9xEey5t-mahoHmrg" name="BirthSexObservationClassCode" constrainedElement="_8fGTcD-qEeaJttsCYk-pKw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4dbZ4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OvPB0H3sEeyivuDeOiJBMg" name="BirthSexObservationClassCode" constrainedElement="_8fGTcD-qEeaJttsCYk-pKw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OvPB0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4dcoAF9xEey5t-mahoHmrg" name="BirthSexObservationMoodCode" constrainedElement="_8fGTcD-qEeaJttsCYk-pKw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4dcoAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OvQP8H3sEeyivuDeOiJBMg" name="BirthSexObservationMoodCode" constrainedElement="_8fGTcD-qEeaJttsCYk-pKw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OvQP8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4dfrUF9xEey5t-mahoHmrg" name="BirthSexObservationCodeP" constrainedElement="_8fGTcD-qEeaJttsCYk-pKw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4dfrUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OvSsMH3sEeyivuDeOiJBMg" name="BirthSexObservationCodeP" constrainedElement="_8fGTcD-qEeaJttsCYk-pKw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OvSsMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4dedMF9xEey5t-mahoHmrg" name="BirthSexObservationCode" constrainedElement="_8fGTcD-qEeaJttsCYk-pKw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4dedMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OvReEH3sEeyivuDeOiJBMg" name="BirthSexObservationCode" constrainedElement="_8fGTcD-qEeaJttsCYk-pKw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OvReEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '76689-9' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4dhggF9xEey5t-mahoHmrg" name="BirthSexObservationStatusCode" constrainedElement="_8fGTcD-qEeaJttsCYk-pKw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4dhggV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OvTTQH3sEeyivuDeOiJBMg" name="BirthSexObservationStatusCode" constrainedElement="_8fGTcD-qEeaJttsCYk-pKw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OvTTQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4diuoF9xEey5t-mahoHmrg" name="BirthSexObservationStatusCodeP" constrainedElement="_8fGTcD-qEeaJttsCYk-pKw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4diuoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OvUhYH3sEeyivuDeOiJBMg" name="BirthSexObservationStatusCodeP" constrainedElement="_8fGTcD-qEeaJttsCYk-pKw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OvUhYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4dj8wF9xEey5t-mahoHmrg" name="BirthSexObservationValue" constrainedElement="_8fGTcD-qEeaJttsCYk-pKw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4dj8wV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OvVIcH3sEeyivuDeOiJBMg" name="BirthSexObservationValue" constrainedElement="_8fGTcD-qEeaJttsCYk-pKw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OvVIcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.5.1' and (value.code = 'F' or value.code = 'M')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4eE6IF9xEey5t-mahoHmrg" name="BirthSexObservationValueP" constrainedElement="_8fGTcD-qEeaJttsCYk-pKw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4eE6IV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OvvYIH3sEeyivuDeOiJBMg" name="BirthSexObservationValueP" constrainedElement="_8fGTcD-qEeaJttsCYk-pKw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OvvYIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
@@ -41590,62 +41590,62 @@ value.codeSystem = '2.16.840.1.113883.5.1' and (value.code = 'F' or value.code =
       <ownedComment xmi:id="_muQYQLDzEeafNo3UpQoAYw">
         <body>&lt;p>This observation represents the gravity of the potential risk for future life-threatening adverse reactions when exposed to a substance known to cause an adverse reaction in that individual. When the worst case result is assessed to have a life-threatening or organ system threatening potential, it is considered to be of high criticality.&lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_4fJRIF9xEey5t-mahoHmrg" name="CriticalityObservationTemplateId" constrainedElement="_LspMELDzEeafNo3UpQoAYw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4fJRIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Owj3gH3sEeyivuDeOiJBMg" name="CriticalityObservationTemplateId" constrainedElement="_LspMELDzEeafNo3UpQoAYw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Owj3gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.145')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4fLtYF9xEey5t-mahoHmrg" name="CriticalityObservationClassCode" constrainedElement="_LspMELDzEeafNo3UpQoAYw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4fLtYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OwlFoH3sEeyivuDeOiJBMg" name="CriticalityObservationClassCode" constrainedElement="_LspMELDzEeafNo3UpQoAYw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OwlFoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.classCode=vocab::ActClassObservation::OBS</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4fOJoF9xEey5t-mahoHmrg" name="CriticalityObservationMoodCode" constrainedElement="_LspMELDzEeafNo3UpQoAYw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4fOJoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OwmTwH3sEeyivuDeOiJBMg" name="CriticalityObservationMoodCode" constrainedElement="_LspMELDzEeafNo3UpQoAYw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OwmTwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.moodCode=vocab::x_ActMoodDocumentObservation::EVN</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4fRM8F9xEey5t-mahoHmrg" name="CriticalityObservationCodeP" constrainedElement="_LspMELDzEeafNo3UpQoAYw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4fRM8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OwowAH3sEeyivuDeOiJBMg" name="CriticalityObservationCodeP" constrainedElement="_LspMELDzEeafNo3UpQoAYw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OwowAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4fPXwF9xEey5t-mahoHmrg" name="CriticalityObservationCode" constrainedElement="_LspMELDzEeafNo3UpQoAYw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4fP-0F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_Ownh4H3sEeyivuDeOiJBMg" name="CriticalityObservationCode" constrainedElement="_LspMELDzEeafNo3UpQoAYw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ownh4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '82606-5' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4fTCIF9xEey5t-mahoHmrg" name="CriticalityObservationStatusCode" constrainedElement="_LspMELDzEeafNo3UpQoAYw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4fTCIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OwpXEH3sEeyivuDeOiJBMg" name="CriticalityObservationStatusCode" constrainedElement="_LspMELDzEeafNo3UpQoAYw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OwpXEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4fVeYF9xEey5t-mahoHmrg" name="CriticalityObservationStatusCodeP" constrainedElement="_LspMELDzEeafNo3UpQoAYw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4fVeYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OwqlMH3sEeyivuDeOiJBMg" name="CriticalityObservationStatusCodeP" constrainedElement="_LspMELDzEeafNo3UpQoAYw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OwqlMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4fX6oF9xEey5t-mahoHmrg" name="CriticalityObservationValue" constrainedElement="_LspMELDzEeafNo3UpQoAYw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4fX6oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OwrzUH3sEeyivuDeOiJBMg" name="CriticalityObservationValue" constrainedElement="_LspMELDzEeafNo3UpQoAYw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OwrzUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.5.1063' and (value.code = 'CRITL' or value.code = 'CRITH' or value.code = 'CRITU')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4gAz0F9xEey5t-mahoHmrg" name="CriticalityObservationValueP" constrainedElement="_LspMELDzEeafNo3UpQoAYw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4gBa4F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_OxFb8H3sEeyivuDeOiJBMg" name="CriticalityObservationValueP" constrainedElement="_LspMELDzEeafNo3UpQoAYw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_OxFb8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
@@ -41660,22 +41660,22 @@ value.codeSystem = '2.16.840.1.113883.5.1063' and (value.code = 'CRITL' or value
 This template represents the status of the allergy indicating whether it is active, no longer active, or is an historic allergy. There can be only one allergy status observation per alert observation.&#xD;
 &lt;/p></body>
       </ownedComment>
-      <ownedRule xmi:id="_4kV6MV9xEey5t-mahoHmrg" name="AllergyStatusObservation2TemplateId" constrainedElement="_W5MCgEc1EeiFfJtNAawVHw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4kV6Ml9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O0ANEn3sEeyivuDeOiJBMg" name="AllergyStatusObservation2TemplateId" constrainedElement="_W5MCgEc1EeiFfJtNAawVHw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O0ANE33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.28' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4kXIUF9xEey5t-mahoHmrg" name="AllergyStatusObservationCode" constrainedElement="_W5MCgEc1EeiFfJtNAawVHw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4kXIUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O0A0IX3sEeyivuDeOiJBMg" name="AllergyStatusObservationCode" constrainedElement="_W5MCgEc1EeiFfJtNAawVHw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O0A0In3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '33999-4' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4kaLoF9xEey5t-mahoHmrg" name="AllergyStatusObservationValue" constrainedElement="_W5MCgEc1EeiFfJtNAawVHw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4kaLoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O0CpUH3sEeyivuDeOiJBMg" name="AllergyStatusObservationValue" constrainedElement="_W5MCgEc1EeiFfJtNAawVHw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O0CpUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = element.oclAsType(datatypes::CE) in 
@@ -41708,20 +41708,20 @@ The Problem Status records whether the indicated problem is active, inactive, or
           <body>true</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4leioF9xEey5t-mahoHmrg" name="ProblemStatus2TemplateId" constrainedElement="_vyb38EfNEeiFfJtNAawVHw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4leioV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O04W133sEeyivuDeOiJBMg" name="ProblemStatus2TemplateId" constrainedElement="_vyb38EfNEeiFfJtNAawVHw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O0494H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.6' and id.extension.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4lg-4F9xEey5t-mahoHmrg" name="ProblemStatusText" constrainedElement="_vyb38EfNEeiFfJtNAawVHw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4lg-4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O06MAH3sEeyivuDeOiJBMg" name="ProblemStatusText" constrainedElement="_vyb38EfNEeiFfJtNAawVHw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O06MAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (true)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4liNAF9xEey5t-mahoHmrg" name="ProblemStatusValue" constrainedElement="_vyb38EfNEeiFfJtNAawVHw">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4liNAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O07aIH3sEeyivuDeOiJBMg" name="ProblemStatusValue" constrainedElement="_vyb38EfNEeiFfJtNAawVHw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O07aIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
@@ -41731,40 +41731,40 @@ value.codeSystem = '2.16.840.1.113883.6.96' and (value.code = '55561003' or valu
       <generalization xmi:id="_vycfAEfNEeiFfJtNAawVHw" general="_SjN_8BUzEeGbmN_W114JUw"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_CB2x8Ac_Eeu0W_grHCxLsQ" name="CareTeams">
-      <ownedRule xmi:id="_4mE_kF9xEey5t-mahoHmrg" name="CareTeamsTemplateId" constrainedElement="_CB2x8Ac_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4mE_kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O1ZUMH3sEeyivuDeOiJBMg" name="CareTeamsTemplateId" constrainedElement="_CB2x8Ac_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O1ZUMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.2.500' and id.extension = '2019-07-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4mGNsF9xEey5t-mahoHmrg" name="CareTeamsCode" constrainedElement="_CB2x8Ac_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4mGNsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O1aiUH3sEeyivuDeOiJBMg" name="CareTeamsCode" constrainedElement="_CB2x8Ac_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O1aiUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = self.code.oclAsType(datatypes::CE) in 
 value.code = '85847-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4mHb0F9xEey5t-mahoHmrg" name="CareTeamsCodeP" constrainedElement="_CB2x8Ac_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4mHb0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O1bwcH3sEeyivuDeOiJBMg" name="CareTeamsCodeP" constrainedElement="_CB2x8Ac_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O1bwcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4mJRAF9xEey5t-mahoHmrg" name="CareTeamsTitle" constrainedElement="_CB2x8Ac_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4mJRAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O1c-kH3sEeyivuDeOiJBMg" name="CareTeamsTitle" constrainedElement="_CB2x8Ac_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O1c-kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.title.oclIsUndefined() or self.title.isNullFlavorUndefined()) implies (not self.title.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4mKfIF9xEey5t-mahoHmrg" name="CareTeamsText" constrainedElement="_CB2x8Ac_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4mKfIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O1eMsH3sEeyivuDeOiJBMg" name="CareTeamsText" constrainedElement="_CB2x8Ac_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O1eMsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>not self.text.oclIsUndefined()</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_446cAF9xEey5t-mahoHmrg" name="CareTeamsCareTeamOrganizer" constrainedElement="_CB2x8Ac_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_446cAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PDzjoH3sEeyivuDeOiJBMg" name="CareTeamsCareTeamOrganizer" constrainedElement="_CB2x8Ac_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PDzjoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.nullFlavor &lt;> vocab::NullFlavor::NI implies entry->exists(entry : cda::Entry | not entry.organizer.oclIsUndefined() and entry.organizer.oclIsKindOf(consol::CareTeamOrganizer))</body>
         </specification>
@@ -41772,121 +41772,121 @@ value.code = '85847-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
       <generalization xmi:id="_CB7DYAc_Eeu0W_grHCxLsQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_qIf_wDxXEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_447DEF9xEey5t-mahoHmrg" name="getCareTeamOrganizers" bodyCondition="_447DE19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_447DE19xEey5t-mahoHmrg" name="body" constrainedElement="_447DEF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_447DFF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_PDzjon3sEeyivuDeOiJBMg" name="getCareTeamOrganizers" bodyCondition="_PDzjpX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_PDzjpX3sEeyivuDeOiJBMg" name="body" constrainedElement="_PDzjon3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_PDzjpn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getOrganizers()->select(organizer : cda::Organizer | not organizer.oclIsUndefined() and organizer.oclIsKindOf(consol::CareTeamOrganizer)).oclAsType(consol::CareTeamOrganizer)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_447DEV9xEey5t-mahoHmrg" type="_aigdQAc_Eeu0W_grHCxLsQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_447DEl9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_PDzjo33sEeyivuDeOiJBMg" type="_aigdQAc_Eeu0W_grHCxLsQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PDzjpH3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_aigdQAc_Eeu0W_grHCxLsQ" name="CareTeamOrganizer">
-      <ownedRule xmi:id="_4mLtQF9xEey5t-mahoHmrg" name="CareTeamOrganizerTemplateId" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4mLtQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O1ezwH3sEeyivuDeOiJBMg" name="CareTeamOrganizerTemplateId" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O1ezwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.500' and id.extension = '2019-07-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4mM7YF9xEey5t-mahoHmrg" name="CareTeamOrganizerId" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4mM7YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O1gB4H3sEeyivuDeOiJBMg" name="CareTeamOrganizerId" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O1gB4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4mOJgF9xEey5t-mahoHmrg" name="CareTeamOrganizerCode" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4mOJgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O1hQAH3sEeyivuDeOiJBMg" name="CareTeamOrganizerCode" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O1hQAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '86744-0')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4mP-sF9xEey5t-mahoHmrg" name="CareTeamOrganizerCodeP" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4mP-sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O1ieIH3sEeyivuDeOiJBMg" name="CareTeamOrganizerCodeP" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O1ieIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4m0mcF9xEey5t-mahoHmrg" name="CareTeamOrganizerStatusCodeP" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4m0mcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O2AYMH3sEeyivuDeOiJBMg" name="CareTeamOrganizerStatusCodeP" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O2AYMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4mQlwF9xEey5t-mahoHmrg" name="CareTeamOrganizerStatusCode" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4mQlwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O1jFMH3sEeyivuDeOiJBMg" name="CareTeamOrganizerStatusCode" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O1jFMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'normal' or value.code = 'aborted' or value.code = 'active' or value.code = 'cancelled' or value.code = 'completed' or value.code = 'held' or value.code = 'new' or value.code = 'suspended' or value.code = 'nullified' or value.code = 'obsolete')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4nZOMF9xEey5t-mahoHmrg" name="CareTeamOrganizerEffectiveTime" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4nZOMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O2h8oH3sEeyivuDeOiJBMg" name="CareTeamOrganizerEffectiveTime" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O2h8oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4nacUF9xEey5t-mahoHmrg" name="CareTeamOrganizerClassCode" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4nacUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O2jKwH3sEeyivuDeOiJBMg" name="CareTeamOrganizerClassCode" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O2jKwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('classCode')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4ncRgF9xEey5t-mahoHmrg" name="CareTeamOrganizerMoodCode" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4ncRgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O2kY4H3sEeyivuDeOiJBMg" name="CareTeamOrganizerMoodCode" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O2kY4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('moodCode')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4oNtkF9xEey5t-mahoHmrg" name="CareTeamOrganizerCareTeamMember" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4oNtkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O3N5IH3sEeyivuDeOiJBMg" name="CareTeamOrganizerCareTeamMember" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O3N5IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->one(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4pQ2cF9xEey5t-mahoHmrg" name="CareTeamOrganizerCareLocation" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4pQ2cV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O4C_kH3sEeyivuDeOiJBMg" name="CareTeamOrganizerCareLocation" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O4C_kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->one(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4wWV4F9xEey5t-mahoHmrg" name="CareTeamOrganizerNoteActivity" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4wWV4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O92FkH3sEeyivuDeOiJBMg" name="CareTeamOrganizerNoteActivity" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O92FkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->one(component : cda::Component4 | not component.act.oclIsUndefined() and component.act.oclIsKindOf(consol::NoteActivity))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_42rAUF9xEey5t-mahoHmrg" name="CareTeamOrganizerCareTeamTypeObservation" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_42rAUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PCEeQH3sEeyivuDeOiJBMg" name="CareTeamOrganizerCareTeamTypeObservation" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PCEeQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->one(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::CareTeamTypeObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_43PoEF9xEey5t-mahoHmrg" name="CareTeamOrganizerCareTeamMemberAct" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_43PoEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PCiYUH3sEeyivuDeOiJBMg" name="CareTeamOrganizerCareTeamMemberAct" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PCiYUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->exists(component : cda::Component4 | not component.act.oclIsUndefined() and component.act.oclIsKindOf(consol::CareTeamMemberAct))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_44SJ4F9xEey5t-mahoHmrg" name="CareTeamOrganizerAuthor" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_44SJ4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PDYs4H3sEeyivuDeOiJBMg" name="CareTeamOrganizerAuthor" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PDYs4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->one(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9FtMkF9xEey5t-mahoHmrg" name="CareTeamOrganizerIVLTSLow" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9FtMkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TKfFIH3sEeyivuDeOiJBMg" name="CareTeamOrganizerIVLTSLow" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TKfFIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((low.oclIsUndefined() or low.isNullFlavorUndefined()) implies (not low.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9FtzoF9xEey5t-mahoHmrg" name="CareTeamOrganizerIVLTSHigh" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9FtzoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TKfsMH3sEeyivuDeOiJBMg" name="CareTeamOrganizerIVLTSHigh" constrainedElement="_aigdQAc_Eeu0W_grHCxLsQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TKfsMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((high.oclIsUndefined() or high.isNullFlavorUndefined()) implies (not high.oclIsUndefined()) )))</body>
         </specification>
@@ -41894,97 +41894,97 @@ value.code = 'normal' or value.code = 'aborted' or value.code = 'active' or valu
       <generalization xmi:id="_aihEUAc_Eeu0W_grHCxLsQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_B6aX4EbvEd6besF9iFIJkQ"/>
       </generalization>
-      <ownedOperation xmi:id="_4wWV4l9xEey5t-mahoHmrg" name="getNoteActivity" bodyCondition="_4wWV5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_4wWV5V9xEey5t-mahoHmrg" name="body" constrainedElement="_4wWV4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_4wWV5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_O92soH3sEeyivuDeOiJBMg" name="getNoteActivity" bodyCondition="_O92so33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_O92so33sEeyivuDeOiJBMg" name="body" constrainedElement="_O92soH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_O92spH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::NoteActivity))->asSequence()->any(true).oclAsType(consol::NoteActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_4wWV419xEey5t-mahoHmrg" type="_hBwkAAmBEeut3_ZvYAZhww" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4wWV5F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_O92soX3sEeyivuDeOiJBMg" type="_hBwkAAmBEeut3_ZvYAZhww" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_O92son3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_42rAUl9xEey5t-mahoHmrg" name="getCareTeamTypeObservation" bodyCondition="_42rAVV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_42rAVV9xEey5t-mahoHmrg" name="body" constrainedElement="_42rAUl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_42rAVl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_PCFFUH3sEeyivuDeOiJBMg" name="getCareTeamTypeObservation" bodyCondition="_PCFFU33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_PCFFU33sEeyivuDeOiJBMg" name="body" constrainedElement="_PCFFUH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_PCFFVH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CareTeamTypeObservation))->asSequence()->any(true).oclAsType(consol::CareTeamTypeObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_42rAU19xEey5t-mahoHmrg" type="_1OFHAAdKEeu6cuZQ8fwlvQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_42rAVF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_PCFFUX3sEeyivuDeOiJBMg" type="_1OFHAAdKEeu6cuZQ8fwlvQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PCFFUn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_43PoEl9xEey5t-mahoHmrg" name="getCareTeamMemberActs" bodyCondition="_43QPIl9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_43QPIl9xEey5t-mahoHmrg" name="body" constrainedElement="_43PoEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_43QPI19xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_PCi_YH3sEeyivuDeOiJBMg" name="getCareTeamMemberActs" bodyCondition="_PCi_Y33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_PCi_Y33sEeyivuDeOiJBMg" name="body" constrainedElement="_PCi_YH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_PCi_ZH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::CareTeamMemberAct)).oclAsType(consol::CareTeamMemberAct)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_43QPIF9xEey5t-mahoHmrg" type="_zwKpQAmUEeut3_ZvYAZhww" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_43QPIV9xEey5t-mahoHmrg" value="*"/>
+        <ownedParameter xmi:id="_PCi_YX3sEeyivuDeOiJBMg" type="_zwKpQAmUEeut3_ZvYAZhww" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PCi_Yn3sEeyivuDeOiJBMg" value="*"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_1OFHAAdKEeu6cuZQ8fwlvQ" name="CareTeamTypeObservation">
-      <ownedRule xmi:id="_4qSxMl9xEey5t-mahoHmrg" name="CareTeamTypeObservationTemplateId" constrainedElement="_1OFHAAdKEeu6cuZQ8fwlvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4qSxM19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O44GAn3sEeyivuDeOiJBMg" name="CareTeamTypeObservationTemplateId" constrainedElement="_1OFHAAdKEeu6cuZQ8fwlvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O44tEH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.500.2' and id.extension = '2019-07-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4qVNcF9xEey5t-mahoHmrg" name="CareTeamTypeObservationCodeP" constrainedElement="_1OFHAAdKEeu6cuZQ8fwlvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4qVNcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O46iQH3sEeyivuDeOiJBMg" name="CareTeamTypeObservationCodeP" constrainedElement="_1OFHAAdKEeu6cuZQ8fwlvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O46iQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4qT_UF9xEey5t-mahoHmrg" name="CareTeamTypeObservationCode" constrainedElement="_1OFHAAdKEeu6cuZQ8fwlvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4qT_UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O45UIH3sEeyivuDeOiJBMg" name="CareTeamTypeObservationCode" constrainedElement="_1OFHAAdKEeu6cuZQ8fwlvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O45UIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '86744-0' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4qWbkF9xEey5t-mahoHmrg" name="CareTeamTypeObservationStatusCode" constrainedElement="_1OFHAAdKEeu6cuZQ8fwlvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4qWbkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O47JUH3sEeyivuDeOiJBMg" name="CareTeamTypeObservationStatusCode" constrainedElement="_1OFHAAdKEeu6cuZQ8fwlvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O47JUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4qXpsF9xEey5t-mahoHmrg" name="CareTeamTypeObservationStatusCodeP" constrainedElement="_1OFHAAdKEeu6cuZQ8fwlvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4qXpsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O48XcH3sEeyivuDeOiJBMg" name="CareTeamTypeObservationStatusCodeP" constrainedElement="_1OFHAAdKEeu6cuZQ8fwlvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O48XcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4qYQwF9xEey5t-mahoHmrg" name="CareTeamTypeObservationValue" constrainedElement="_1OFHAAdKEeu6cuZQ8fwlvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4qYQwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O48-gH3sEeyivuDeOiJBMg" name="CareTeamTypeObservationValue" constrainedElement="_1OFHAAdKEeu6cuZQ8fwlvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O48-gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = 'LA27975-4' or value.code = 'LA27976-2' or value.code = 'LA27977-0' or value.code = 'LA27978-8' or value.code = 'LA27980-4' or value.code = 'LA28865-6' or value.code = 'LA28866-4' or value.code = 'LA28867-2')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4q5OIF9xEey5t-mahoHmrg" name="CareTeamTypeObservationValueP" constrainedElement="_1OFHAAdKEeu6cuZQ8fwlvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4q5OIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O5YcUH3sEeyivuDeOiJBMg" name="CareTeamTypeObservationValueP" constrainedElement="_1OFHAAdKEeu6cuZQ8fwlvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O5YcUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4raykF9xEey5t-mahoHmrg" name="CareTeamTypeObservationClassCode" constrainedElement="_1OFHAAdKEeu6cuZQ8fwlvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4raykV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O5zTEH3sEeyivuDeOiJBMg" name="CareTeamTypeObservationClassCode" constrainedElement="_1OFHAAdKEeu6cuZQ8fwlvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O5zTEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('classCode')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4rcnwF9xEey5t-mahoHmrg" name="CareTeamTypeObservationMoodCode" constrainedElement="_1OFHAAdKEeu6cuZQ8fwlvQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4rcnwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O50hMH3sEeyivuDeOiJBMg" name="CareTeamTypeObservationMoodCode" constrainedElement="_1OFHAAdKEeu6cuZQ8fwlvQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O50hMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('moodCode')</body>
         </specification>
@@ -41994,90 +41994,90 @@ value.codeSystem = '2.16.840.1.113883.6.1' and (value.code = 'LA27975-4' or valu
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_hBwkAAmBEeut3_ZvYAZhww" name="NoteActivity">
-      <ownedRule xmi:id="_4rd14F9xEey5t-mahoHmrg" name="NoteActivityTemplateId" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4rd14V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O51vUH3sEeyivuDeOiJBMg" name="NoteActivityTemplateId" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O51vUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.202' and id.extension = '2016-11-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4rgSIF9xEey5t-mahoHmrg" name="NoteActivityCodeP" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4rgSIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O53kgH3sEeyivuDeOiJBMg" name="NoteActivityCodeP" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O53kgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4rfEAF9xEey5t-mahoHmrg" name="NoteActivityCode" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4rfEAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O52WYH3sEeyivuDeOiJBMg" name="NoteActivityCode" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O52WYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '34109-9' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4riHUF9xEey5t-mahoHmrg" name="NoteActivityText" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4riHUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O54yoH3sEeyivuDeOiJBMg" name="NoteActivityText" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O54yoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4rjVcF9xEey5t-mahoHmrg" name="NoteActivityStatusCode" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4rjVcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O56AwH3sEeyivuDeOiJBMg" name="NoteActivityStatusCode" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O56AwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4rkjkF9xEey5t-mahoHmrg" name="NoteActivityEffectiveTime" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4rkjkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O57O4H3sEeyivuDeOiJBMg" name="NoteActivityEffectiveTime" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O57O4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4rmYwF9xEey5t-mahoHmrg" name="NoteActivityClassCode" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4rmYwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O59EEH3sEeyivuDeOiJBMg" name="NoteActivityClassCode" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O59EEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('classCode')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4rnm4F9xEey5t-mahoHmrg" name="NoteActivityMoodCode" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4rnm4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O5-SMH3sEeyivuDeOiJBMg" name="NoteActivityMoodCode" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O5-SMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('moodCode')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4tWsQF9xEey5t-mahoHmrg" name="NoteActivityAuthor" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4tWsQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O7ZOgH3sEeyivuDeOiJBMg" name="NoteActivityAuthor" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O7ZOgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.author->exists(author : cda::Author | not author.oclIsUndefined() and author.oclIsKindOf(consol::AuthorParticipation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4t2bgF9xEey5t-mahoHmrg" name="NoteActivityParticipant" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4t2bgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O70sUH3sEeyivuDeOiJBMg" name="NoteActivityParticipant" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O70sUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4vYFgF9xEey5t-mahoHmrg" name="NoteActivityReference" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4vYFgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O9CNQH3sEeyivuDeOiJBMg" name="NoteActivityReference" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O9CNQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.reference->exists(reference : cda::Reference | not reference.oclIsUndefined() and reference.oclIsKindOf(cda::Reference))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9FvBwF9xEey5t-mahoHmrg" name="NoteActivityCDTranslation1P" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9FvBwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TKg6UH3sEeyivuDeOiJBMg" name="NoteActivityCDTranslation1P" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TKg6UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (not translation->isEmpty()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9FvBwl9xEey5t-mahoHmrg" name="NoteActivityCDTranslation1" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9FvBw19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TKg6Un3sEeyivuDeOiJBMg" name="NoteActivityCDTranslation1" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TKg6U33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.code->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((translation->isEmpty() or translation->exists(element | element.isNullFlavorUndefined())) implies (translation->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.6.1' and not value.code.oclIsUndefined())) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9Fvo0F9xEey5t-mahoHmrg" name="NoteActivityIVLTSValue" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9Fvo0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TKhhYH3sEeyivuDeOiJBMg" name="NoteActivityIVLTSValue" constrainedElement="_hBwkAAmBEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TKhhYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not value.oclIsUndefined() )))</body>
         </specification>
@@ -42087,88 +42087,88 @@ value.codeSystem = '2.16.840.1.113883.6.1' and not value.code.oclIsUndefined()))
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_zwKpQAmUEeut3_ZvYAZhww" name="CareTeamMemberAct">
-      <ownedRule xmi:id="_4wW88F9xEey5t-mahoHmrg" name="CareTeamMemberActTemplateId" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4wW88V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O92spX3sEeyivuDeOiJBMg" name="CareTeamMemberActTemplateId" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O92spn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.500.1' and id.extension = '2019-07-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4wYLEF9xEey5t-mahoHmrg" name="CareTeamMemberActId" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4wYLEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O936wH3sEeyivuDeOiJBMg" name="CareTeamMemberActId" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O936wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4wZZMF9xEey5t-mahoHmrg" name="CareTeamMemberActStatusCode" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4wZZMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O94h0H3sEeyivuDeOiJBMg" name="CareTeamMemberActStatusCode" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O94h0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'normal' or value.code = 'aborted' or value.code = 'active' or value.code = 'cancelled' or value.code = 'completed' or value.code = 'held' or value.code = 'new' or value.code = 'suspended' or value.code = 'nullified' or value.code = 'obsolete')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4w7ksF9xEey5t-mahoHmrg" name="CareTeamMemberActStatusCodeP" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4w7ksV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O-VNwH3sEeyivuDeOiJBMg" name="CareTeamMemberActStatusCodeP" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O-VNwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4xciEF9xEey5t-mahoHmrg" name="CareTeamMemberActEffectiveTime" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4xciEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O-zH0H3sEeyivuDeOiJBMg" name="CareTeamMemberActEffectiveTime" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O-zH0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.effectiveTime.oclIsUndefined() or self.effectiveTime.isNullFlavorUndefined()) implies (not self.effectiveTime.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4xeXQF9xEey5t-mahoHmrg" name="CareTeamMemberActClassCode" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4xeXQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O-0V8H3sEeyivuDeOiJBMg" name="CareTeamMemberActClassCode" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O-0V8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('classCode')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4xflYF9xEey5t-mahoHmrg" name="CareTeamMemberActMoodCode" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4xflYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_O-09AH3sEeyivuDeOiJBMg" name="CareTeamMemberActMoodCode" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_O-09AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('moodCode')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_41J9YF9xEey5t-mahoHmrg" name="CareTeamMemberActPerformer" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_41J9YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PBB8cH3sEeyivuDeOiJBMg" name="CareTeamMemberActPerformer" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PBB8cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.performer->one(performer : cda::Performer2 | not performer.oclIsUndefined() and performer.oclIsKindOf(cda::Performer2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_41yPgF9xEey5t-mahoHmrg" name="CareTeamMemberActParticipant" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_41yPgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PBczMH3sEeyivuDeOiJBMg" name="CareTeamMemberActParticipant" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PBdaQH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->exists(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_43wlcF9xEey5t-mahoHmrg" name="CareTeamMemberActCareTeamMemberScheduleObservation" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_43wlcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PC-dMH3sEeyivuDeOiJBMg" name="CareTeamMemberActCareTeamMemberScheduleObservation" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PC_EQH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.observation.oclIsUndefined() and entryRelationship.observation.oclIsKindOf(consol::CareTeamMemberScheduleObservation) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_47fO4F9xEey5t-mahoHmrg" name="CareTeamMemberActNoteActivity" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_47fO4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PFlsUH3sEeyivuDeOiJBMg" name="CareTeamMemberActNoteActivity" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PFlsUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.entryRelationship->one(entryRelationship : cda::EntryRelationship | not entryRelationship.act.oclIsUndefined() and entryRelationship.act.oclIsKindOf(consol::NoteActivity) and entryRelationship.typeCode = vocab::x_ActRelationshipEntryRelationship::REFR)</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_48BaYF9xEey5t-mahoHmrg" name="CareTeamMemberActParticipant2" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_48BaYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PF_U8H3sEeyivuDeOiJBMg" name="CareTeamMemberActParticipant2" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PF_U8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.participant->one(participant : cda::Participant2 | not participant.oclIsUndefined() and participant.oclIsKindOf(cda::Participant2))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9Fw28F9xEey5t-mahoHmrg" name="CareTeamMemberActIVLTSLow" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9Fw28V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TKivgH3sEeyivuDeOiJBMg" name="CareTeamMemberActIVLTSLow" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TKivgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((low.oclIsUndefined() or low.isNullFlavorUndefined()) implies (not low.oclIsUndefined()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9FxeAF9xEey5t-mahoHmrg" name="CareTeamMemberActIVLTSHigh" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9FxeAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TKivgn3sEeyivuDeOiJBMg" name="CareTeamMemberActIVLTSHigh" constrainedElement="_zwKpQAmUEeut3_ZvYAZhww">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TKivg33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.effectiveTime->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((high.oclIsUndefined() or high.isNullFlavorUndefined()) implies (not high.oclIsUndefined()) )))</body>
         </specification>
@@ -42176,96 +42176,96 @@ value.code = 'normal' or value.code = 'aborted' or value.code = 'active' or valu
       <generalization xmi:id="_zwLQUAmUEeut3_ZvYAZhww">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_YiANsDxYEd6JwqSGecoePg"/>
       </generalization>
-      <ownedOperation xmi:id="_43xMgF9xEey5t-mahoHmrg" name="getCareTeamMemberScheduleObservation" bodyCondition="_43xMg19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_43xMg19xEey5t-mahoHmrg" name="body" constrainedElement="_43xMgF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_43xMhF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_PC_EQX3sEeyivuDeOiJBMg" name="getCareTeamMemberScheduleObservation" bodyCondition="_PC_ERH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_PC_ERH3sEeyivuDeOiJBMg" name="body" constrainedElement="_PC_EQX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_PC_ERX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CareTeamMemberScheduleObservation))->asSequence()->any(true).oclAsType(consol::CareTeamMemberScheduleObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_43xMgV9xEey5t-mahoHmrg" type="_yf1BYAvGEeuHK5c-vnh5Wg" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_43xMgl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_PC_EQn3sEeyivuDeOiJBMg" type="_yf1BYAvGEeuHK5c-vnh5Wg" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PC_EQ33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_47fO4l9xEey5t-mahoHmrg" name="getNoteActivity" bodyCondition="_47fO5V9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_47fO5V9xEey5t-mahoHmrg" name="body" constrainedElement="_47fO4l9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_47fO5l9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_PFlsUn3sEeyivuDeOiJBMg" name="getNoteActivity" bodyCondition="_PFlsVX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_PFlsVX3sEeyivuDeOiJBMg" name="body" constrainedElement="_PFlsUn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_PFlsVn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getActs()->select(act : cda::Act | not act.oclIsUndefined() and act.oclIsKindOf(consol::NoteActivity))->asSequence()->any(true).oclAsType(consol::NoteActivity)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_47fO419xEey5t-mahoHmrg" type="_hBwkAAmBEeut3_ZvYAZhww" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_47fO5F9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_PFlsU33sEeyivuDeOiJBMg" type="_hBwkAAmBEeut3_ZvYAZhww" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PFlsVH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_yf1BYAvGEeuHK5c-vnh5Wg" name="CareTeamMemberScheduleObservation">
-      <ownedRule xmi:id="_41y2kF9xEey5t-mahoHmrg" name="CareTeamMemberScheduleObservationTemplateId" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_41y2kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PBdaQX3sEeyivuDeOiJBMg" name="CareTeamMemberScheduleObservationTemplateId" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PBdaQn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.500.3' and id.extension = '2019-07-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_411S0F9xEey5t-mahoHmrg" name="CareTeamMemberScheduleObservationCodeP" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_411S0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PBf2gH3sEeyivuDeOiJBMg" name="CareTeamMemberScheduleObservationCodeP" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PBf2gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_41zdoF9xEey5t-mahoHmrg" name="CareTeamMemberScheduleObservationCode" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_410EsF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PBeoYH3sEeyivuDeOiJBMg" name="CareTeamMemberScheduleObservationCode" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PBeoYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = '57203-2' and value.codeSystem = '2.16.840.1.113883.6.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_413IAF9xEey5t-mahoHmrg" name="CareTeamMemberScheduleObservationText" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_413vEF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PBgdkH3sEeyivuDeOiJBMg" name="CareTeamMemberScheduleObservationText" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PBgdkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.text.oclIsUndefined() or self.text.isNullFlavorUndefined()) implies (not self.text.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_415kQF9xEey5t-mahoHmrg" name="CareTeamMemberScheduleObservationValue" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_415kQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PBhrsH3sEeyivuDeOiJBMg" name="CareTeamMemberScheduleObservationValue" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PBhrsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::TS)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_417ZcF9xEey5t-mahoHmrg" name="CareTeamMemberScheduleObservationClassCode" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_417ZcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PBi50H3sEeyivuDeOiJBMg" name="CareTeamMemberScheduleObservationClassCode" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PBi50X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('classCode')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4191sF9xEey5t-mahoHmrg" name="CareTeamMemberScheduleObservationMoodCode" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4191sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PBkH8H3sEeyivuDeOiJBMg" name="CareTeamMemberScheduleObservationMoodCode" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PBkH8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('moodCode')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_41_q4F9xEey5t-mahoHmrg" name="CareTeamMemberScheduleObservationStatusCode" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_41_q4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PBlWEH3sEeyivuDeOiJBMg" name="CareTeamMemberScheduleObservationStatusCode" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PBlWEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_42CHIF9xEey5t-mahoHmrg" name="CareTeamMemberScheduleObservationStatusCodeP" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_42CHIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PBmkMH3sEeyivuDeOiJBMg" name="CareTeamMemberScheduleObservationStatusCodeP" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PBmkMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9FysIF9xEey5t-mahoHmrg" name="CareTeamMemberScheduleObservationEDTELValue" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9FysIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TKj9oH3sEeyivuDeOiJBMg" name="CareTeamMemberScheduleObservationEDTELValue" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TKj9oX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.text->excluding(null)->select(isNullFlavorUndefined()).reference->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not value.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9FysIl9xEey5t-mahoHmrg" name="CareTeamMemberScheduleObservationEDReference" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9FysI19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TKkksH3sEeyivuDeOiJBMg" name="CareTeamMemberScheduleObservationEDReference" constrainedElement="_yf1BYAvGEeuHK5c-vnh5Wg">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TKkksX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.text->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((reference.oclIsUndefined() or reference.isNullFlavorUndefined()) implies (not reference.oclIsUndefined()) )))</body>
         </specification>
@@ -42275,88 +42275,88 @@ value.code = 'completed')</body>
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_J9bRQA5ZEeuzkrfERpFDKQ" name="ProvenanceAuthorParticipation">
-      <ownedRule xmi:id="_447qIF9xEey5t-mahoHmrg" name="ProvenanceAuthorParticipationTemplateId" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_447qIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PD0KsH3sEeyivuDeOiJBMg" name="ProvenanceAuthorParticipationTemplateId" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PD0KsX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.5 .6' and id.extension = '2019-10-01')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_44-GYF9xEey5t-mahoHmrg" name="ProvenanceAuthorParticipationTime" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_44-GYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PD0xwH3sEeyivuDeOiJBMg" name="ProvenanceAuthorParticipationTime" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PD0xwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.time.oclIsUndefined() or self.time.isNullFlavorUndefined()) implies (not self.time.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_46ctEF9xEey5t-mahoHmrg" name="ProvenanceAuthorParticipationAssignedAuthor" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_46ctEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PExM8H3sEeyivuDeOiJBMg" name="ProvenanceAuthorParticipationAssignedAuthor" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PExM8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->one(assignedAuthor : cda::AssignedAuthor | not assignedAuthor.oclIsUndefined() and assignedAuthor.oclIsKindOf(cda::AssignedAuthor))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9GVesF9xEey5t-mahoHmrg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonPNFamily" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9GVesV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TLCewH3sEeyivuDeOiJBMg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonPNFamily" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TLCewX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null).assignedPerson->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((family->isEmpty() or family->exists(element | element.isNullFlavorUndefined())) implies (family->size() =  1) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9GWFwF9xEey5t-mahoHmrg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonPNGiven" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9GWFwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TLDF0H3sEeyivuDeOiJBMg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonPNGiven" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TLDF0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null).assignedPerson->excluding(null).name->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies ((given->isEmpty() or given->exists(element | element.isNullFlavorUndefined())) implies (not given->isEmpty()) )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9GWFwl9xEey5t-mahoHmrg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonName" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9GWFw19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TLDF0n3sEeyivuDeOiJBMg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonName" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TLDF033sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null).assignedPerson->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (not name->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9GXT4F9xEey5t-mahoHmrg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganizationId" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9GXT4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TLET8H3sEeyivuDeOiJBMg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganizationId" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TLET8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null).representedOrganization->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9GXT4l9xEey5t-mahoHmrg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganizationName" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9GXT419xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TLET8n3sEeyivuDeOiJBMg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganizationName" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TLET833sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null).representedOrganization->excluding(null)->reject((name->isEmpty() or name->exists(element | element.isNullFlavorUndefined())) implies (not name->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9GX68F9xEey5t-mahoHmrg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganizationTelecom" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9GX68V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TLET9H3sEeyivuDeOiJBMg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganizationTelecom" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TLET9X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null).representedOrganization->excluding(null)->reject((telecom->isEmpty() or telecom->exists(element | element.isNullFlavorUndefined())) implies (not telecom->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9GX68l9xEey5t-mahoHmrg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorId" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9GX6819xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TLET9n3sEeyivuDeOiJBMg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorId" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TLET933sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null)->reject((id->isEmpty() or id->exists(element | element.isNullFlavorUndefined())) implies (not id->isEmpty()))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9GYiAF9xEey5t-mahoHmrg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorCode" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9GYiAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TLE7AH3sEeyivuDeOiJBMg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorCode" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TLE7AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null)->reject((code.oclIsUndefined() or code.isNullFlavorUndefined()) implies (not code.oclIsUndefined() and code.oclIsKindOf(datatypes::CE) and 
 let value : datatypes::CE = code.oclAsType(datatypes::CE) in 
 value.codeSystem = '2.16.840.1.113883.5.111' and (value.code = 'DAUINLAW' or value.code = 'FTH' or value.code = 'DAU' or value.code = 'HPOWATT' or value.code = 'MTH' or value.code = 'SON' or value.code = 'SELF' or value.code = 'SONINLAW')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9GYiAl9xEey5t-mahoHmrg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPerson" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9GYiA19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TLE7An3sEeyivuDeOiJBMg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPerson" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TLE7A33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null)->reject(assignedPerson.oclIsTypeOf(consol::ProvenanceAuthorParticipation::ProvenanceAssignedAuthor::AssignedPerson))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9GYiBF9xEey5t-mahoHmrg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganization" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9GYiBV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TLE7BH3sEeyivuDeOiJBMg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganization" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TLE7BX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null)->reject(representedOrganization.oclIsTypeOf(consol::ProvenanceAuthorParticipation::ProvenanceAssignedAuthor::RepresentedOrganization))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9GZJEF9xEey5t-mahoHmrg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedAuthoringDevice" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9GZJEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TLFiEH3sEeyivuDeOiJBMg" name="ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedAuthoringDevice" constrainedElement="_J9bRQA5ZEeuzkrfERpFDKQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TLFiEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.assignedAuthor->excluding(null)->reject(assignedAuthoringDevice->one(assignedAuthoringDevice : cda::AuthoringDevice | not assignedAuthoringDevice.oclIsUndefined() and assignedAuthoringDevice.oclIsKindOf(rim::Entity)))</body>
         </specification>
@@ -42366,28 +42366,28 @@ value.codeSystem = '2.16.840.1.113883.5.111' and (value.code = 'DAUINLAW' or val
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_iyVA4Cz7EeuxZ80rBBFFIQ" name="SerialNumberObservation">
-      <ownedRule xmi:id="_49D8Ml9xEey5t-mahoHmrg" name="SerialNumberObservationTemplateId" constrainedElement="_iyVA4Cz7EeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_49D8M19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PG568H3sEeyivuDeOiJBMg" name="SerialNumberObservationTemplateId" constrainedElement="_iyVA4Cz7EeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PG568X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.319' and id.extension = '2019-06-21')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_49GYcF9xEey5t-mahoHmrg" name="SerialNumberObservationCodeP" constrainedElement="_iyVA4Cz7EeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_49GYcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PG7wIH3sEeyivuDeOiJBMg" name="SerialNumberObservationCodeP" constrainedElement="_iyVA4Cz7EeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PG7wIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_49FKUF9xEey5t-mahoHmrg" name="SerialNumberObservationCode" constrainedElement="_iyVA4Cz7EeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_49FKUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PG6iAH3sEeyivuDeOiJBMg" name="SerialNumberObservationCode" constrainedElement="_iyVA4Cz7EeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PG6iAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'C101671' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_49INoF9xEey5t-mahoHmrg" name="SerialNumberObservationValue" constrainedElement="_iyVA4Cz7EeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_49INoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PG8-QH3sEeyivuDeOiJBMg" name="SerialNumberObservationValue" constrainedElement="_iyVA4Cz7EeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PG8-QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::ED)))</body>
         </specification>
@@ -42397,30 +42397,30 @@ value.code = 'C101671' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</bod
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_azjXACz8EeuxZ80rBBFFIQ" name="MRISafetyObservation">
-      <ownedRule xmi:id="_49I0sF9xEey5t-mahoHmrg" name="MRISafetyObservationTemplateId" constrainedElement="_azjXACz8EeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_49I0sV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PG9lUH3sEeyivuDeOiJBMg" name="MRISafetyObservationTemplateId" constrainedElement="_azjXACz8EeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PG9lUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.318' and id.extension = '2019-06-21')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_49KC0F9xEey5t-mahoHmrg" name="MRISafetyObservationCode" constrainedElement="_azjXACz8EeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_49KC0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PG-zcH3sEeyivuDeOiJBMg" name="MRISafetyObservationCode" constrainedElement="_azjXACz8EeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PG-zcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'C106044' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_49L4AF9xEey5t-mahoHmrg" name="MRISafetyObservationValue" constrainedElement="_azjXACz8EeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_49L4AV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PHAooH3sEeyivuDeOiJBMg" name="MRISafetyObservationValue" constrainedElement="_azjXACz8EeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PHAooX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.3.26.1.1' and (value.code = 'C113844' or value.code = 'C106046' or value.code = 'C106045' or value.code = 'C106047')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_49s1YF9xEey5t-mahoHmrg" name="MRISafetyObservationValueP" constrainedElement="_azjXACz8EeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_49s1YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PHbfYH3sEeyivuDeOiJBMg" name="MRISafetyObservationValueP" constrainedElement="_azjXACz8EeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PHbfYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
@@ -42430,28 +42430,28 @@ value.codeSystem = '2.16.840.1.113883.3.26.1.1' and (value.code = 'C113844' or v
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_2V3xoCz-EeuxZ80rBBFFIQ" name="ModelNumberObservation">
-      <ownedRule xmi:id="_4-NywF9xEey5t-mahoHmrg" name="ModelNumberObservationTemplateId" constrainedElement="_2V3xoCz-EeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4-NywV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PH1vEH3sEeyivuDeOiJBMg" name="ModelNumberObservationTemplateId" constrainedElement="_2V3xoCz-EeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PH1vEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.317' and id.extension = '2019-06-21')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4-QPAF9xEey5t-mahoHmrg" name="ModelNumberObservationCodeP" constrainedElement="_2V3xoCz-EeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4-QPAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PH3kQH3sEeyivuDeOiJBMg" name="ModelNumberObservationCodeP" constrainedElement="_2V3xoCz-EeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PH3kQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4-PA4F9xEey5t-mahoHmrg" name="ModelNumberObservationCode" constrainedElement="_2V3xoCz-EeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4-PA4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PH2WIX3sEeyivuDeOiJBMg" name="ModelNumberObservationCode" constrainedElement="_2V3xoCz-EeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PH2WIn3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'C99285' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4-RdIF9xEey5t-mahoHmrg" name="ModelNumberObservationValue" constrainedElement="_2V3xoCz-EeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4-RdIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PH4yYH3sEeyivuDeOiJBMg" name="ModelNumberObservationValue" constrainedElement="_2V3xoCz-EeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PH4yYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::ED)))</body>
         </specification>
@@ -42461,34 +42461,34 @@ value.code = 'C99285' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</body
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_uvNFwCz_EeuxZ80rBBFFIQ" name="ManufacturingDateObservation">
-      <ownedRule xmi:id="_4-SrQF9xEey5t-mahoHmrg" name="ManufacturingDateObservationTemplateId" constrainedElement="_uvNFwCz_EeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4-SrQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PH5ZcH3sEeyivuDeOiJBMg" name="ManufacturingDateObservationTemplateId" constrainedElement="_uvNFwCz_EeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PH5ZcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.316' and id.extension = '2019-06')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4-VHgF9xEey5t-mahoHmrg" name="ManufacturingDateObservationCodeP" constrainedElement="_uvNFwCz_EeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4-VHgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PH7OoH3sEeyivuDeOiJBMg" name="ManufacturingDateObservationCodeP" constrainedElement="_uvNFwCz_EeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PH7OoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4-T5YF9xEey5t-mahoHmrg" name="ManufacturingDateObservationCode" constrainedElement="_uvNFwCz_EeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4-T5YV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PH6nkH3sEeyivuDeOiJBMg" name="ManufacturingDateObservationCode" constrainedElement="_uvNFwCz_EeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PH6nkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'C101669' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4-WVoF9xEey5t-mahoHmrg" name="ManufacturingDateObservationValue" constrainedElement="_uvNFwCz_EeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4-WVoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PH8cwH3sEeyivuDeOiJBMg" name="ManufacturingDateObservationValue" constrainedElement="_uvNFwCz_EeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PH8cwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::TS)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9Ga-QF9xEey5t-mahoHmrg" name="ManufacturingDateObservationTSValue" constrainedElement="_uvNFwCz_EeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9Ga-QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TLGwMH3sEeyivuDeOiJBMg" name="ManufacturingDateObservationTSValue" constrainedElement="_uvNFwCz_EeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TLGwMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.value->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not value.oclIsUndefined() )))</body>
         </specification>
@@ -42498,30 +42498,30 @@ value.code = 'C101669' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</bod
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_YvpowC0AEeuxZ80rBBFFIQ" name="LotOrBatchNumberObservation">
-      <ownedRule xmi:id="_4-Yx4F9xEey5t-mahoHmrg" name="LotOrBatchNumberObservationTemplateId" constrainedElement="_YvpowC0AEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4-Yx4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PH-R8X3sEeyivuDeOiJBMg" name="LotOrBatchNumberObservationTemplateId" constrainedElement="_YvpowC0AEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PH-R8n3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.315' and id.extension = '2019-06-21')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4-anEF9xEey5t-mahoHmrg" name="LotOrBatchNumberObservationCodeP" constrainedElement="_YvpowC0AEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4-anEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PIAHIH3sEeyivuDeOiJBMg" name="LotOrBatchNumberObservationCodeP" constrainedElement="_YvpowC0AEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PIAHIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4-ZY8F9xEey5t-mahoHmrg" name="LotOrBatchNumberObservationCode" constrainedElement="_YvpowC0AEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4-ZY8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PH-5AH3sEeyivuDeOiJBMg" name="LotOrBatchNumberObservationCode" constrainedElement="_YvpowC0AEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PH-5AX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'C101672' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4-ccQF9xEey5t-mahoHmrg" name="LotOrBatchNumberObservationValue" constrainedElement="_YvpowC0AEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4-ccQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PIBVQH3sEeyivuDeOiJBMg" name="LotOrBatchNumberObservationValue" constrainedElement="_YvpowC0AEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PIBVQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
-          <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::ST)))</body>
+          <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::ED)))</body>
         </specification>
       </ownedRule>
       <generalization xmi:id="_YvqP0C0AEeuxZ80rBBFFIQ">
@@ -42529,36 +42529,36 @@ value.code = 'C101672' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</bod
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_YK8jwC0BEeuxZ80rBBFFIQ" name="LatexSafetyObservation">
-      <ownedRule xmi:id="_4-dDUF9xEey5t-mahoHmrg" name="LatexSafetyObservationTemplateId" constrainedElement="_YK8jwC0BEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4-dDUV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PIB8UH3sEeyivuDeOiJBMg" name="LatexSafetyObservationTemplateId" constrainedElement="_YK8jwC0BEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PIB8UX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.314' and id.extension = '2019-06-21')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4-ffkF9xEey5t-mahoHmrg" name="LatexSafetyObservationCodeP" constrainedElement="_YK8jwC0BEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4-ffkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PIDxgH3sEeyivuDeOiJBMg" name="LatexSafetyObservationCodeP" constrainedElement="_YK8jwC0BEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PIDxgX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4-eRcF9xEey5t-mahoHmrg" name="LatexSafetyObservationCode" constrainedElement="_YK8jwC0BEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4-eRcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PICjYH3sEeyivuDeOiJBMg" name="LatexSafetyObservationCode" constrainedElement="_YK8jwC0BEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PICjYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'C160938' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4-gtsF9xEey5t-mahoHmrg" name="LatexSafetyObservationValue" constrainedElement="_YK8jwC0BEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4-gtsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PIEYkH3sEeyivuDeOiJBMg" name="LatexSafetyObservationValue" constrainedElement="_YK8jwC0BEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PIEYkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.3.26.1.1' and (value.code = 'C106043' or value.code = 'C106038')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4_BrEF9xEey5t-mahoHmrg" name="LatexSafetyObservationValueP" constrainedElement="_YK8jwC0BEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4_BrEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PIf2YH3sEeyivuDeOiJBMg" name="LatexSafetyObservationValueP" constrainedElement="_YK8jwC0BEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PIf2YX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
@@ -42568,36 +42568,36 @@ value.codeSystem = '2.16.840.1.113883.3.26.1.1' and (value.code = 'C106043' or v
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_fdGGQC0CEeuxZ80rBBFFIQ" name="ImplantableDeviceStatusObservation">
-      <ownedRule xmi:id="_4_iBYF9xEey5t-mahoHmrg" name="ImplantableDeviceStatusObservationTemplateId" constrainedElement="_fdGGQC0CEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4_iBYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PI6GEH3sEeyivuDeOiJBMg" name="ImplantableDeviceStatusObservationTemplateId" constrainedElement="_fdGGQC0CEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PI6GEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.305' and id.extension = '2019-06-21')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4_lEsF9xEey5t-mahoHmrg" name="ImplantableDeviceStatusObservationCodeP" constrainedElement="_fdGGQC0CEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4_lEsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PI8iUH3sEeyivuDeOiJBMg" name="ImplantableDeviceStatusObservationCodeP" constrainedElement="_fdGGQC0CEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PI8iUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4_jPgF9xEey5t-mahoHmrg" name="ImplantableDeviceStatusObservationCode" constrainedElement="_fdGGQC0CEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4_jPgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PI7UMH3sEeyivuDeOiJBMg" name="ImplantableDeviceStatusObservationCode" constrainedElement="_fdGGQC0CEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PI7UMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'C160939' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_4_mS0F9xEey5t-mahoHmrg" name="ImplantableDeviceStatusObservationValue" constrainedElement="_fdGGQC0CEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_4_mS0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PI9JYH3sEeyivuDeOiJBMg" name="ImplantableDeviceStatusObservationValue" constrainedElement="_fdGGQC0CEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PI9JYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() = 1 and self.value->forAll(element | not element.oclIsUndefined() and element.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = element.oclAsType(datatypes::CD) in 
 value.codeSystem = '2.16.840.1.113883.3.26.1.1' and (value.code = 'C45329' or value.code = 'C154407' or value.code = 'C122711' or value.code = 'C160942')))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5AHQMF9xEey5t-mahoHmrg" name="ImplantableDeviceStatusObservationValueP" constrainedElement="_fdGGQC0CEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5AHQMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PJZOQH3sEeyivuDeOiJBMg" name="ImplantableDeviceStatusObservationValueP" constrainedElement="_fdGGQC0CEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PJZOQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::CD)))</body>
         </specification>
@@ -42607,34 +42607,34 @@ value.codeSystem = '2.16.840.1.113883.3.26.1.1' and (value.code = 'C45329' or va
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_oDgF8C0DEeuxZ80rBBFFIQ" name="ExpirationDateObservation">
-      <ownedRule xmi:id="_5AnmgF9xEey5t-mahoHmrg" name="ExpirationDateObservationTemplateId" constrainedElement="_oDgF8C0DEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5AnmgV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PJ1TIH3sEeyivuDeOiJBMg" name="ExpirationDateObservationTemplateId" constrainedElement="_oDgF8C0DEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PJ1TIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.309' and id.extension = '2019-06-21')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5AqCwF9xEey5t-mahoHmrg" name="ExpirationDateObservationCodeP" constrainedElement="_oDgF8C0DEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Aqp0F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PJ3IUH3sEeyivuDeOiJBMg" name="ExpirationDateObservationCodeP" constrainedElement="_oDgF8C0DEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PJ3IUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Ao0oF9xEey5t-mahoHmrg" name="ExpirationDateObservationCode" constrainedElement="_oDgF8C0DEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Ao0oV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PJ2hQH3sEeyivuDeOiJBMg" name="ExpirationDateObservationCode" constrainedElement="_oDgF8C0DEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PJ2hQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'C101670' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Ar38F9xEey5t-mahoHmrg" name="ExpirationDateObservationValue" constrainedElement="_oDgF8C0DEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Ar38V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PJ49gH3sEeyivuDeOiJBMg" name="ExpirationDateObservationValue" constrainedElement="_oDgF8C0DEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PJ49gX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::TS)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9GcMYF9xEey5t-mahoHmrg" name="ExpirationDateObservationTSValue" constrainedElement="_oDgF8C0DEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9GcMYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TLHXQH3sEeyivuDeOiJBMg" name="ExpirationDateObservationTSValue" constrainedElement="_oDgF8C0DEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TLHXQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.value->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not value.oclIsUndefined() )))</body>
         </specification>
@@ -42644,28 +42644,28 @@ value.code = 'C101670' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</bod
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_q-hQIC0EEeuxZ80rBBFFIQ" name="DistinctIdentificationCodeObservation">
-      <ownedRule xmi:id="_5AttIV9xEey5t-mahoHmrg" name="DistinctIdentificationCodeObservationTemplateId" constrainedElement="_q-hQIC0EEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5AttIl9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PJ6Lo33sEeyivuDeOiJBMg" name="DistinctIdentificationCodeObservationTemplateId" constrainedElement="_q-hQIC0EEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PJ6ysH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.308' and id.extension = '2019-06-21')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5AwJYF9xEey5t-mahoHmrg" name="DistinctIdentificationCodeObservationCodeP" constrainedElement="_q-hQIC0EEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5AwJYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PJ8A0H3sEeyivuDeOiJBMg" name="DistinctIdentificationCodeObservationCodeP" constrainedElement="_q-hQIC0EEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PJ8n4H3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Au7QF9xEey5t-mahoHmrg" name="DistinctIdentificationCodeObservationCode" constrainedElement="_q-hQIC0EEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Au7QV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PJ7ZwH3sEeyivuDeOiJBMg" name="DistinctIdentificationCodeObservationCode" constrainedElement="_q-hQIC0EEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PJ7ZwX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'C113843' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5Ax-kF9xEey5t-mahoHmrg" name="DistinctIdentificationCodeObservationValue" constrainedElement="_q-hQIC0EEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5Ax-kV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PJ9O8H3sEeyivuDeOiJBMg" name="DistinctIdentificationCodeObservationValue" constrainedElement="_q-hQIC0EEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PJ9O8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::ED)))</body>
         </specification>
@@ -42675,52 +42675,52 @@ value.code = 'C113843' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</bod
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_aXaegC0FEeuxZ80rBBFFIQ" name="DeviceIdentifierObservation">
-      <ownedRule xmi:id="_5AyloF9xEey5t-mahoHmrg" name="DeviceIdentifierObservationTemplateId" constrainedElement="_aXaegC0FEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5AzMsF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PJ-dEH3sEeyivuDeOiJBMg" name="DeviceIdentifierObservationTemplateId" constrainedElement="_aXaegC0FEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PJ-dEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.304' and id.extension = '2019-06-21')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5A1o8F9xEey5t-mahoHmrg" name="DeviceIdentifierObservationCodeP" constrainedElement="_aXaegC0FEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5A1o8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKBgYH3sEeyivuDeOiJBMg" name="DeviceIdentifierObservationCodeP" constrainedElement="_aXaegC0FEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKBgYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5AzzwF9xEey5t-mahoHmrg" name="DeviceIdentifierObservationCode" constrainedElement="_aXaegC0FEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5AzzwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PJ_rMH3sEeyivuDeOiJBMg" name="DeviceIdentifierObservationCode" constrainedElement="_aXaegC0FEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PJ_rMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'C101722' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5A23EF9xEey5t-mahoHmrg" name="DeviceIdentifierObservationValue" constrainedElement="_aXaegC0FEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5A23EV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKCugH3sEeyivuDeOiJBMg" name="DeviceIdentifierObservationValue" constrainedElement="_aXaegC0FEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKCugX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::II)))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9GczcF9xEey5t-mahoHmrg" name="DeviceIdentifierObservationIIUDI issuing agency" constrainedElement="_aXaegC0FEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9GczcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TLIlYH3sEeyivuDeOiJBMg" name="DeviceIdentifierObservationIIUDI issuing agency" constrainedElement="_aXaegC0FEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TLIlYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.value->excluding(null)->select(isNullFlavorUndefined())->reject(matches('root','\\\\b1.3.160\\\\b'))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9Gczcl9xEey5t-mahoHmrg" name="DeviceIdentifierObservationIIRoot" constrainedElement="_aXaegC0FEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9Gczc19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TLIlYn3sEeyivuDeOiJBMg" name="DeviceIdentifierObservationIIRoot" constrainedElement="_aXaegC0FEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TLIlY33sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.value->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not root.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9GdagF9xEey5t-mahoHmrg" name="DeviceIdentifierObservationIIExtension" constrainedElement="_aXaegC0FEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9GdagV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TLIlZH3sEeyivuDeOiJBMg" name="DeviceIdentifierObservationIIExtension" constrainedElement="_aXaegC0FEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TLIlZX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.value->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not extension.oclIsUndefined() )))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_9Gdagl9xEey5t-mahoHmrg" name="DeviceIdentifierObservationIIDisplayable" constrainedElement="_aXaegC0FEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_9Gdag19xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_TLJMcH3sEeyivuDeOiJBMg" name="DeviceIdentifierObservationIIDisplayable" constrainedElement="_aXaegC0FEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TLJMcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.value->excluding(null)->select(isNullFlavorUndefined())->reject( ( isNullFlavorUndefined() implies (not displayable.oclIsUndefined() )))</body>
         </specification>
@@ -42730,28 +42730,28 @@ value.code = 'C101722' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</bod
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_CsrcoC0HEeuxZ80rBBFFIQ" name="CompanyNameObservation">
-      <ownedRule xmi:id="_5A7vkF9xEey5t-mahoHmrg" name="CompanyNameObservationTemplateId" constrainedElement="_CsrcoC0HEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5A7vkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKG_8H3sEeyivuDeOiJBMg" name="CompanyNameObservationTemplateId" constrainedElement="_CsrcoC0HEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKG_8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.303' and id.extension = '2019-06-21')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5A-L0F9xEey5t-mahoHmrg" name="CompanyNameObservationCodeP" constrainedElement="_CsrcoC0HEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5A-L0V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKI1IH3sEeyivuDeOiJBMg" name="CompanyNameObservationCodeP" constrainedElement="_CsrcoC0HEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKI1IX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5A8WoF9xEey5t-mahoHmrg" name="CompanyNameObservationCode" constrainedElement="_CsrcoC0HEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5A8WoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKIOEH3sEeyivuDeOiJBMg" name="CompanyNameObservationCode" constrainedElement="_CsrcoC0HEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKIOEX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'C54131' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5A_Z8F9xEey5t-mahoHmrg" name="CompanyNameObservationValue" constrainedElement="_CsrcoC0HEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5A_Z8V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKKDQH3sEeyivuDeOiJBMg" name="CompanyNameObservationValue" constrainedElement="_CsrcoC0HEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKKDQX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::ED)))</body>
         </specification>
@@ -42761,28 +42761,28 @@ value.code = 'C54131' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</body
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_BUBLIC0IEeuxZ80rBBFFIQ" name="CatalogNumberObservation">
-      <ownedRule xmi:id="_5BABAF9xEey5t-mahoHmrg" name="CatalogNumberObservationTemplateId" constrainedElement="_BUBLIC0IEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5BABAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKLRYH3sEeyivuDeOiJBMg" name="CatalogNumberObservationTemplateId" constrainedElement="_BUBLIC0IEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKLRYX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.302' and id.extension = '2019-06-21')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5BCdQF9xEey5t-mahoHmrg" name="CatalogNumberObservationCodeP" constrainedElement="_BUBLIC0IEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5BCdQV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKNGkH3sEeyivuDeOiJBMg" name="CatalogNumberObservationCodeP" constrainedElement="_BUBLIC0IEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKNGkX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5BBPIF9xEey5t-mahoHmrg" name="CatalogNumberObservationCode" constrainedElement="_BUBLIC0IEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5BBPIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKL4cH3sEeyivuDeOiJBMg" name="CatalogNumberObservationCode" constrainedElement="_BUBLIC0IEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKL4cX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'C99286' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5BDrYF9xEey5t-mahoHmrg" name="CatalogNumberObservationValue" constrainedElement="_BUBLIC0IEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5BDrYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKNtoH3sEeyivuDeOiJBMg" name="CatalogNumberObservationValue" constrainedElement="_BUBLIC0IEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKNtoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::ED)))</body>
         </specification>
@@ -42792,28 +42792,28 @@ value.code = 'C99286' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</body
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_E41gQC0JEeuxZ80rBBFFIQ" name="BrandNameObservation">
-      <ownedRule xmi:id="_5BEScF9xEey5t-mahoHmrg" name="BrandNameObservationTemplateId" constrainedElement="_E41gQC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5BEScV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKO7wH3sEeyivuDeOiJBMg" name="BrandNameObservationTemplateId" constrainedElement="_E41gQC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKO7wX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.301' and id.extension = '2019-06-21')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5BGHoF9xEey5t-mahoHmrg" name="BrandNameObservationCodeP" constrainedElement="_E41gQC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5BGHoV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKRYAH3sEeyivuDeOiJBMg" name="BrandNameObservationCodeP" constrainedElement="_E41gQC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKRYAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5BE5gF9xEey5t-mahoHmrg" name="BrandNameObservationCode" constrainedElement="_E41gQC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5BE5gV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKPi0H3sEeyivuDeOiJBMg" name="BrandNameObservationCode" constrainedElement="_E41gQC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKPi0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 value.code = 'C71898' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5BHVwF9xEey5t-mahoHmrg" name="BrandNameObservationValue" constrainedElement="_E41gQC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5BHVwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKSmIH3sEeyivuDeOiJBMg" name="BrandNameObservationValue" constrainedElement="_E41gQC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKSmIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::ED)))</body>
         </specification>
@@ -42823,132 +42823,132 @@ value.code = 'C71898' and value.codeSystem = '2.16.840.1.113883.3.26.1.1')</body
       </generalization>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_yU3ZUC0JEeuxZ80rBBFFIQ" name="UDIOrganizer">
-      <ownedRule xmi:id="_5BIj4F9xEey5t-mahoHmrg" name="UDIOrganizerTemplateId" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5BIj4V9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKTNMH3sEeyivuDeOiJBMg" name="UDIOrganizerTemplateId" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKTNMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.templateId->exists(id : datatypes::II | id.root = '2.16.840.1.113883.10.20.22.4.311' and id.extension = '2019-06-21')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5BJyAF9xEey5t-mahoHmrg" name="UDIOrganizerId" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5BJyAV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKUbUH3sEeyivuDeOiJBMg" name="UDIOrganizerId" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKUbUX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.id->isEmpty() or self.id->exists(element | element.isNullFlavorUndefined())) implies (( not self.id->isEmpty()) )</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5BLnMF9xEey5t-mahoHmrg" name="UDIOrganizerCodeP" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5BLnMV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKWQgH3sEeyivuDeOiJBMg" name="UDIOrganizerCodeP" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKW3kH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5BKZEF9xEey5t-mahoHmrg" name="UDIOrganizerCode" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5BKZEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKVpcH3sEeyivuDeOiJBMg" name="UDIOrganizerCode" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKVpcX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.code.oclIsUndefined() or self.code.isNullFlavorUndefined()) implies (not self.code.oclIsUndefined() and self.code.oclIsKindOf(datatypes::CD) and 
 let value : datatypes::CD = self.code.oclAsType(datatypes::CD) in 
 not value.codeSystem.oclIsUndefined() or not value.codeSystemName.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5BODcF9xEey5t-mahoHmrg" name="UDIOrganizerStatusCodeP" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5BODcV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKYswH3sEeyivuDeOiJBMg" name="UDIOrganizerStatusCodeP" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKYswX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined())</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5BM1UF9xEey5t-mahoHmrg" name="UDIOrganizerStatusCode" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5BM1UV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKXeoH3sEeyivuDeOiJBMg" name="UDIOrganizerStatusCode" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKXeoX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>(self.statusCode.oclIsUndefined() or self.statusCode.isNullFlavorUndefined()) implies (not self.statusCode.oclIsUndefined() and self.statusCode.oclIsKindOf(datatypes::CS) and 
 let value : datatypes::CS = self.statusCode.oclAsType(datatypes::CS) in 
 value.code = 'completed')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5BPRkF9xEey5t-mahoHmrg" name="UDIOrganizerClassCode" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5BPRkV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKZ64H3sEeyivuDeOiJBMg" name="UDIOrganizerClassCode" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKZ64X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('classCode')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5BQfsF9xEey5t-mahoHmrg" name="UDIOrganizerMoodCode" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5BQfsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PKbJAH3sEeyivuDeOiJBMg" name="UDIOrganizerMoodCode" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PKbJAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>isDefined('moodCode')</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5BuZwF9xEey5t-mahoHmrg" name="UDIOrganizerDeviceIdentifierObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5BvA0F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PK64QH3sEeyivuDeOiJBMg" name="UDIOrganizerDeviceIdentifierObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PK64QX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->one(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::DeviceIdentifierObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5CPXIF9xEey5t-mahoHmrg" name="UDIOrganizerLotOrBatchNumberObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5CPXIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PLXkMH3sEeyivuDeOiJBMg" name="UDIOrganizerLotOrBatchNumberObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PLXkMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->one(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::LotOrBatchNumberObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5CvGYF9xEey5t-mahoHmrg" name="UDIOrganizerSerialNumberObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5CvGYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PLzCAH3sEeyivuDeOiJBMg" name="UDIOrganizerSerialNumberObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PLzCAX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->one(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::SerialNumberObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5DPcsF9xEey5t-mahoHmrg" name="UDIOrganizerManufacturingDateObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5DPcsV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PMOf0H3sEeyivuDeOiJBMg" name="UDIOrganizerManufacturingDateObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PMOf0X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->one(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::ManufacturingDateObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5DvL8F9xEey5t-mahoHmrg" name="UDIOrganizerExpirationDateObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5DvzAF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PMoIcH3sEeyivuDeOiJBMg" name="UDIOrganizerExpirationDateObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PMovgH3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->one(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::ExpirationDateObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ERXcF9xEey5t-mahoHmrg" name="UDIOrganizerDistinctIdentificationCodeObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ER-gF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PNCYIH3sEeyivuDeOiJBMg" name="UDIOrganizerDistinctIdentificationCodeObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PNCYIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->one(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::DistinctIdentificationCodeObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5ExtwF9xEey5t-mahoHmrg" name="UDIOrganizerBrandNameObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5EyU0F9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PNdO4H3sEeyivuDeOiJBMg" name="UDIOrganizerBrandNameObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PNdO4X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->one(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::BrandNameObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5FSEEF9xEey5t-mahoHmrg" name="UDIOrganizerModelNumberObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5FSEEV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PN3ekH3sEeyivuDeOiJBMg" name="UDIOrganizerModelNumberObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PN3ekX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->one(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::ModelNumberObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5FwlMF9xEey5t-mahoHmrg" name="UDIOrganizerCompanyNameObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5FxMQF9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PORHMH3sEeyivuDeOiJBMg" name="UDIOrganizerCompanyNameObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PORHMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->one(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::CompanyNameObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5GRikF9xEey5t-mahoHmrg" name="UDIOrganizerCatalogNumberObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5GRikV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_POtzIH3sEeyivuDeOiJBMg" name="UDIOrganizerCatalogNumberObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_POtzIX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->one(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::CatalogNumberObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5G6bwF9xEey5t-mahoHmrg" name="UDIOrganizerLatexSafetyObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5G6bwV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PPJQ8H3sEeyivuDeOiJBMg" name="UDIOrganizerLatexSafetyObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PPJQ8X3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->one(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::LatexSafetyObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5HbZIF9xEey5t-mahoHmrg" name="UDIOrganizerMRISafetyObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5HbZIV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PPi5kH3sEeyivuDeOiJBMg" name="UDIOrganizerMRISafetyObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PPi5kX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->one(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::MRISafetyObservation))</body>
         </specification>
       </ownedRule>
-      <ownedRule xmi:id="_5H7IYF9xEey5t-mahoHmrg" name="UDIOrganizerImplantableDeviceStatusObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_5H7IYV9xEey5t-mahoHmrg">
+      <ownedRule xmi:id="_PP8iMH3sEeyivuDeOiJBMg" name="UDIOrganizerImplantableDeviceStatusObservation" constrainedElement="_yU3ZUC0JEeuxZ80rBBFFIQ">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PP8iMX3sEeyivuDeOiJBMg">
           <language>OCL</language>
           <body>self.component->one(component : cda::Component4 | not component.observation.oclIsUndefined() and component.observation.oclIsKindOf(consol::ImplantableDeviceStatusObservation))</body>
         </specification>
@@ -42956,147 +42956,147 @@ value.code = 'completed')</body>
       <generalization xmi:id="_yU4AYC0JEeuxZ80rBBFFIQ">
         <general xmi:type="uml:Class" href="pathmap://CDA_MODEL/cda.uml#_B6aX4EbvEd6besF9iFIJkQ"/>
       </generalization>
-      <ownedOperation xmi:id="_5BvA0V9xEey5t-mahoHmrg" name="getDeviceIdentifierObservation" bodyCondition="_5BvA1F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_5BvA1F9xEey5t-mahoHmrg" name="body" constrainedElement="_5BvA0V9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_5BvA1V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_PK64Qn3sEeyivuDeOiJBMg" name="getDeviceIdentifierObservation" bodyCondition="_PK64RX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_PK64RX3sEeyivuDeOiJBMg" name="body" constrainedElement="_PK64Qn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_PK64Rn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::DeviceIdentifierObservation))->asSequence()->any(true).oclAsType(consol::DeviceIdentifierObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_5BvA0l9xEey5t-mahoHmrg" type="_aXaegC0FEeuxZ80rBBFFIQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5BvA019xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_PK64Q33sEeyivuDeOiJBMg" type="_aXaegC0FEeuxZ80rBBFFIQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PK64RH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_5CPXIl9xEey5t-mahoHmrg" name="getLotOrBatchNumberObservation" bodyCondition="_5CPXJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_5CPXJV9xEey5t-mahoHmrg" name="body" constrainedElement="_5CPXIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_5CPXJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_PLYLQH3sEeyivuDeOiJBMg" name="getLotOrBatchNumberObservation" bodyCondition="_PLYLQ33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_PLYLQ33sEeyivuDeOiJBMg" name="body" constrainedElement="_PLYLQH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_PLYLRH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::LotOrBatchNumberObservation))->asSequence()->any(true).oclAsType(consol::LotOrBatchNumberObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_5CPXI19xEey5t-mahoHmrg" type="_YvpowC0AEeuxZ80rBBFFIQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5CPXJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_PLYLQX3sEeyivuDeOiJBMg" type="_YvpowC0AEeuxZ80rBBFFIQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PLYLQn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_5CvGYl9xEey5t-mahoHmrg" name="getSerialNumberObservation" bodyCondition="_5CvGZV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_5CvGZV9xEey5t-mahoHmrg" name="body" constrainedElement="_5CvGYl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_5CvGZl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_PLzCAn3sEeyivuDeOiJBMg" name="getSerialNumberObservation" bodyCondition="_PLzCBX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_PLzCBX3sEeyivuDeOiJBMg" name="body" constrainedElement="_PLzCAn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_PLzCBn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::SerialNumberObservation))->asSequence()->any(true).oclAsType(consol::SerialNumberObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_5CvGY19xEey5t-mahoHmrg" type="_iyVA4Cz7EeuxZ80rBBFFIQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5CvGZF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_PLzCA33sEeyivuDeOiJBMg" type="_iyVA4Cz7EeuxZ80rBBFFIQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PLzCBH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_5DPcsl9xEey5t-mahoHmrg" name="getManufacturingDateObservation" bodyCondition="_5DPctV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_5DPctV9xEey5t-mahoHmrg" name="body" constrainedElement="_5DPcsl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_5DPctl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_PMOf0n3sEeyivuDeOiJBMg" name="getManufacturingDateObservation" bodyCondition="_PMOf1X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_PMOf1X3sEeyivuDeOiJBMg" name="body" constrainedElement="_PMOf0n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_PMOf1n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ManufacturingDateObservation))->asSequence()->any(true).oclAsType(consol::ManufacturingDateObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_5DPcs19xEey5t-mahoHmrg" type="_uvNFwCz_EeuxZ80rBBFFIQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5DPctF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_PMOf033sEeyivuDeOiJBMg" type="_uvNFwCz_EeuxZ80rBBFFIQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PMOf1H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_5DvzAV9xEey5t-mahoHmrg" name="getExpirationDateObservation" bodyCondition="_5DvzBF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_5DvzBF9xEey5t-mahoHmrg" name="body" constrainedElement="_5DvzAV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_5DvzBV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_PMovgX3sEeyivuDeOiJBMg" name="getExpirationDateObservation" bodyCondition="_PMovhH3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_PMovhH3sEeyivuDeOiJBMg" name="body" constrainedElement="_PMovgX3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_PMovhX3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ExpirationDateObservation))->asSequence()->any(true).oclAsType(consol::ExpirationDateObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_5DvzAl9xEey5t-mahoHmrg" type="_oDgF8C0DEeuxZ80rBBFFIQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5DvzA19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_PMovgn3sEeyivuDeOiJBMg" type="_oDgF8C0DEeuxZ80rBBFFIQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PMovg33sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_5ER-gV9xEey5t-mahoHmrg" name="getDistinctIdentificationCodeObservation" bodyCondition="_5ER-hF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_5ER-hF9xEey5t-mahoHmrg" name="body" constrainedElement="_5ER-gV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_5ER-hV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_PNC_MH3sEeyivuDeOiJBMg" name="getDistinctIdentificationCodeObservation" bodyCondition="_PNC_M33sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_PNC_M33sEeyivuDeOiJBMg" name="body" constrainedElement="_PNC_MH3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_PNC_NH3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::DistinctIdentificationCodeObservation))->asSequence()->any(true).oclAsType(consol::DistinctIdentificationCodeObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_5ER-gl9xEey5t-mahoHmrg" type="_q-hQIC0EEeuxZ80rBBFFIQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5ER-g19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_PNC_MX3sEeyivuDeOiJBMg" type="_q-hQIC0EEeuxZ80rBBFFIQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PNC_Mn3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_5EyU0V9xEey5t-mahoHmrg" name="getBrandNameObservation" bodyCondition="_5EyU1F9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_5EyU1F9xEey5t-mahoHmrg" name="body" constrainedElement="_5EyU0V9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_5EyU1V9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_PNd18H3sEeyivuDeOiJBMg" name="getBrandNameObservation" bodyCondition="_PNd1833sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_PNd1833sEeyivuDeOiJBMg" name="body" constrainedElement="_PNd18H3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_PNd19H3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::BrandNameObservation))->asSequence()->any(true).oclAsType(consol::BrandNameObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_5EyU0l9xEey5t-mahoHmrg" type="_E41gQC0JEeuxZ80rBBFFIQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5EyU019xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_PNd18X3sEeyivuDeOiJBMg" type="_E41gQC0JEeuxZ80rBBFFIQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PNd18n3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_5FSEEl9xEey5t-mahoHmrg" name="getModelNumberObservation" bodyCondition="_5FSEFV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_5FSEFV9xEey5t-mahoHmrg" name="body" constrainedElement="_5FSEEl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_5FSEFl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_PN3ekn3sEeyivuDeOiJBMg" name="getModelNumberObservation" bodyCondition="_PN3elX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_PN3elX3sEeyivuDeOiJBMg" name="body" constrainedElement="_PN3ekn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_PN3eln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ModelNumberObservation))->asSequence()->any(true).oclAsType(consol::ModelNumberObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_5FSEE19xEey5t-mahoHmrg" type="_2V3xoCz-EeuxZ80rBBFFIQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5FSEFF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_PN3ek33sEeyivuDeOiJBMg" type="_2V3xoCz-EeuxZ80rBBFFIQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PN3elH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_5FxMQV9xEey5t-mahoHmrg" name="getCompanyNameObservation" bodyCondition="_5FxMRF9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_5FxMRF9xEey5t-mahoHmrg" name="body" constrainedElement="_5FxMQV9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_5FxMRV9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_PORHMn3sEeyivuDeOiJBMg" name="getCompanyNameObservation" bodyCondition="_PORHNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_PORHNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_PORHMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_PORHNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CompanyNameObservation))->asSequence()->any(true).oclAsType(consol::CompanyNameObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_5FxMQl9xEey5t-mahoHmrg" type="_CsrcoC0HEeuxZ80rBBFFIQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5FxMQ19xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_PORHM33sEeyivuDeOiJBMg" type="_CsrcoC0HEeuxZ80rBBFFIQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PORHNH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_5GSJoF9xEey5t-mahoHmrg" name="getCatalogNumberObservation" bodyCondition="_5GSJo19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_5GSJo19xEey5t-mahoHmrg" name="body" constrainedElement="_5GSJoF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_5GSJpF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_POtzIn3sEeyivuDeOiJBMg" name="getCatalogNumberObservation" bodyCondition="_POtzJX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_POtzJX3sEeyivuDeOiJBMg" name="body" constrainedElement="_POtzIn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_POtzJn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::CatalogNumberObservation))->asSequence()->any(true).oclAsType(consol::CatalogNumberObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_5GSJoV9xEey5t-mahoHmrg" type="_BUBLIC0IEeuxZ80rBBFFIQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5GSJol9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_POtzI33sEeyivuDeOiJBMg" type="_BUBLIC0IEeuxZ80rBBFFIQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_POtzJH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_5G6bwl9xEey5t-mahoHmrg" name="getLatexSafetyObservation" bodyCondition="_5G6bxV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_5G6bxV9xEey5t-mahoHmrg" name="body" constrainedElement="_5G6bwl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_5G6bxl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_PPJQ8n3sEeyivuDeOiJBMg" name="getLatexSafetyObservation" bodyCondition="_PPJQ9X3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_PPJQ9X3sEeyivuDeOiJBMg" name="body" constrainedElement="_PPJQ8n3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_PPJQ9n3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::LatexSafetyObservation))->asSequence()->any(true).oclAsType(consol::LatexSafetyObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_5G6bw19xEey5t-mahoHmrg" type="_YK8jwC0BEeuxZ80rBBFFIQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5G6bxF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_PPJQ833sEeyivuDeOiJBMg" type="_YK8jwC0BEeuxZ80rBBFFIQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PPJQ9H3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_5HbZIl9xEey5t-mahoHmrg" name="getMRISafetyObservation" bodyCondition="_5HbZJV9xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_5HbZJV9xEey5t-mahoHmrg" name="body" constrainedElement="_5HbZIl9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_5HbZJl9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_PPi5kn3sEeyivuDeOiJBMg" name="getMRISafetyObservation" bodyCondition="_PPi5lX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_PPi5lX3sEeyivuDeOiJBMg" name="body" constrainedElement="_PPi5kn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_PPi5ln3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::MRISafetyObservation))->asSequence()->any(true).oclAsType(consol::MRISafetyObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_5HbZI19xEey5t-mahoHmrg" type="_azjXACz8EeuxZ80rBBFFIQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5HbZJF9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_PPi5k33sEeyivuDeOiJBMg" type="_azjXACz8EeuxZ80rBBFFIQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PPi5lH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:id="_5H7vcF9xEey5t-mahoHmrg" name="getImplantableDeviceStatusObservation" bodyCondition="_5H7vc19xEey5t-mahoHmrg" isQuery="true">
-        <ownedRule xmi:id="_5H7vc19xEey5t-mahoHmrg" name="body" constrainedElement="_5H7vcF9xEey5t-mahoHmrg">
-          <specification xmi:type="uml:OpaqueExpression" xmi:id="_5H7vdF9xEey5t-mahoHmrg">
+      <ownedOperation xmi:id="_PP8iMn3sEeyivuDeOiJBMg" name="getImplantableDeviceStatusObservation" bodyCondition="_PP8iNX3sEeyivuDeOiJBMg" isQuery="true">
+        <ownedRule xmi:id="_PP8iNX3sEeyivuDeOiJBMg" name="body" constrainedElement="_PP8iMn3sEeyivuDeOiJBMg">
+          <specification xmi:type="uml:OpaqueExpression" xmi:id="_PP8iNn3sEeyivuDeOiJBMg">
             <language>OCL</language>
             <body>self.getObservations()->select(observation : cda::Observation | not observation.oclIsUndefined() and observation.oclIsKindOf(consol::ImplantableDeviceStatusObservation))->asSequence()->any(true).oclAsType(consol::ImplantableDeviceStatusObservation)</body>
           </specification>
         </ownedRule>
-        <ownedParameter xmi:id="_5H7vcV9xEey5t-mahoHmrg" type="_fdGGQC0CEeuxZ80rBBFFIQ" direction="return">
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5H7vcl9xEey5t-mahoHmrg" value="1"/>
+        <ownedParameter xmi:id="_PP8iM33sEeyivuDeOiJBMg" type="_fdGGQC0CEeuxZ80rBBFFIQ" direction="return">
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PP8iNH3sEeyivuDeOiJBMg" value="1"/>
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
@@ -43106,8 +43106,8 @@ value.code = 'completed')</body>
       </eAnnotations>
       <appliedProfile href="pathmap://CDA_PROFILES/CDA.profile.uml#_cxOJEIEVEd6H8o-hO3-B4Q"/>
     </profileApplication>
-    <profileApplication xmi:id="_pZKJcF9xEey5t-mahoHmrg">
-      <eAnnotations xmi:id="_pZKJcV9xEey5t-mahoHmrg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <profileApplication xmi:id="_BuMNYH3sEeyivuDeOiJBMg">
+      <eAnnotations xmi:id="_BuQe0H3sEeyivuDeOiJBMg" source="http://www.eclipse.org/uml2/2.0.0/UML">
         <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
       </eAnnotations>
       <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
@@ -46335,10 +46335,10 @@ value.code = 'completed')</body>
     <ruleId>CONF:4437-3443</ruleId>
     <ruleId>CONF:4437-3444</ruleId>
   </CDA:CDATemplate>
-  <Ecore:EPackage xmi:id="_pZ37IF9xEey5t-mahoHmrg" base_Package="_2B30sBSVEeGGzu7fmW9pXw" packageName="consol" nsPrefix="consol" nsURI="http://www.openhealthtools.org/mdht/uml/cda/consol" basePackage="org.openhealthtools.mdht.uml.cda" prefix="Consol">
+  <Ecore:EPackage xmi:id="_BvDwEH3sEeyivuDeOiJBMg" base_Package="_2B30sBSVEeGGzu7fmW9pXw" packageName="consol" nsPrefix="consol" nsURI="http://www.openhealthtools.org/mdht/uml/cda/consol" basePackage="org.openhealthtools.mdht.uml.cda" prefix="Consol">
     <annotation>http://www.eclipse.org/mdht/uml initializers='org.openhealthtools.mdht.uml.cda.consol'</annotation>
   </Ecore:EPackage>
-  <Ecore:EClass xmi:id="_pZ6-cF9xEey5t-mahoHmrg" base_Class="_2DNRcBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_BvNhEH3sEeyivuDeOiJBMg" base_Class="_2DNRcBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='GeneralHeaderConstraintsTemplateId GeneralHeaderConstraintsTypeIdRoot GeneralHeaderConstraintsTypeIdExtension GeneralHeaderConstraintsSetIdVersionNumber GeneralHeaderConstraintsVersionNumberSetId GeneralHeaderConstraintsRealmCode GeneralHeaderConstraintsTypeId GeneralHeaderConstraintsId GeneralHeaderConstraintsCode GeneralHeaderConstraintsTitle GeneralHeaderConstraintsEffectiveTime GeneralHeaderConstraintsConfidentialityCodeP GeneralHeaderConstraintsLanguageCode GeneralHeaderConstraintsLanguageCodeP GeneralHeaderConstraintsAuthor GeneralHeaderConstraintsCustodian GeneralHeaderConstraintsRecordTarget GeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheDayTS GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameUSRealmPatientNameMixedContent GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameUse GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameFamily GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameGiven GeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToYear GeneralHeaderConstraintsRecordTargetPatientRolePatientTSValue GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianPersonName GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCodeFromPersonalRelationshipOrResponsibleParty GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGuardianPerson GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlaceHasState GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlaceAddr GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlace GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCode GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationModeCode GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationProficiencyLevelCode GeneralHeaderConstraintsRecordTargetPatientRolePatientIfSdtcEnforceRaceCode GeneralHeaderConstraintsRecordTargetPatientRolePatientName GeneralHeaderConstraintsRecordTargetPatientRolePatientAdministrativeGenderCode GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthTime GeneralHeaderConstraintsRecordTargetPatientRolePatientMaritalStatusCode GeneralHeaderConstraintsRecordTargetPatientRolePatientReligiousAffiliationCode GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCode GeneralHeaderConstraintsRecordTargetPatientRolePatientSDTCRaceCode GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCode GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationId GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationName GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationTelecom GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationAddr GeneralHeaderConstraintsRecordTargetPatientRoleId GeneralHeaderConstraintsRecordTargetPatientRoleAddr GeneralHeaderConstraintsRecordTargetPatientRoleTelecom GeneralHeaderConstraintsRecordTargetPatientRolePatient GeneralHeaderConstraintsRecordTargetPatientRole GeneralHeaderConstraintsComponentOfEncompassingEncounterId GeneralHeaderConstraintsComponentOfEncompassingEncounterEffectiveTime GeneralHeaderConstraintsComponentOfEncompassingEncounter GeneralHeaderConstraintsAuthorGeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheDayTS GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsAuthorAssignedAuthorAuthoringDeviceManufacturerModelName GeneralHeaderConstraintsAuthorAssignedAuthorAuthoringDeviceSoftwareName GeneralHeaderConstraintsAuthorAssignedAuthorPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent GeneralHeaderConstraintsAuthorAssignedAuthorPersonName GeneralHeaderConstraintsAuthorAssignedAuthorHasOneAssignedPersonOrOneAssignedAuthoringDevice GeneralHeaderConstraintsAuthorAssignedAuthorId GeneralHeaderConstraintsAuthorAssignedAuthorAddr GeneralHeaderConstraintsAuthorAssignedAuthorTelecom GeneralHeaderConstraintsAuthorTime GeneralHeaderConstraintsAuthorAssignedAuthor GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsDataEntererAssignedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent GeneralHeaderConstraintsDataEntererAssignedEntityPersonName GeneralHeaderConstraintsDataEntererAssignedEntityId GeneralHeaderConstraintsDataEntererAssignedEntityAddr GeneralHeaderConstraintsDataEntererAssignedEntityTelecom GeneralHeaderConstraintsDataEntererAssignedEntityAssignedPerson GeneralHeaderConstraintsDataEntererAssignedEntity GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationId GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationName GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationTelecom GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationAddr GeneralHeaderConstraintsCustodianAssignedCustodianRepresentedCustodianOrganization GeneralHeaderConstraintsCustodianAssignedCustodian GeneralHeaderConstraintsInformationRecipientIntendedRecipientPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent GeneralHeaderConstraintsInformationRecipientIntendedRecipientPersonName GeneralHeaderConstraintsInformationRecipientIntendedRecipientOrganizationName GeneralHeaderConstraintsInformationRecipientIntendedRecipient GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityPersonName GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityId GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityAddr GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityTelecom GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityAssignedPerson GeneralHeaderConstraintsLegalAuthenticatorTime GeneralHeaderConstraintsLegalAuthenticatorSignatureCodeP GeneralHeaderConstraintsLegalAuthenticatorSignatureCode GeneralHeaderConstraintsLegalAuthenticatorAssignedEntity GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsAuthenticatorAssignedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent GeneralHeaderConstraintsAuthenticatorAssignedEntityPersonName GeneralHeaderConstraintsAuthenticatorAssignedEntityId GeneralHeaderConstraintsAuthenticatorAssignedEntityAddr GeneralHeaderConstraintsAuthenticatorAssignedEntityTelecom GeneralHeaderConstraintsAuthenticatorAssignedEntityAssignedPerson GeneralHeaderConstraintsAuthenticatorTime GeneralHeaderConstraintsAuthenticatorSignatureCodeP GeneralHeaderConstraintsAuthenticatorSignatureCode GeneralHeaderConstraintsAuthenticatorAssignedEntity GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsInformantAssignedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent GeneralHeaderConstraintsInformantAssignedEntityPersonName GeneralHeaderConstraintsInformantAssignedEntityId GeneralHeaderConstraintsInformantAssignedEntityAssignedPerson GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsInformantRelatedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent GeneralHeaderConstraintsInformantRelatedEntityPerson GeneralHeaderConstraintsInformantHasAssignedEntityOrRelatedEntity GeneralHeaderConstraintsParticipantSupportAssociatedEntityHasAssociatedPersonOrScopingOrganization GeneralHeaderConstraintsInFulfillmentOfOrderId GeneralHeaderConstraintsInFulfillmentOfOrder GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityId GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1TypeCode GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntity GeneralHeaderConstraintsDocumentationOfServiceEventEffectiveTimeLow GeneralHeaderConstraintsDocumentationOfServiceEventEffectiveTime GeneralHeaderConstraintsDocumentationOfServiceEvent GeneralHeaderConstraintsAuthorizationConsentStatusCodeP GeneralHeaderConstraintsAuthorizationConsentStatusCode GeneralHeaderConstraintsAuthorizationConsent' templateId.root='2.16.840.1.113883.10.20.22.1.1' realmCode.code='US' confidentialityCode.codeSystem='2.16.840.1.113883.5.25' confidentialityCode.codeSystemName='ConfidentialityCode' constraints.validation.warning='GeneralHeaderConstraintsConfidentialityCode GeneralHeaderConstraintsLegalAuthenticator GeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheMinuteTS GeneralHeaderConstraintsUSRealmDateAndTimeDTMIfMorePreciseThanDayIncludeTimeZoneOffsetTS GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsRecordTargetPatientRoleTELUse GeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToDay GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTELUse GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCode GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianAddr GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationProficiencyLevelCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientMaritalStatusCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunication GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationTELUse GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationHasNationalProviderIdentifier GeneralHeaderConstraintsAuthorGeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheMinuteTS GeneralHeaderConstraintsAuthorGeneralHeaderConstraintsUSRealmDateAndTimeDTMIfMorePreciseThanDayIncludeTimeZoneOffsetTS GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsAuthorAssignedAuthorTELUse GeneralHeaderConstraintsAuthorAssignedAuthorHasNationalProviderIdentifier GeneralHeaderConstraintsAuthorAssignedAuthorCodeP GeneralHeaderConstraintsAuthorAssignedAuthorCode GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsDataEntererAssignedEntityTELUse GeneralHeaderConstraintsDataEntererAssignedEntityHasNationalProviderIdentifier GeneralHeaderConstraintsDataEntererAssignedEntityCode GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationTELUse GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationHasNationalProviderIdentifier GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityTELUse GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityCode GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsAuthenticatorAssignedEntityTELUse GeneralHeaderConstraintsAuthenticatorAssignedEntityHasNationalProviderIdentifier GeneralHeaderConstraintsAuthenticatorAssignedEntityCode GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsInformantAssignedEntityHasNationalProviderIdentifier GeneralHeaderConstraintsInformantAssignedEntityCode GeneralHeaderConstraintsInformantAssignedEntityAddr GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsInformantRelatedEntityAddr GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityHasNationalProviderIdentifier GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCodeP GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCode GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCode GeneralHeaderConstraintsDocumentationOfServiceEventPerformer' constraints.validation.dependOn.GeneralHeaderConstraintsConfidentialityCode='GeneralHeaderConstraintsConfidentialityCodeP' constraints.validation.info='GeneralHeaderConstraintsSetId GeneralHeaderConstraintsVersionNumber GeneralHeaderConstraintsDataEnterer GeneralHeaderConstraintsInformationRecipient GeneralHeaderConstraintsAuthenticator GeneralHeaderConstraintsComponentOf GeneralHeaderConstraintsInformant GeneralHeaderConstraintsSupportParticipant GeneralHeaderConstraintsInFulfillmentOf GeneralHeaderConstraintsDocumentationOf GeneralHeaderConstraintsAuthorization GeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheSecondTS GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameUseP GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNamePrefix GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameSuffix GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTelecom GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationModeCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationPreferenceInd GeneralHeaderConstraintsRecordTargetPatientRolePatientReligiousAffiliationCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientSDTCRaceCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardian GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplace GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganization GeneralHeaderConstraintsAuthorGeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheSecondTS GeneralHeaderConstraintsDataEntererAssignedEntityCodeP GeneralHeaderConstraintsInformationRecipientIntendedRecipientInformationRecipient GeneralHeaderConstraintsInformationRecipientIntendedRecipientRecievedOrganization GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityHasNationalProviderIdentifier GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityCodeP GeneralHeaderConstraintsAuthenticatorAssignedEntityCodeP GeneralHeaderConstraintsInformantAssignedEntityCodeP GeneralHeaderConstraintsParticipantSupportTime GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCodeP GeneralHeaderConstraintsAuthorizationConsentId GeneralHeaderConstraintsAuthorizationConsentCode' constraints.validation.query='GeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheDayTS GeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheMinuteTS GeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheSecondTS GeneralHeaderConstraintsUSRealmDateAndTimeDTMIfMorePreciseThanDayIncludeTimeZoneOffsetTS GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsRecordTargetPatientRoleTELUse GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameUSRealmPatientNameMixedContent GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameUse GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameUseP GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameFamily GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameGiven GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNamePrefix GeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameSuffix GeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToYear GeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToDay GeneralHeaderConstraintsRecordTargetPatientRolePatientTSValue GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTELUse GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianPersonName GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCodeFromPersonalRelationshipOrResponsibleParty GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCode GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianAddr GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTelecom GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGuardianPerson GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlaceHasState GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlaceAddr GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlace GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCode GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationModeCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationModeCode GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationProficiencyLevelCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationProficiencyLevelCode GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationPreferenceInd GeneralHeaderConstraintsRecordTargetPatientRolePatientIfSdtcEnforceRaceCode GeneralHeaderConstraintsRecordTargetPatientRolePatientName GeneralHeaderConstraintsRecordTargetPatientRolePatientAdministrativeGenderCode GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthTime GeneralHeaderConstraintsRecordTargetPatientRolePatientMaritalStatusCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientMaritalStatusCode GeneralHeaderConstraintsRecordTargetPatientRolePatientReligiousAffiliationCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientReligiousAffiliationCode GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCode GeneralHeaderConstraintsRecordTargetPatientRolePatientSDTCRaceCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientSDTCRaceCode GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCode GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardian GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplace GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunication GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationTELUse GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationHasNationalProviderIdentifier GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationId GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationName GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationTelecom GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationAddr GeneralHeaderConstraintsRecordTargetPatientRoleId GeneralHeaderConstraintsRecordTargetPatientRoleAddr GeneralHeaderConstraintsRecordTargetPatientRoleTelecom GeneralHeaderConstraintsRecordTargetPatientRolePatient GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganization GeneralHeaderConstraintsRecordTargetPatientRole GeneralHeaderConstraintsComponentOfEncompassingEncounterId GeneralHeaderConstraintsComponentOfEncompassingEncounterEffectiveTime GeneralHeaderConstraintsComponentOfEncompassingEncounter GeneralHeaderConstraintsAuthorGeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheDayTS GeneralHeaderConstraintsAuthorGeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheMinuteTS GeneralHeaderConstraintsAuthorGeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheSecondTS GeneralHeaderConstraintsAuthorGeneralHeaderConstraintsUSRealmDateAndTimeDTMIfMorePreciseThanDayIncludeTimeZoneOffsetTS GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsAuthorAssignedAuthorTELUse GeneralHeaderConstraintsAuthorAssignedAuthorAuthoringDeviceManufacturerModelName GeneralHeaderConstraintsAuthorAssignedAuthorAuthoringDeviceSoftwareName GeneralHeaderConstraintsAuthorAssignedAuthorPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent GeneralHeaderConstraintsAuthorAssignedAuthorPersonName GeneralHeaderConstraintsAuthorAssignedAuthorHasOneAssignedPersonOrOneAssignedAuthoringDevice GeneralHeaderConstraintsAuthorAssignedAuthorHasNationalProviderIdentifier GeneralHeaderConstraintsAuthorAssignedAuthorId GeneralHeaderConstraintsAuthorAssignedAuthorCodeP GeneralHeaderConstraintsAuthorAssignedAuthorCode GeneralHeaderConstraintsAuthorAssignedAuthorAddr GeneralHeaderConstraintsAuthorAssignedAuthorTelecom GeneralHeaderConstraintsAuthorTime GeneralHeaderConstraintsAuthorAssignedAuthor GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsDataEntererAssignedEntityTELUse GeneralHeaderConstraintsDataEntererAssignedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent GeneralHeaderConstraintsDataEntererAssignedEntityPersonName GeneralHeaderConstraintsDataEntererAssignedEntityHasNationalProviderIdentifier GeneralHeaderConstraintsDataEntererAssignedEntityId GeneralHeaderConstraintsDataEntererAssignedEntityCodeP GeneralHeaderConstraintsDataEntererAssignedEntityCode GeneralHeaderConstraintsDataEntererAssignedEntityAddr GeneralHeaderConstraintsDataEntererAssignedEntityTelecom GeneralHeaderConstraintsDataEntererAssignedEntityAssignedPerson GeneralHeaderConstraintsDataEntererAssignedEntity GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationTELUse GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationHasNationalProviderIdentifier GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationId GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationName GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationTelecom GeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationAddr GeneralHeaderConstraintsCustodianAssignedCustodianRepresentedCustodianOrganization GeneralHeaderConstraintsCustodianAssignedCustodian GeneralHeaderConstraintsInformationRecipientIntendedRecipientPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent GeneralHeaderConstraintsInformationRecipientIntendedRecipientPersonName GeneralHeaderConstraintsInformationRecipientIntendedRecipientOrganizationName GeneralHeaderConstraintsInformationRecipientIntendedRecipientInformationRecipient GeneralHeaderConstraintsInformationRecipientIntendedRecipientRecievedOrganization GeneralHeaderConstraintsInformationRecipientIntendedRecipient GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityTELUse GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityPersonName GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityHasNationalProviderIdentifier GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityId GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityCodeP GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityCode GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityAddr GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityTelecom GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityAssignedPerson GeneralHeaderConstraintsLegalAuthenticatorTime GeneralHeaderConstraintsLegalAuthenticatorSignatureCodeP GeneralHeaderConstraintsLegalAuthenticatorSignatureCode GeneralHeaderConstraintsLegalAuthenticatorAssignedEntity GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsAuthenticatorAssignedEntityTELUse GeneralHeaderConstraintsAuthenticatorAssignedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent GeneralHeaderConstraintsAuthenticatorAssignedEntityPersonName GeneralHeaderConstraintsAuthenticatorAssignedEntityHasNationalProviderIdentifier GeneralHeaderConstraintsAuthenticatorAssignedEntityId GeneralHeaderConstraintsAuthenticatorAssignedEntityCodeP GeneralHeaderConstraintsAuthenticatorAssignedEntityCode GeneralHeaderConstraintsAuthenticatorAssignedEntityAddr GeneralHeaderConstraintsAuthenticatorAssignedEntityTelecom GeneralHeaderConstraintsAuthenticatorAssignedEntityAssignedPerson GeneralHeaderConstraintsAuthenticatorTime GeneralHeaderConstraintsAuthenticatorSignatureCodeP GeneralHeaderConstraintsAuthenticatorSignatureCode GeneralHeaderConstraintsAuthenticatorAssignedEntity GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsInformantAssignedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent GeneralHeaderConstraintsInformantAssignedEntityPersonName GeneralHeaderConstraintsInformantAssignedEntityHasNationalProviderIdentifier GeneralHeaderConstraintsInformantAssignedEntityId GeneralHeaderConstraintsInformantAssignedEntityCodeP GeneralHeaderConstraintsInformantAssignedEntityCode GeneralHeaderConstraintsInformantAssignedEntityAddr GeneralHeaderConstraintsInformantAssignedEntityAssignedPerson GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressUse GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressUseP GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressCountry GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressState GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressCity GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsInformantRelatedEntityPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent GeneralHeaderConstraintsInformantRelatedEntityAddr GeneralHeaderConstraintsInformantRelatedEntityPerson GeneralHeaderConstraintsInformantHasAssignedEntityOrRelatedEntity GeneralHeaderConstraintsParticipantSupportAssociatedEntityHasAssociatedPersonOrScopingOrganization GeneralHeaderConstraintsParticipantSupportTime GeneralHeaderConstraintsInFulfillmentOfOrderId GeneralHeaderConstraintsInFulfillmentOfOrder GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityHasNationalProviderIdentifier GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityId GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCodeP GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCode GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1TypeCode GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCodeP GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCode GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntity GeneralHeaderConstraintsDocumentationOfServiceEventEffectiveTimeLow GeneralHeaderConstraintsDocumentationOfServiceEventEffectiveTime GeneralHeaderConstraintsDocumentationOfServiceEventPerformer GeneralHeaderConstraintsDocumentationOfServiceEvent GeneralHeaderConstraintsAuthorizationConsentId GeneralHeaderConstraintsAuthorizationConsentCode GeneralHeaderConstraintsAuthorizationConsentStatusCodeP GeneralHeaderConstraintsAuthorizationConsentStatusCode GeneralHeaderConstraintsAuthorizationConsent' constraints.validation.dependOn.GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationModeCode='GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationModeCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationProficiencyLevelCode='GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationProficiencyLevelCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsRecordTargetPatientRolePatientMaritalStatusCode='GeneralHeaderConstraintsRecordTargetPatientRolePatientMaritalStatusCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsRecordTargetPatientRolePatientReligiousAffiliationCode='GeneralHeaderConstraintsRecordTargetPatientRolePatientReligiousAffiliationCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCode='GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsRecordTargetPatientRolePatientSDTCRaceCode='GeneralHeaderConstraintsRecordTargetPatientRolePatientSDTCRaceCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCode='GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsAuthorAssignedAuthorCode='GeneralHeaderConstraintsAuthorAssignedAuthorCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsDataEntererAssignedEntityCode='GeneralHeaderConstraintsDataEntererAssignedEntityCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityCode='GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsLegalAuthenticatorSignatureCode='GeneralHeaderConstraintsLegalAuthenticatorSignatureCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsAuthenticatorAssignedEntityCode='GeneralHeaderConstraintsAuthenticatorAssignedEntityCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsAuthenticatorSignatureCode='GeneralHeaderConstraintsAuthenticatorSignatureCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsInformantAssignedEntityCode='GeneralHeaderConstraintsInformantAssignedEntityCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCode='GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCode='GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsAuthorizationConsentStatusCode='GeneralHeaderConstraintsAuthorizationConsentStatusCodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolGeneralHeaderConstraintsRecordTarget constraints.validation.error='GeneralHeaderConstraintsRecordTargetPatientRole'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolGeneralHeaderConstraintsRecordTargetPatientRole constraints.validation.error='GeneralHeaderConstraintsRecordTargetPatientRoleId GeneralHeaderConstraintsRecordTargetPatientRoleAddr GeneralHeaderConstraintsRecordTargetPatientRoleTelecom GeneralHeaderConstraintsRecordTargetPatientRolePatient PatientRoleGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PatientRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PatientRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PatientRoleGeneralHeaderConstraintsUSRealmAddressUse PatientRoleGeneralHeaderConstraintsUSRealmAddressCity PatientRoleGeneralHeaderConstraintsUSRealmAddressStreetAddressLine' constraints.validation.info='GeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganization' constraints.validation.query='PatientRoleGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PatientRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PatientRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PatientRoleGeneralHeaderConstraintsUSRealmAddressUse PatientRoleGeneralHeaderConstraintsUSRealmAddressUseP PatientRoleGeneralHeaderConstraintsUSRealmAddressCountry PatientRoleGeneralHeaderConstraintsUSRealmAddressState PatientRoleGeneralHeaderConstraintsUSRealmAddressCity PatientRoleGeneralHeaderConstraintsUSRealmAddressPostalCode PatientRoleGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsRecordTargetPatientRoleTELUse' constraints.validation.warning='PatientRoleGeneralHeaderConstraintsUSRealmAddressUseP PatientRoleGeneralHeaderConstraintsUSRealmAddressCountry PatientRoleGeneralHeaderConstraintsUSRealmAddressState PatientRoleGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsRecordTargetPatientRoleTELUse'</annotation>
@@ -46399,56 +46399,56 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolGeneralHeaderConstraintsUSRealmDateAndTimeDTM constraints.validation.error='GeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheDayTS' constraints.validation.warning='GeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheMinuteTS GeneralHeaderConstraintsUSRealmDateAndTimeDTMIfMorePreciseThanDayIncludeTimeZoneOffsetTS' constraints.validation.info='GeneralHeaderConstraintsUSRealmDateAndTimeDTMPreciseToTheSecondTS'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolGeneralHeaderConstraintsUSRealmPersonName constraints.validation.query='GeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_pxNdEl9xEey5t-mahoHmrg" base_Class="_2EAisBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CGagIX3sEeyivuDeOiJBMg" base_Class="_2EAisBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AllergyProblemActTemplateId AllergyProblemActEffectiveTimeLow AllergyProblemActEffectiveTimeHigh AllergyProblemActClassCode AllergyProblemActMoodCode AllergyProblemActId AllergyProblemActCode AllergyProblemActStatusCode AllergyProblemActEffectiveTime AllergyProblemActAllergyObservation AllergyProblemActCDCodeAndCodeSystemValues AllergyProblemActCDCode AllergyProblemActCDCodeSystem' templateId.root='2.16.840.1.113883.10.20.22.4.30' classCode='ACT' moodCode='EVN' constraints.validation.query='AllergyProblemActCDCodeAndCodeSystemValues AllergyProblemActCDCode AllergyProblemActCDCodeSystem'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAllergyProblemActCD constraints.validation.error='AllergyProblemActCDCodeAndCodeSystemValues AllergyProblemActCDCode AllergyProblemActCDCodeSystem'</annotation>
   </Ecore:EClass>
-  <CDA:ConformsTo xmi:id="_px6AoF9xEey5t-mahoHmrg" base_Generalization="_2F5ZERSVEeGGzu7fmW9pXw"/>
-  <Ecore:EClass xmi:id="_px6nsF9xEey5t-mahoHmrg" base_Class="_2EaLUBSVEeGGzu7fmW9pXw">
+  <CDA:ConformsTo xmi:id="_CHPmkH3sEeyivuDeOiJBMg" base_Generalization="_2F5ZERSVEeGGzu7fmW9pXw"/>
+  <Ecore:EClass xmi:id="_CHPmk33sEeyivuDeOiJBMg" base_Class="_2EaLUBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SubstanceOrDeviceAllergyObservationTemplateId AllergyObservationReferenceValue SubstanceOrDeviceAllergyObservationAllergyStatusInversionIndicator SubstanceOrDeviceAllergyObservationReactionInversionIndicator SubstanceOrDeviceAllergyObservationSeverityInversionIndicator AllergyObservationClassCode AllergyObservationMoodCode AllergyObservationId AllergyObservationCode AllergyObservationCodeP AllergyObservationStatusCode AllergyObservationEffectiveTime AllergyObservationValue AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue AllergyObservationParticipantParticipantRolePlayingEntityCodeTerminologyValueSetGroupSRFI AllergyObservationParticipantParticipantRolePlayingEntityClassCode AllergyObservationParticipantParticipantRolePlayingEntityCode AllergyObservationParticipantParticipantRoleClassCode AllergyObservationParticipantParticipantRolePlayingEntity AllergyObservationParticipantTypeCode AllergyObservationParticipantParticipantRole' templateId.root='2.16.840.1.113883.10.20.22.4.7' constraints.validation.warning='AllergyObservationValueOriginalText AllergyObservationOriginalTextReference AllergyObservationOriginalTextReferenceValue AllergyObservationReactionObservation AllergyObservationParticipant AllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText AllergyObservationParticipantParticipantRolePlayingEntityReferenceValue AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference' classCode='OBS' moodCode='EVN' code.code='ASSERTION' code.codeSystem='2.16.840.1.113883.5.4' code.codeSystemName='HL7ActCode' constraints.validation.dependOn.AllergyObservationCode='AllergyObservationCodeP' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.info='AllergyObservationSeverityObservation AllergyObservationAllergyStatusObservation AllergyObservationParticipantParticipantRolePlayingEntityCETranslation' constraints.validation.query='AllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText AllergyObservationParticipantParticipantRolePlayingEntityCETranslation AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue AllergyObservationParticipantParticipantRolePlayingEntityReferenceValue AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference AllergyObservationParticipantParticipantRolePlayingEntityCodeTerminologyValueSetGroupSRFI AllergyObservationParticipantParticipantRolePlayingEntityClassCode AllergyObservationParticipantParticipantRolePlayingEntityCode AllergyObservationParticipantParticipantRoleClassCode AllergyObservationParticipantParticipantRolePlayingEntity AllergyObservationParticipantTypeCode AllergyObservationParticipantParticipantRole'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAllergyObservationParticipant typeCode='CSM' constraints.validation.error='AllergyObservationParticipantTypeCode AllergyObservationParticipantParticipantRole'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAllergyObservationParticipantParticipantRole classCode='MANU' constraints.validation.error='AllergyObservationParticipantParticipantRoleClassCode AllergyObservationParticipantParticipantRolePlayingEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAllergyObservationParticipantParticipantRolePlayingEntity constraints.validation.error='AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue AllergyObservationParticipantParticipantRolePlayingEntityCodeTerminologyValueSetGroupSRFI AllergyObservationParticipantParticipantRolePlayingEntityClassCode AllergyObservationParticipantParticipantRolePlayingEntityCode' constraints.validation.warning='AllergyObservationParticipantParticipantRolePlayingEntityReferenceValue AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference PlayingEntityAllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText' classCode='MMAT' constraints.validation.query='PlayingEntityAllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText PlayingEntityAllergyObservationParticipantParticipantRolePlayingEntityCETranslation' constraints.validation.info='PlayingEntityAllergyObservationParticipantParticipantRolePlayingEntityCETranslation'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAllergyObservationParticipantParticipantRolePlayingEntityCE constraints.validation.warning='AllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText' constraints.validation.info='AllergyObservationParticipantParticipantRolePlayingEntityCETranslation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_pz0FIF9xEey5t-mahoHmrg" base_Class="_2EqqABSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CJK5MX3sEeyivuDeOiJBMg" base_Class="_2EqqABSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AgeObservationTemplateId AgeObservationValueUnits AgeObservationClassCode AgeObservationMoodCode AgeObservationCode AgeObservationCodeP AgeObservationStatusCode AgeObservationStatusCodeP AgeObservationValue' templateId.root='2.16.840.1.113883.10.20.22.4.31' classCode='OBS' moodCode='EVN' code.code='445518008' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' code.displayName='Age At Onset' constraints.validation.dependOn.AgeObservationCode='AgeObservationCodeP' statusCode.code='completed'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_pz9PEl9xEey5t-mahoHmrg" base_Class="_2ExXsBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CJWfYH3sEeyivuDeOiJBMg" base_Class="_2ExXsBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HealthStatusObservationTemplateId HealthStatusObservationHasTextReferenceValue HealthStatusObservationClassCode HealthStatusObservationMoodCode HealthStatusObservationCode HealthStatusObservationStatusCode HealthStatusObservationValue HealthStatusObservationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.5' constraints.validation.warning='HealthStatusObservationHasTextReference HealthStatusObservationTextReferenceValue HealthStatusObservationText' classCode='OBS' moodCode='EVN' code.code='11323-3' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Health status' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_p1YycF9xEey5t-mahoHmrg" base_Class="_2E_aIRSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CKXzEH3sEeyivuDeOiJBMg" base_Class="_2E_aIRSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ReactionObservationTemplateId ReactionObservationReferenceValue ReactionObservationSeverityObservationInversionInd ReactionObservationProcedureActivityProcedureInversionInd ReactionObservationMedicationActivityInversionInd ReactionObservationClassCode ReactionObservationMoodCode ReactionObservationId ReactionObservationCode ReactionObservationStatusCode ReactionObservationValue ReactionObservationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.9' constraints.validation.warning='ReactionObservationTextReference ReactionObservationTextReferenceValue ReactionObservationEffectiveTimeLow ReactionObservationEffectiveTimeHigh ReactionObservationText ReactionObservationEffectiveTime ReactionObservationSeverityObservation' classCode='OBS' moodCode='EVN' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.info='ReactionObservationProcedureActivityProcedure ReactionObservationMedicationActivity'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_p2nhgF9xEey5t-mahoHmrg" base_Class="_2FGu4hSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CLoXUn3sEeyivuDeOiJBMg" base_Class="_2FGu4hSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SeverityObservationTemplateId SeverityObservationReferenceValue SeverityObservationClassCode SeverityObservationMoodCode SeverityObservationCode SeverityObservationStatusCode SeverityObservationValue SeverityObservationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.8' constraints.validation.warning='SeverityObservationTextReference SeverityObservationTextReferenceValue SeverityObservationText' classCode='OBS' moodCode='EVN' code.code='SEV' code.codeSystem='2.16.840.1.113883.5.4' code.codeSystemName='HL7ActCode' code.displayName='Severity observation' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_p4V_0F9xEey5t-mahoHmrg" base_Class="_2FRuAhSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CNIzMH3sEeyivuDeOiJBMg" base_Class="_2FRuAhSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AllergyStatusObservationTemplateId AllergyStatusObservationClassCode AllergyStatusObservationMoodCode AllergyStatusObservationCode AllergyStatusObservationStatusCode AllergyStatusObservationValue' templateId.root='2.16.840.1.113883.10.20.22.4.28' classCode='OBS' moodCode='EVN' code.code='33999-4' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Status' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_p5BVQF9xEey5t-mahoHmrg" base_Class="_2FhloBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CNuCAn3sEeyivuDeOiJBMg" base_Class="_2FhloBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='CommentActivityTemplateId CommentActivityTextReference CommentActivityTextReferenceValue CommentActivityReferenceValue CommentActivityClassCode CommentActivityMoodCode CommentActivityCode CommentActivityText' templateId.root='2.16.840.1.113883.10.20.22.4.64' classCode='ACT' moodCode='EVN' code.code='48767-8' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Annotation comment' constraints.validation.warning='CommentActivityAuthorParticipation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_p5pnYl9xEey5t-mahoHmrg" base_Class="_2GHbgBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_COQ0kX3sEeyivuDeOiJBMg" base_Class="_2GHbgBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicationActivityTemplateId MedicationActivityTextReferenceValue MedicationActivityEffectiveTimeIVLTSorTS MedicationActivityEffectiveTimeIVLTSLow MedicationActivityEffectiveTimeIVLTSHigh MedicationActivityEffectiveTimeTSValue MedicationActivityEffectiveTimeOperator MedicationActivityDrugVehicleTypeCode MedicationActivityInstructionsInversionInd MedicationActivityRateQuantityUnit MedicationActivityClassCode MedicationActivityMoodCode MedicationActivityId MedicationActivityStatusCode MedicationActivityRouteCode MedicationActivityApproachSiteCode MedicationActivityAdministrationUnitCode MedicationActivityConsumable MedicationActivityConsumableMedicationInformation MedicationActivityPreconditionTypeCode MedicationActivityPreconditionPreconditionForSubstanceAdministration' templateId.root='2.16.840.1.113883.10.20.22.4.16' constraints.validation.warning='MedicationActivityDoseQuantityorrateQuantity MedicationActivityTextReference MedicationActivityReferenceValue MedicationActivityEffectiveTimePIVLTS MedicationActivityDoseQuantityUnit MedicationActivityDoseQuantity MedicationActivityText' classCode='SBADM' constraints.validation.info='MedicationActivityCode MedicationActivityRouteCodeP MedicationActivityApproachSiteCodeP MedicationActivityRateQuantity MedicationActivityMaxDoseQuantity MedicationActivityAdministrationUnitCodeP MedicationActivityRepeatNumber MedicationActivityMedicationSupplyOrder MedicationActivityReactionObservation MedicationActivityPerformer MedicationActivityInstructions MedicationActivityIndication MedicationActivityMedicationDispense MedicationActivityDrugVehicle MedicationActivityPrecondition' routeCode.codeSystem='2.16.840.1.113883.3.26.1.1' routeCode.codeSystemName='NCI Thesaurus' constraints.validation.dependOn.MedicationActivityRouteCode='MedicationActivityRouteCodeP' approachSiteCode.codeSystem='2.16.840.1.113883.6.96' approachSiteCode.codeSystemName='SNOMEDCT' administrationUnitCode.codeSystem='2.16.840.1.113883.3.26.1.1' administrationUnitCode.codeSystemName='NCI Thesaurus' constraints.validation.dependOn.MedicationActivityAdministrationUnitCode='MedicationActivityAdministrationUnitCodeP' constraints.validation.query='MedicationActivityConsumableMedicationInformation MedicationActivityPreconditionTypeCode MedicationActivityPreconditionPreconditionForSubstanceAdministration'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMedicationActivityConsumable constraints.validation.error='MedicationActivityConsumableMedicationInformation'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMedicationActivityPrecondition typeCode='PRCN' constraints.validation.error='MedicationActivityPreconditionTypeCode MedicationActivityPreconditionPreconditionForSubstanceAdministration'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_p_phsl9xEey5t-mahoHmrg" base_Class="_2G2bUxSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CTGRQn3sEeyivuDeOiJBMg" base_Class="_2G2bUxSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProductInstanceTemplateId ProductInstanceClassCode ProductInstanceId ProductInstanceScopingEntity ProductInstancePlayingDevice ProductInstanceScopingEntityId' templateId.root='2.16.840.1.113883.10.20.22.4.37' classCode='MANU' constraints.validation.query='ProductInstanceScopingEntityId ProductInstancePlayingDeviceCode' constraints.validation.warning='ProductInstancePlayingDeviceCode'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProductInstanceScopingEntity constraints.validation.error='ProductInstanceScopingEntityId'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProductInstancePlayingDevice constraints.validation.warning='ProductInstancePlayingDeviceCode'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_p_w2cl9xEey5t-mahoHmrg" base_Class="_2G8h9RSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CTMX433sEeyivuDeOiJBMg" base_Class="_2G8h9RSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='InstructionsTemplateId InstructionsTextReferenceValue InstructionsClassCode InstructionsMoodCode InstructionsCodeP InstructionsStatusCode' templateId.root='2.16.840.1.113883.10.20.22.4.20' constraints.validation.warning='InstructionsTextReference InstructionsReferenceValue InstructionsCode InstructionsText' classCode='ACT' moodCode='INT' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' constraints.validation.dependOn.InstructionsCode='InstructionsCodeP' statusCode.code='completed'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qBc4gF9xEey5t-mahoHmrg" base_Class="_2HIvMBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CUuB4H3sEeyivuDeOiJBMg" base_Class="_2HIvMBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='NonMedicinalSupplyActivityTemplateId NonMedicinalSupplyActivityProductInstanceTypeCode NonMedicinalSupplyActivityClassCode NonMedicinalSupplyActivityMoodCode NonMedicinalSupplyActivityId NonMedicinalSupplyActivityStatusCode NonMedicinalSupplyActivityProductInstance' templateId.root='2.16.840.1.113883.10.20.22.4.50' constraints.validation.warning='NonMedicinalSupplyActivityEffectiveTimeHigh NonMedicinalSupplyActivityEffectiveTime NonMedicinalSupplyActivityQuantity' classCode='SPLY'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qCpLUF9xEey5t-mahoHmrg" base_Class="_2H6yUBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CVrrNH3sEeyivuDeOiJBMg" base_Class="_2H6yUBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProblemConcernActTemplateId ProblemConcernActEffectiveTimeLow ProblemConcernActClassCode ProblemConcernActMoodCode ProblemConcernActId ProblemConcernActCode ProblemConcernActCodeP ProblemConcernActStatusCode ProblemConcernActEffectiveTime ProblemConcernActProblemObservation' templateId.root='2.16.840.1.113883.10.20.22.4.3' constraints.validation.warning='ProblemConcernActEffectiveTimeHigh' classCode='ACT' moodCode='EVN' code.code='CONC' code.codeSystem='2.16.840.1.113883.5.6' code.codeSystemName='HL7ActClass' code.displayName='Concern' constraints.validation.dependOn.ProblemConcernActCode='ProblemConcernActCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qDXkEF9xEey5t-mahoHmrg" base_Class="_2IJb0BSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CWPr4H3sEeyivuDeOiJBMg" base_Class="_2IJb0BSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='GeneralHeaderConstraintsTemplateId ContinuityOfCareDocumentCode ContinuityOfCareDocumentCodeP ContinuityOfCareDocumentLanguageCode ContinuityOfCareDocumentDocumentationOf ContinuityOfCareDocumentAuthor ContinuityOfCareDocumentAllergiesSection ContinuityOfCareDocumentMedicationsSection ContinuityOfCareDocumentProblemSection ContinuityOfCareDocumentProceduresSection ContinuityOfCareDocumentResultsSection ContinuityOfCareDocumentDocumentationOfServiceEventEffectiveTimeHigh ContinuityOfCareDocumentDocumentationOfServiceEventEffectiveTimeLow ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntityId ContinuityOfCareDocumentDocumentationOfServiceEventPerformerTypeCode ContinuityOfCareDocumentDocumentationOfServiceEventClassCode ContinuityOfCareDocumentDocumentationOfServiceEventEffectiveTime ContinuityOfCareDocumentDocumentationOfServiceEvent ContinuityOfCareDocumentAuthorAssignedAuthorHasAssignedPersonOrRepresentedOrganization ContinuityOfCareDocumentAuthorAssignedAuthorHasRepresentOrganization ContinuityOfCareDocumentAuthorAssignedAuthor' templateId.root='2.16.840.1.113883.10.20.22.1.2' code.code='34133-9' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Summarization of Episode Note' constraints.validation.dependOn.ContinuityOfCareDocumentCode='ContinuityOfCareDocumentCodeP' constraints.validation.info='ContinuityOfCareDocumentAdvanceDirectivesSection ContinuityOfCareDocumentEncountersSection ContinuityOfCareDocumentFamilyHistorySection ContinuityOfCareDocumentFunctionalStatusSection ContinuityOfCareDocumentImmunizationsSectionEntriesOptional ContinuityOfCareDocumentMedicalEquipmentSection ContinuityOfCareDocumentPayersSection ContinuityOfCareDocumentPlanOfCareSection ContinuityOfCareDocumentSocialHistorySection ContinuityOfCareDocumentVitalSignsSectionEntriesOptional ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntityCode ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntity' constraints.validation.query='ContinuityOfCareDocumentDocumentationOfServiceEventEffectiveTimeHigh ContinuityOfCareDocumentDocumentationOfServiceEventEffectiveTimeLow ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntityHasNationalProviderIdentifier ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntityCode ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntityId ContinuityOfCareDocumentDocumentationOfServiceEventPerformerTypeCode ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntity ContinuityOfCareDocumentDocumentationOfServiceEventClassCode ContinuityOfCareDocumentDocumentationOfServiceEventEffectiveTime ContinuityOfCareDocumentDocumentationOfServiceEventPerformer ContinuityOfCareDocumentDocumentationOfServiceEvent ContinuityOfCareDocumentAuthorAssignedAuthorHasAssignedPersonOrRepresentedOrganization ContinuityOfCareDocumentAuthorAssignedAuthorHasRepresentOrganization ContinuityOfCareDocumentAuthorAssignedAuthor' constraints.validation.warning='ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntityHasNationalProviderIdentifier ContinuityOfCareDocumentDocumentationOfServiceEventPerformer'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolContinuityOfCareDocumentDocumentationOf constraints.validation.error='ContinuityOfCareDocumentDocumentationOfServiceEvent'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolContinuityOfCareDocumentDocumentationOfServiceEvent classCode='PCPR' constraints.validation.error='ContinuityOfCareDocumentDocumentationOfServiceEventClassCode ContinuityOfCareDocumentDocumentationOfServiceEventEffectiveTime ContinuityOfCareDocumentDocumentationOfServiceEventEffectiveTimeHigh ContinuityOfCareDocumentDocumentationOfServiceEventEffectiveTimeLow ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntityId ContinuityOfCareDocumentDocumentationOfServiceEventPerformerTypeCode' constraints.validation.warning='ContinuityOfCareDocumentDocumentationOfServiceEventPerformer ServiceEventPerformerContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntityHasNationalProviderIdentifier' constraints.validation.query='ContinuityOfCareDocumentDocumentationOfServiceEventEffectiveTimeHigh ContinuityOfCareDocumentDocumentationOfServiceEventEffectiveTimeLow ServiceEventPerformerContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntityHasNationalProviderIdentifier ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntityCode ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntityId ContinuityOfCareDocumentDocumentationOfServiceEventPerformerTypeCode ServiceEventContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntity' constraints.validation.info='ContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntityCode ServiceEventContinuityOfCareDocumentDocumentationOfServiceEventPerformerAssignedEntity'</annotation>
@@ -46458,45 +46458,45 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolContinuityOfCareDocumentAuthor constraints.validation.error='ContinuityOfCareDocumentAuthorAssignedAuthor'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolContinuityOfCareDocumentAuthorAssignedAuthor constraints.validation.error='ContinuityOfCareDocumentAuthorAssignedAuthorHasAssignedPersonOrRepresentedOrganization ContinuityOfCareDocumentAuthorAssignedAuthorHasRepresentOrganization'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qEWbgl9xEey5t-mahoHmrg" base_Class="_2IWQIxSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CW7BUn3sEeyivuDeOiJBMg" base_Class="_2IWQIxSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='FamilyHistorySectionTemplateId FamilyHistorySectionCode FamilyHistorySectionCodeP FamilyHistorySectionTitle FamilyHistorySectionText' templateId.root='2.16.840.1.113883.10.20.22.2.15' code.code='10157-6' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Family History' constraints.validation.info='FamilyHistorySectionFamilyHistory'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qFBw8F9xEey5t-mahoHmrg" base_Class="_2IbIoBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CXfCAX3sEeyivuDeOiJBMg" base_Class="_2IbIoBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='FamilyHistoryOrganizerTemplateId FamilyHistoryOrganizerClassCode FamilyHistoryOrganizerMoodCode FamilyHistoryOrganizerStatusCode FamilyHistoryOrganizerStatusCodeP FamilyHistoryOrganizerFamilyHistoryObservation FamilyHistoryOrganizerSubject FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonAdministrativeGenderCode FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonAdministrativeGenderCodeP FamilyHistoryOrganizerSubjectRelatedSubjectClassCode FamilyHistoryOrganizerSubjectRelatedSubjectCodeP FamilyHistoryOrganizerSubjectRelatedSubject' templateId.root='2.16.840.1.113883.10.20.22.4.45' classCode='CLUSTER' moodCode='EVN' statusCode.code='completed' constraints.validation.dependOn.FamilyHistoryOrganizerStatusCode='FamilyHistoryOrganizerStatusCodeP' constraints.validation.query='FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonAdministrativeGenderCode FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonAdministrativeGenderCodeP FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonBirthTime FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonSDTCDeceasedInd FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonSDTCDeceasedTime FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonSDTCId FamilyHistoryOrganizerSubjectRelatedSubjectClassCode FamilyHistoryOrganizerSubjectRelatedSubjectCode FamilyHistoryOrganizerSubjectRelatedSubjectCodeP FamilyHistoryOrganizerSubjectRelatedSubjectSubject FamilyHistoryOrganizerSubjectRelatedSubject' constraints.validation.warning='FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonBirthTime FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonSDTCId FamilyHistoryOrganizerSubjectRelatedSubjectCode FamilyHistoryOrganizerSubjectRelatedSubjectSubject' constraints.validation.info='FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonSDTCDeceasedInd FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonSDTCDeceasedTime'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolFamilyHistoryOrganizerSubject constraints.validation.error='FamilyHistoryOrganizerSubjectRelatedSubject'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolFamilyHistoryOrganizerSubjectRelatedSubject classCode='PRS' constraints.validation.error='FamilyHistoryOrganizerSubjectRelatedSubjectClassCode FamilyHistoryOrganizerSubjectRelatedSubjectCodeP' code.codeSystem='2.16.840.1.113883.5.111' code.codeSystemName='RoleCode' constraints.validation.warning='FamilyHistoryOrganizerSubjectRelatedSubjectCode FamilyHistoryOrganizerSubjectRelatedSubjectSubject'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolFamilyHistoryOrganizerSubjectRelatedSubjectSubjectPerson administrativeGenderCode.codeSystem='2.16.840.1.113883.5.1' administrativeGenderCode.codeSystemName='AdministrativeGenderCode' constraints.validation.error='FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonAdministrativeGenderCode FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonAdministrativeGenderCodeP' constraints.validation.warning='FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonBirthTime FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonSDTCId' constraints.validation.info='FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonSDTCDeceasedInd FamilyHistoryOrganizerSubjectRelatedSubjectSubjectPersonSDTCDeceasedTime'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qHxi8F9xEey5t-mahoHmrg" base_Class="_2IpyIxSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CZ1ycH3sEeyivuDeOiJBMg" base_Class="_2IpyIxSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='FamilyHistoryObservationTemplateId FamilyHistoryObservationAgeObservationInversion FamilyHistoryObservationClassCode FamilyHistoryObservationMoodCode FamilyHistoryObservationId FamilyHistoryObservationCodeP FamilyHistoryObservationStatusCode FamilyHistoryObservationStatusCodeP FamilyHistoryObservationValue' templateId.root='2.16.840.1.113883.10.20.22.4.46' classCode='OBS' moodCode='EVN' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' constraints.validation.warning='FamilyHistoryObservationCode FamilyHistoryObservationEffectiveTime' constraints.validation.dependOn.FamilyHistoryObservationCode='FamilyHistoryObservationCodeP' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.info='FamilyHistoryObservationAgeObservation FamilyHistoryObservationFamilyHistoryDeathObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qLSJ8F9xEey5t-mahoHmrg" base_Class="_2JKvgBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CcI4gX3sEeyivuDeOiJBMg" base_Class="_2JKvgBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SocialHistorySectionTemplateId SocialHistorySectionCode SocialHistorySectionCodeP SocialHistorySectionTitle SocialHistorySectionText' templateId.root='2.16.840.1.113883.10.20.22.2.17' code.code='29762-2' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Social history' constraints.validation.info='SocialHistorySectionSocialHistoryObservation SocialHistorySectionPregnancyObservation SocialHistorySectionTobaccoUse' constraints.validation.warning='SocialHistorySectionSmokingStatusObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qL5N8F9xEey5t-mahoHmrg" base_Class="_2JOZ4BSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CcsSIH3sEeyivuDeOiJBMg" base_Class="_2JOZ4BSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SocialHistoryObservationTemplateId SocialHistoryObservationReferenceValue SocialHistoryObservationClassCode SocialHistoryObservationMoodCode SocialHistoryObservationId SocialHistoryObservationStatusCode' templateId.root='2.16.840.1.113883.10.20.22.4.38' constraints.validation.warning='SocialHistoryObservationOriginalText SocialHistoryObservationReference SocialHistoryObservationCode SocialHistoryObservationCodeP SocialHistoryObservationValue' classCode='OBS' moodCode='EVN' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' constraints.validation.dependOn.SocialHistoryObservationCode='SocialHistoryObservationCodeP' statusCode.code='completed'</annotation>
   </Ecore:EClass>
-  <CDA:ConformsTo xmi:id="_qNESoF9xEey5t-mahoHmrg" base_Generalization="_ksO6UBVgEeGQCvUGzi1kDQ"/>
-  <Ecore:EClass xmi:id="_qNE5sV9xEey5t-mahoHmrg" base_Class="_2Js7AxSVEeGGzu7fmW9pXw">
+  <CDA:ConformsTo xmi:id="_CdotUH3sEeyivuDeOiJBMg" base_Generalization="_ksO6UBVgEeGQCvUGzi1kDQ"/>
+  <Ecore:EClass xmi:id="_CdpUYH3sEeyivuDeOiJBMg" base_Class="_2Js7AxSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ResultsSectionEntriesOptionalTemplateId ResultsSectionEntriesOptionalCode ResultsSectionEntriesOptionalCodeP ResultsSectionEntriesOptionalTitle ResultsSectionText ResultsSectionResultOrganizer' templateId.root='2.16.840.1.113883.10.20.22.2.3.1' constraints.validation.dependOn.ResultsSectionEntriesOptionalCode='ResultsSectionEntriesOptionalCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qNMOcF9xEey5t-mahoHmrg" base_Class="_2JxzgBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_Cduz8H3sEeyivuDeOiJBMg" base_Class="_2JxzgBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ResultOrganizerTemplateId ResultOrganizerClassCode ResultOrganizerMoodCode ResultOrganizerId ResultOrganizerStatusCode ResultOrganizerStatusCodeP ResultOrganizerCode ResultOrganizerResultObservation' templateId.root='2.16.840.1.113883.10.20.22.4.1' constraints.validation.warning='ResultOrganizerCodeValue ResultOrganizerClassCodeValue' moodCode='EVN' constraints.validation.dependOn.ResultOrganizerStatusCode='ResultOrganizerStatusCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qO6Fsl9xEey5t-mahoHmrg" base_Class="_2J1d4BSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CfE3wn3sEeyivuDeOiJBMg" base_Class="_2J1d4BSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ResultObservationTemplateId ResultObservationTextReferenceValue ResultObservationNoObservationRangeCode ResultObservationClassCode ResultObservationMoodCode ResultObservationId ResultObservationCode ResultObservationStatusCode ResultObservationStatusCodeP ResultObservationEffectiveTime ResultObservationValue' templateId.root='2.16.840.1.113883.10.20.22.4.2' constraints.validation.warning='ResultObservationTextReference ResultObservationReferenceValue ResultObservationCodeValue ResultObservationText ResultObservationInterpretationCode' constraints.validation.info='ResultObservationAuthorMultiplicity ResultObservationMethodCode ResultObservationTargetSiteCode' classCode='OBS' moodCode='EVN'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qQPicF9xEey5t-mahoHmrg" base_Class="_2KEucBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CgHZkH3sEeyivuDeOiJBMg" base_Class="_2KEucBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicalEquipmentSectionTemplateId MedicalEquipmentSectionCode MedicalEquipmentSectionCodeP MedicalEquipmentSectionTitle MedicalEquipmentSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.23' code.code='46264-8' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Medical Equipment' constraints.validation.warning='MedicalEquipmentSectionNonMedicinalSupplyActivity'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qQ5pwl9xEey5t-mahoHmrg" base_Class="_2KKOBhSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CgqzM33sEeyivuDeOiJBMg" base_Class="_2KKOBhSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='FunctionalStatusSectionTemplateId FunctionalStatusSectionCode FunctionalStatusSectionTitle FunctionalStatusSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.14' code.code='47420-5' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Functional status assessment' constraints.validation.info='FunctionalStatusSectionFunctionalStatusResultOrganizer FunctionalStatusSectionCognitiveStatusResultOrganizer FunctionalStatusSectionFunctionalStatusResultObservation FunctionalStatusSectionCognitiveStatusResultObservation FunctionalStatusSectionFunctionalStatusProblemObservation FunctionalStatusSectionCognitiveStatusProblemObservation FunctionalStatusSectionCaregiverCharacteristics FunctionalStatusSectionAssessmentScaleObservation FunctionalStatusSectionNonMedicinalSupplyActivity FunctionalStatusSectionPressureUlcerObservation FunctionalStatusSectionNumberOfPressureUlcersObservation FunctionalStatusSectionHighestPressureUlcerStage'</annotation>
   </Ecore:EClass>
-  <CDA:ConformsTo xmi:id="_qQ_JUF9xEey5t-mahoHmrg" base_Generalization="_8UhPsBVfEeGQCvUGzi1kDQ"/>
-  <Ecore:EClass xmi:id="_qQ_JU19xEey5t-mahoHmrg" base_Class="_2KgzUBSVEeGGzu7fmW9pXw">
+  <CDA:ConformsTo xmi:id="_CgwSwH3sEeyivuDeOiJBMg" base_Generalization="_8UhPsBVfEeGQCvUGzi1kDQ"/>
+  <Ecore:EClass xmi:id="_Cgw50X3sEeyivuDeOiJBMg" base_Class="_2KgzUBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AdvanceDirectivesSectionEntriesOptionalTemplateId AdvanceDirectivesSectionEntriesOptionalCode AdvanceDirectivesSectionEntriesOptionalCodeP AdvanceDirectivesSectionTitle AdvanceDirectivesSectionText AdvanceDirectivesSectionAdvanceDirectiveObservation' templateId.root='2.16.840.1.113883.10.20.22.2.21.1' constraints.validation.dependOn.AdvanceDirectivesSectionEntriesOptionalCode='AdvanceDirectivesSectionEntriesOptionalCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qRm0YV9xEey5t-mahoHmrg" base_Class="_2KlEwBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_ChX90H3sEeyivuDeOiJBMg" base_Class="_2KlEwBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AdvanceDirectiveObservationTemplateId AdvanceDirectiveObservationHasStartingTime AdvanceDirectiveObservationHasEndingTime AdvanceDirectiveObservationClassCode AdvanceDirectiveObservationMoodCode AdvanceDirectiveObservationId AdvanceDirectiveObservationCodeP AdvanceDirectiveObservationStatusCode AdvanceDirectiveObservationEffectiveTime AdvanceDirectiveObservationVerifierTypeCode AdvanceDirectiveObservationVerifierParticipantRole AdvanceDirectiveObservationCustodianCustodianRoleCustodianEntityName AdvanceDirectiveObservationCustodianCustodianRoleClassCode AdvanceDirectiveObservationCustodianCustodianRolePlayingEntity AdvanceDirectiveObservationCustodianTypeCode AdvanceDirectiveObservationCustodianAdvanceDirectiveObservationCustodianRole AdvanceDirectiveObservationReferenceExternalDocumentId AdvanceDirectiveObservationReferenceTypeCode AdvanceDirectiveObservationReferenceExternalDocument' templateId.root='2.16.840.1.113883.10.20.22.4.48' classCode='OBS' moodCode='EVN' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' constraints.validation.warning='AdvanceDirectiveObservationCode AdvanceDirectiveObservationVerifier AdvanceDirectiveObservationCustodian AdvanceDirectiveObservationReference AdvanceDirectiveObservationVerifierTime AdvanceDirectiveObservationCustodianCustodianRoleAddr AdvanceDirectiveObservationCustodianCustodianRoleTelecom' constraints.validation.dependOn.AdvanceDirectiveObservationCode='AdvanceDirectiveObservationCodeP' statusCode.code='completed' constraints.validation.query='AdvanceDirectiveObservationVerifierTime AdvanceDirectiveObservationVerifierTypeCode AdvanceDirectiveObservationVerifierParticipantRole AdvanceDirectiveObservationCustodianCustodianRoleCustodianEntityName AdvanceDirectiveObservationCustodianCustodianRoleAddr AdvanceDirectiveObservationCustodianCustodianRoleClassCode AdvanceDirectiveObservationCustodianCustodianRoleTelecom AdvanceDirectiveObservationCustodianCustodianRolePlayingEntity AdvanceDirectiveObservationCustodianTypeCode AdvanceDirectiveObservationCustodianAdvanceDirectiveObservationCustodianRole AdvanceDirectiveObservationReferenceExternalDocumentTextMediaType AdvanceDirectiveObservationReferenceExternalDocumentTextReference AdvanceDirectiveObservationReferenceExternalDocumentId AdvanceDirectiveObservationReferenceExternalDocumentText AdvanceDirectiveObservationReferenceTypeCode AdvanceDirectiveObservationReferenceExternalDocument' constraints.validation.info='AdvanceDirectiveObservationReferenceExternalDocumentTextMediaType AdvanceDirectiveObservationReferenceExternalDocumentTextReference AdvanceDirectiveObservationReferenceExternalDocumentText'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAdvanceDirectiveObservationReference typeCode='REFR' constraints.validation.error='AdvanceDirectiveObservationReferenceTypeCode AdvanceDirectiveObservationReferenceExternalDocument'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAdvanceDirectiveObservationReferenceExternalDocument constraints.validation.info='AdvanceDirectiveObservationReferenceExternalDocumentTextMediaType AdvanceDirectiveObservationReferenceExternalDocumentTextReference AdvanceDirectiveObservationReferenceExternalDocumentText' constraints.validation.error='AdvanceDirectiveObservationReferenceExternalDocumentId'</annotation>
@@ -46505,70 +46505,70 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAdvanceDirectiveObservationCustodianCustodianRoleCustodianEntity constraints.validation.error='AdvanceDirectiveObservationCustodianCustodianRoleCustodianEntityName'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAdvanceDirectiveObservationVerifier constraints.validation.warning='AdvanceDirectiveObservationVerifierTime' typeCode='VRF' constraints.validation.error='AdvanceDirectiveObservationVerifierTypeCode AdvanceDirectiveObservationVerifierParticipantRole'</annotation>
   </Ecore:EClass>
-  <CDA:ConformsTo xmi:id="_qTBJoF9xEey5t-mahoHmrg" base_Generalization="_EEbhsBVgEeGQCvUGzi1kDQ"/>
-  <Ecore:EClass xmi:id="_qTBwsl9xEey5t-mahoHmrg" base_Class="_2LMIwBSVEeGGzu7fmW9pXw">
+  <CDA:ConformsTo xmi:id="_CizhMH3sEeyivuDeOiJBMg" base_Generalization="_EEbhsBVgEeGQCvUGzi1kDQ"/>
+  <Ecore:EClass xmi:id="_Ci0IQn3sEeyivuDeOiJBMg" base_Class="_2LMIwBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AllergiesSectionEntriesOptionalTemplateId AllergiesSectionEntriesOptionalCode AllergiesSectionEntriesOptionalCodeP AllergiesSectionTitle AllergiesSectionText AllergiesSectionAllergyProblemAct' templateId.root='2.16.840.1.113883.10.20.22.2.6.1' constraints.validation.dependOn.AllergiesSectionEntriesOptionalCode='AllergiesSectionEntriesOptionalCodeP'</annotation>
   </Ecore:EClass>
-  <CDA:ConformsTo xmi:id="_qTpbw19xEey5t-mahoHmrg" base_Generalization="_blmF8BVgEeGQCvUGzi1kDQ"/>
-  <Ecore:EClass xmi:id="_qTqC0F9xEey5t-mahoHmrg" base_Class="_2LSPYBSVEeGGzu7fmW9pXw">
+  <CDA:ConformsTo xmi:id="_CjVFp33sEeyivuDeOiJBMg" base_Generalization="_blmF8BVgEeGQCvUGzi1kDQ"/>
+  <Ecore:EClass xmi:id="_CjVssn3sEeyivuDeOiJBMg" base_Class="_2LSPYBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProblemSectionEntriesOptionalTemplateId ProblemSectionEntriesOptionalCode ProblemSectionEntriesOptionalCodeP ProblemSectionEntriesOptionalText ProblemSectionEntriesOptionalTitle ProblemSectionEntriesOptionalProblemConcern' templateId.root='2.16.840.1.113883.10.20.22.2.5.1' constraints.validation.dependOn.ProblemSectionEntriesOptionalCode='ProblemSectionEntriesOptionalCodeP'</annotation>
   </Ecore:EClass>
-  <CDA:ConformsTo xmi:id="_qTzz0F9xEey5t-mahoHmrg" base_Generalization="_KVkvoBVgEeGQCvUGzi1kDQ"/>
-  <Ecore:EClass xmi:id="_qT0a4F9xEey5t-mahoHmrg" base_Class="_2LWg0BSVEeGGzu7fmW9pXw">
+  <CDA:ConformsTo xmi:id="_CjbMQH3sEeyivuDeOiJBMg" base_Generalization="_KVkvoBVgEeGQCvUGzi1kDQ"/>
+  <Ecore:EClass xmi:id="_CjbzUH3sEeyivuDeOiJBMg" base_Class="_2LWg0BSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='EncountersSectionEntriesOptionalTemplateId EncountersSectionEntriesOptionalCode EncountersSectionEntriesOptionalCodeP EncountersSectionEntriesOptionalText EncountersSectionEntriesOptionalTitle EncountersSectionEncounterActivities' templateId.root='2.16.840.1.113883.10.20.22.2.22.1' constraints.validation.dependOn.EncountersSectionEntriesOptionalCode='EncountersSectionEntriesOptionalCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qT89wF9xEey5t-mahoHmrg" base_Class="_2LayQBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CjhS4H3sEeyivuDeOiJBMg" base_Class="_2LayQBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='EncounterActivitiesTemplateId EncounterActivitiesCodeOriginalTextReferenceValue EncounterActivitiesSdtcDDCFromNUBCOrDD EncounterActivitiesClassCode EncounterActivitiesMoodCode EncounterActivitiesId EncounterActivitiesEffectiveTime EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntity' templateId.root='2.16.840.1.113883.10.20.22.4.49' constraints.validation.warning='EncounterActivitiesCodeOriginalText EncounterActivitiesCodeOriginalTextReference EncounterActivitiesReferenceValue EncounterActivitiesServiceDeliveryTypeCode EncounterActivitiesCode' classCode='ENC' moodCode='EVN' code.codeSystem='2.16.840.1.113883.6.12' code.codeSystemName='CPT-4' constraints.validation.info='EncounterActivitiesSDTCDischargeDispositionCode EncounterActivitiesServiceDeliveryLocation EncounterActivitiesIndication EncounterActivitiesEncounterPerformer EncounterActivitiesEncounterDiagnosis EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCode' constraints.validation.query='EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCode EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolEncounterActivitiesEncounterPerformer constraints.validation.error='EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolEncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntity constraints.validation.info='EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCode'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qVf14F9xEey5t-mahoHmrg" base_Class="_2LiHABSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CkimkH3sEeyivuDeOiJBMg" base_Class="_2LiHABSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ServiceDeliveryLocationTemplateId ServiceDeliveryLocationHasPlayingEntityClassCode ServiceDeliveryLocationClassCode ServiceDeliveryLocationCode' templateId.root='2.16.840.1.113883.10.20.22.4.32' constraints.validation.info='ServiceDeliveryLocationHasPlayingEntity ServiceDeliveryLocationHasPlayingEntityName' classCode='SDLOC' code.codeSystem='2.16.840.1.113883.6.259' code.codeSystemName='HealthcareServiceLocation' constraints.validation.warning='ServiceDeliveryLocationAddr ServiceDeliveryLocationTelecom'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qWLLUl9xEey5t-mahoHmrg" base_Class="_2L7voBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_ClCV0H3sEeyivuDeOiJBMg" base_Class="_2L7voBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ImmunizationsSectionEntriesOptionalTemplateId ImmunizationsSectionEntriesOptionalCode ImmunizationsSectionEntriesOptionalCodeP ImmunizationsSectionTitle ImmunizationsSectionText ImmunizationsSectionImmunization' templateId.root='2.16.840.1.113883.10.20.22.2.2.1' constraints.validation.dependOn.ImmunizationsSectionEntriesOptionalCode='ImmunizationsSectionEntriesOptionalCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qW-ckF9xEey5t-mahoHmrg" base_Class="_2MAoIBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_ClmWgH3sEeyivuDeOiJBMg" base_Class="_2MAoIBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ImmunizationActivityTemplateId ImmunizationActivityTextReferenceValue ImmunizationActivityInstructionInversion ImmunizationActivityDrugVehicleTypeCode ImmunizationActivityClassCode ImmunizationActivityMoodCode ImmunizationActivityNegationInd ImmunizationActivityId ImmunizationActivityStatusCode ImmunizationActivityEffectiveTime ImmunizationActivityRouteCode ImmunizationActivityApproachSiteCode ImmunizationActivityAdministrationUnitCode ImmunizationActivityConsumable ImmunizationActivityConsumableImmunizationMedicationInformation ImmunizationActivityPreconditionTypeCode ImmunizationActivityPreconditionPreconditionForSubstanceAdministration' templateId.root='2.16.840.1.113883.10.20.22.4.52' constraints.validation.warning='ImmunizationActivityTextReference ImmunizationActivityReferenceValue ImmunizationActivityDoseQuantityUnit ImmunizationActivityText ImmunizationActivityDoseQuantity ImmunizationActivityPerformer' classCode='SBADM' constraints.validation.info='ImmunizationActivityCode ImmunizationActivityRepeatNumber ImmunizationActivityRouteCodeP ImmunizationActivityApproachSiteCodeP ImmunizationActivityAdministrationUnitCodeP ImmunizationActivityDrugVehicle ImmunizationActivityIndication ImmunizationActivityInstructions ImmunizationActivityMedicationDispense ImmunizationActivityReactionObservation ImmunizationActivityImmunizationRefusalReason ImmunizationActivityMedicationSupplyOrder ImmunizationActivityPrecondition' routeCode.codeSystem='2.16.840.1.113883.3.26.1.1' routeCode.codeSystemName='NCI Thesaurus' constraints.validation.dependOn.ImmunizationActivityRouteCode='ImmunizationActivityRouteCodeP' approachSiteCode.codeSystem='2.16.840.1.113883.6.96' approachSiteCode.codeSystemName='SNOMEDCT' administrationUnitCode.codeSystem='2.16.840.1.113883.3.26.1.1' administrationUnitCode.codeSystemName='NCI Thesaurus' constraints.validation.dependOn.ImmunizationActivityAdministrationUnitCode='ImmunizationActivityAdministrationUnitCodeP' constraints.validation.query='ImmunizationActivityConsumableImmunizationMedicationInformation ImmunizationActivityPreconditionTypeCode ImmunizationActivityPreconditionPreconditionForSubstanceAdministration'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolImmunizationActivityConsumable constraints.validation.error='ImmunizationActivityConsumableImmunizationMedicationInformation'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolImmunizationActivityPrecondition typeCode='PRCN' constraints.validation.error='ImmunizationActivityPreconditionTypeCode ImmunizationActivityPreconditionPreconditionForSubstanceAdministration'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qbB2IF9xEey5t-mahoHmrg" base_Class="_2MV_UBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_Cow_QH3sEeyivuDeOiJBMg" base_Class="_2MV_UBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PayersSectionTemplateId PayersSectionCode PayersSectionCodeP PayersSectionTitle PayersSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.18' code.code='48768-6' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Payers' constraints.validation.warning='PayersSectionCoverageActivity'</annotation>
   </Ecore:EClass>
-  <CDA:ConformsTo xmi:id="_qbIj0F9xEey5t-mahoHmrg" base_Generalization="_UeEpoBVgEeGQCvUGzi1kDQ"/>
-  <Ecore:EClass xmi:id="_qbJK4F9xEey5t-mahoHmrg" base_Class="_2NIpgBSVEeGGzu7fmW9pXw">
+  <CDA:ConformsTo xmi:id="_Co13wH3sEeyivuDeOiJBMg" base_Generalization="_UeEpoBVgEeGQCvUGzi1kDQ"/>
+  <Ecore:EClass xmi:id="_Co2e0H3sEeyivuDeOiJBMg" base_Class="_2NIpgBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicationsSectionEntriesOptionalTemplateId MedicationsSectionEntriesOptionalCode MedicationsSectionEntriesOptionalCodeP MedicationsSectionTitle MedicationsSectionText MedicationsSectionMedication' templateId.root='2.16.840.1.113883.10.20.22.2.1.1' constraints.validation.dependOn.MedicationsSectionEntriesOptionalCode='MedicationsSectionEntriesOptionalCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qbyEE19xEey5t-mahoHmrg" base_Class="_2NP-QxSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CpVnAH3sEeyivuDeOiJBMg" base_Class="_2NP-QxSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlanOfCareSectionTemplateId PlanOfCareSectionCode PlanOfCareSectionCodeP PlanOfCareSectionTitle PlanOfCareSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.10' code.code='18776-5' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Treatment plan' constraints.validation.info='PlanOfCareSectionPlanOfCareActivityAct PlanOfCareSectionPlanOfCareActivityEncounter PlanOfCareSectionPlanOfCareActivityObservation PlanOfCareSectionPlanOfCareActivityProcedure PlanOfCareSectionPlanOfCareActivitySubstanceAdministration PlanOfCareSectionPlanOfCareActivitySupply PlanOfCareSectionInstructions'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qb5Y0F9xEey5t-mahoHmrg" base_Class="_2NWE5xSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CpbtoH3sEeyivuDeOiJBMg" base_Class="_2NWE5xSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlanOfCareActivityActTemplateId PlanOfCareActivityActClassCode PlanOfCareActivityActMoodCode PlanOfCareActivityActId' templateId.root='2.16.840.1.113883.10.20.22.4.39' classCode='ACT'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qdTHAV9xEey5t-mahoHmrg" base_Class="_2NWFBBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CqjH8H3sEeyivuDeOiJBMg" base_Class="_2NWFBBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlanOfCareActivityEncounterTemplateId PlanOfCareActivityEncounterClassCode PlanOfCareActivityEncounterMoodCode PlanOfCareActivityEncounterId' templateId.root='2.16.840.1.113883.10.20.22.4.40' classCode='ENC'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qeTzoF9xEey5t-mahoHmrg" base_Class="_2NcLjhSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CrxP8H3sEeyivuDeOiJBMg" base_Class="_2NcLjhSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlanOfCareActivityObservationTemplateId PlanOfCareActivityObservationClassCode PlanOfCareActivityObservationMoodCode PlanOfCareActivityObservationId' templateId.root='2.16.840.1.113883.10.20.22.4.44' classCode='OBS'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qfXjkF9xEey5t-mahoHmrg" base_Class="_2NiSKhSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CstEEH3sEeyivuDeOiJBMg" base_Class="_2NiSKhSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlanOfCareActivityProcedureTemplateId PlanOfCareActivityProcedureClassCode PlanOfCareActivityProcedureMoodCode PlanOfCareActivityProcedureId' templateId.root='2.16.840.1.113883.10.20.22.4.41' classCode='PROC'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qgdvwF9xEey5t-mahoHmrg" base_Class="_2NoYwxSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CtnqF33sEeyivuDeOiJBMg" base_Class="_2NoYwxSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlanOfCareActivitySubstanceAdministrationTemplateId PlanOfCareActivitySubstanceAdministrationClassCode PlanOfCareActivitySubstanceAdministrationMoodCode PlanOfCareActivitySubstanceAdministrationId' templateId.root='2.16.840.1.113883.10.20.22.4.42' classCode='SBADM'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qhlKEV9xEey5t-mahoHmrg" base_Class="_2NoY5BSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CuksV33sEeyivuDeOiJBMg" base_Class="_2NoY5BSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlanOfCareActivitySupplyTemplateId PlanOfCareActivitySupplyClassCode PlanOfCareActivitySupplyMoodCode PlanOfCareActivitySupplyId' templateId.root='2.16.840.1.113883.10.20.22.4.43' classCode='SPLY'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qiskYF9xEey5t-mahoHmrg" base_Class="_2N6soBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_CvfSUn3sEeyivuDeOiJBMg" base_Class="_2N6soBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PregnancyObservationTemplateId PregnancyObservationClassCode PregnancyObservationMoodCode PregnancyObservationCode PregnancyObservationCodeP PregnancyObservationStatusCode PregnancyObservationValue PregnancyObservationValueP' templateId.root='2.16.840.1.113883.10.20.15.3.8' classCode='OBS' moodCode='EVN' code.code='ASSERTION' code.codeSystem='2.16.840.1.113883.5.4' code.codeSystemName='HL7ActCode' code.displayName='Assertion' constraints.validation.dependOn.PregnancyObservationCode='PregnancyObservationCodeP' statusCode.code='completed' value.code='77386006' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' value.displayName='Pregnant' constraints.validation.warning='PregnancyObservationEffectiveTime' constraints.validation.info='PregnancyObservationEstimatedDateOfDelivery'</annotation>
   </Ecore:EClass>
-  <CDA:ConformsTo xmi:id="_qi4KkF9xEey5t-mahoHmrg" base_Generalization="_gNO_cBVgEeGQCvUGzi1kDQ"/>
-  <Ecore:EClass xmi:id="_qi4xoV9xEey5t-mahoHmrg" base_Class="_2OAzQRSVEeGGzu7fmW9pXw">
+  <CDA:ConformsTo xmi:id="_CvqRcH3sEeyivuDeOiJBMg" base_Generalization="_gNO_cBVgEeGQCvUGzi1kDQ"/>
+  <Ecore:EClass xmi:id="_CvqRc33sEeyivuDeOiJBMg" base_Class="_2OAzQRSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProceduresSectionEntriesOptionalTemplateId ProceduresSectionHasProcedureActivity ProceduresSectionTitle ProceduresSectionEntriesOptionalCode ProceduresSectionEntriesOptionalCodeP ProceduresSectionEntriesOptionalText' templateId.root='2.16.840.1.113883.10.20.22.2.7.1' constraints.validation.dependOn.ProceduresSectionEntriesOptionalCode='ProceduresSectionEntriesOptionalCodeP' constraints.validation.info='ProceduresSectionProcedureActivityProcedure ProceduresSectionProcedureActivityObservation ProceduresSectionProcedureActivityAct'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qjAtcF9xEey5t-mahoHmrg" base_Class="_2OG58RSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_Cvw_IH3sEeyivuDeOiJBMg" base_Class="_2OG58RSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProcedureActivityProcedureTemplateId ProcedureActivityProcedureReferenceValue ProcedureActivityProcedureEncounterInversion ProcedureActivityProcedureProductInstanceTypeCode ProcedureActivityProcedureServiceDeliveryLocationTypeCode ProcedureActivityProcedureInstructionsInversion ProcedureActivityProcedureClassCode ProcedureActivityProcedureMoodCode ProcedureActivityProcedureId ProcedureActivityProcedureCode ProcedureActivityProcedureStatusCode ProcedureActivityProcedurePriorityCode ProcedureActivityProcedureTargetSiteCode ProcedureActivityProcedureProcedureSpecimenSpecimenRole ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityProcedureActivityRepresentedOrganizationTelecom ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityProcedureActivityRepresentedOrganizationAddr ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityId ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityAddr ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityTelecom ProcedureActivityProcedureProcedureActivityPerformerAssignedEntity ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounterClassCode ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounterMoodCode ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounterId ProcedureActivityProcedureEntryRelationshipInversionInd ProcedureActivityProcedureEntryRelationshipTypeCode ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounter' templateId.root='2.16.840.1.113883.10.20.22.4.14' constraints.validation.warning='ProcedureActivityProcedureCodeCodeSystems ProcedureActivityProcedureCodeOriginalText ProcedureActivityProcedureOriginalTextReference ProcedureActivityProcedureOriginalTextReferenceValue ProcedureActivityProcedureEffectiveTime ProcedureActivityProcedureTargetSiteCodeP ProcedureActivityProcedurePerformer ProcedureActivityProcedureProcedureSpecimenSpecimentRoleId ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityProcedureActivityRepresentedOrganizationId ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityRepresentedOrganization' classCode='PROC' priorityCode.codeSystem='2.16.840.1.113883.5.7' priorityCode.codeSystemName='ActPriority' constraints.validation.info='ProcedureActivityProcedurePriorityCodeP ProcedureActivityProcedureMethodCode ProcedureActivityProcedureIndication ProcedureActivityProcedureSpecimen ProcedureActivityProcedureServiceDeliveryLocation ProcedureActivityProcedureMedicationActivity ProcedureActivityProcedurePatientInstruction ProcedureActivityProcedureProductInstance ProcedureActivityProcedureEntryRelationship ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityProcedureActivityRepresentedOrganizationName' constraints.validation.dependOn.ProcedureActivityProcedurePriorityCode='ProcedureActivityProcedurePriorityCodeP' targetSiteCode.codeSystem='2.16.840.1.113883.6.96' targetSiteCode.codeSystemName='SNOMEDCT' constraints.validation.dependOn.ProcedureActivityProcedureTargetSiteCode='ProcedureActivityProcedureTargetSiteCodeP' constraints.validation.query='ProcedureActivityProcedureProcedureSpecimenSpecimenRole ProcedureActivityProcedureProcedureSpecimenSpecimentRoleId ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityProcedureActivityRepresentedOrganizationId ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityProcedureActivityRepresentedOrganizationName ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityProcedureActivityRepresentedOrganizationTelecom ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityProcedureActivityRepresentedOrganizationAddr ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityId ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityAddr ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityTelecom ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityRepresentedOrganization ProcedureActivityProcedureProcedureActivityPerformerAssignedEntity ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounterClassCode ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounterMoodCode ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounterId ProcedureActivityProcedureEntryRelationshipInversionInd ProcedureActivityProcedureEntryRelationshipTypeCode ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounter'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityProcedureProcedureSpecimen constraints.validation.error='ProcedureActivityProcedureProcedureSpecimenSpecimenRole' constraints.validation.warning='ProcedureActivityProcedureProcedureSpecimenSpecimentRoleId'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityProcedureProcedureActivityPerformer constraints.validation.error='ProcedureActivityProcedureProcedureActivityPerformerAssignedEntity'</annotation>
@@ -46577,56 +46577,56 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityProcedureEntryRelationship inversionInd='true' constraints.validation.error='ProcedureActivityProcedureEntryRelationshipInversionInd ProcedureActivityProcedureEntryRelationshipTypeCode ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounter' typeCode='COMP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityProcedureEntryRelationshipProcedureActivityEncounter classCode='ENC' constraints.validation.error='ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounterClassCode ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounterMoodCode ProcedureActivityProcedureEntryRelationshipProcedureActivityEncounterId' moodCode='EVN'</annotation>
   </Ecore:EClass>
-  <CDA:ConformsTo xmi:id="_qpl2kF9xEey5t-mahoHmrg" base_Generalization="_px07IBVgEeGQCvUGzi1kDQ"/>
-  <Ecore:EClass xmi:id="_qpmdoF9xEey5t-mahoHmrg" base_Class="_2OfUcxSVEeGGzu7fmW9pXw">
+  <CDA:ConformsTo xmi:id="_C1nvh33sEeyivuDeOiJBMg" base_Generalization="_px07IBVgEeGQCvUGzi1kDQ"/>
+  <Ecore:EClass xmi:id="_C1oWkn3sEeyivuDeOiJBMg" base_Class="_2OfUcxSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='VitalSignsSectionEntriesOptionalTemplateId VitalSignsSectionEntriesOptionalCode VitalSignsSectionEntriesOptionalCodeP VitalSignsSectionText VitalSignsSectionEntriesOptionalTitle VitalSignsSectionVitalSignsOrganizer' templateId.root='2.16.840.1.113883.10.20.22.2.4.1' constraints.validation.dependOn.VitalSignsSectionEntriesOptionalCode='VitalSignsSectionEntriesOptionalCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qpvAgF9xEey5t-mahoHmrg" base_Class="_2OlbCRSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_C1t2In3sEeyivuDeOiJBMg" base_Class="_2OlbCRSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='VitalSignsOrganizerTemplateId VitalSignsOrganizerClassCode VitalSignsOrganizerMoodCode VitalSignsOrganizerId VitalSignsOrganizerCode VitalSignsOrganizerCodeP VitalSignsOrganizerStatusCode VitalSignsOrganizerStatusCodeP VitalSignsOrganizerEffectiveTime VitalSignsOrganizerVitalSignObservation' templateId.root='2.16.840.1.113883.10.20.22.4.26' classCode='CLUSTER' moodCode='EVN' code.code='46680005' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' code.displayName='Vital signs' statusCode.code='completed' constraints.validation.dependOn.VitalSignsOrganizerStatusCode='VitalSignsOrganizerStatusCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qqU2Z19xEey5t-mahoHmrg" base_Class="_2OrhsRSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_C2UTEn3sEeyivuDeOiJBMg" base_Class="_2OrhsRSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='VitalSignObservationTemplateId VitalSignObservationTextReferenceValue VitalSignObservationClassCode VitalSignObservationMoodCode VitalSignObservationId VitalSignObservationCodeP VitalSignObservationStatusCode VitalSignObservationStatusCodeP VitalSignObservationEffectiveTime VitalSignObservationValue' templateId.root='2.16.840.1.113883.10.20.22.4.27' constraints.validation.warning='VitalSignObservationTextReference VitalSignObservationReferenceValue VitalSignObservationCode VitalSignObservationText' classCode='OBS' moodCode='EVN' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.VitalSignObservationCode='VitalSignObservationCodeP' statusCode.code='completed' constraints.validation.info='VitalSignObservationInterpretationCode VitalSignObservationMethodCode VitalSignObservationTargetSiteCode VitalSignObservationAuthor'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qsFJ4F9xEey5t-mahoHmrg" base_Class="_2PQJcxSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_C34ZUH3sEeyivuDeOiJBMg" base_Class="_2PQJcxSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HistoryOfPastIllnessSectionTemplateId HistoryOfPastIllnessSectionCode HistoryOfPastIllnessSectionCodeP HistoryOfPastIllnessSectionTitle HistoryOfPastIllnessSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.20' code.code='11348-0' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='HISTORY OF PAST ILLNESS' constraints.validation.info='HistoryOfPastIllnessSectionProblemObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qsLQgV9xEey5t-mahoHmrg" base_Class="_2PWQCBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_C39R0n3sEeyivuDeOiJBMg" base_Class="_2PWQCBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ChiefComplaintSectionTemplateId ChiefComplaintSectionCode ChiefComplaintSectionCodeP ChiefComplaintSectionText ChiefComplaintSectionTitle' templateId.root='1.3.6.1.4.1.19376.1.5.3.1.1.13.2.1' code.code='10154-3' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='CHIEF COMPLAINT'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qsR-MF9xEey5t-mahoHmrg" base_Class="_2PWQFxSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_C4CKUn3sEeyivuDeOiJBMg" base_Class="_2PWQFxSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ReasonForReferralSectionTemplateId ReasonForReferralSectionCode ReasonForReferralSectionCodeP ReasonForReferralSectionTitle ReasonForReferralSectionText' templateId.root='1.3.6.1.4.1.19376.1.5.3.1.3.1' code.code='42349-1' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='REASON FOR REFERRAL'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qsYE0F9xEey5t-mahoHmrg" base_Class="_2PcWsRSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_C4HC0H3sEeyivuDeOiJBMg" base_Class="_2PcWsRSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HistoryOfPresentIllnessSectionTemplateId HistoryOfPresentIllnessSectionCode HistoryOfPresentIllnessSectionCodeP HistoryOfPresentIllnessSectionTitle HistoryOfPresentIllnessSectionText' templateId.root='1.3.6.1.4.1.19376.1.5.3.1.3.4' code.code='10164-2' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='HISTORY OF PRESENT ILLNESS'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qseLcl9xEey5t-mahoHmrg" base_Class="_2PidQhSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_C4L7UH3sEeyivuDeOiJBMg" base_Class="_2PidQhSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HospitalAdmissionDiagnosisSectionTemplateId HospitalAdmissionDiagnosisSectionCode HospitalAdmissionDiagnosisSectionCodeP HospitalAdmissionDiagnosisSectionTitle HospitalAdmissionDiagnosisSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.43' code.code='46241-6' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='HOSPITAL ADMISSION DX' constraints.validation.warning='HospitalAdmissionDiagnosisSectionHospitalAdmissionDiagnosis'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qslgMF9xEey5t-mahoHmrg" base_Class="_2Poj5BSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_C4QMwn3sEeyivuDeOiJBMg" base_Class="_2Poj5BSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HospitalAdmissionMedicationsSectionEntriesOptionalTemplateId HospitalAdmissionMedicationsSectionEntriesOptionalCode HospitalAdmissionMedicationsSectionEntriesOptionalCodeP HospitalAdmissionMedicationsSectionEntriesOptionalTitle HospitalAdmissionMedicationsSectionEntriesOptionalText' templateId.root='2.16.840.1.113883.10.20.22.2.44' code.code='42346-7' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='MEDICATIONS ON ADMISSION' constraints.validation.warning='HospitalAdmissionMedicationsSectionEntriesOptionalAdmissionMedication'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qsrm0F9xEey5t-mahoHmrg" base_Class="_2Poj_BSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_C4VFQn3sEeyivuDeOiJBMg" base_Class="_2Poj_BSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicationsAdministeredSectionTemplateId MedicationsAdministeredSectionCode MedicationsAdministeredSectionCodeP MedicationsAdministeredSectionTitle MedicationsAdministeredSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.38' code.code='29549-3' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Medications Administered' constraints.validation.info='MedicationsAdministeredSectionMedicationActivity'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qsyUgF9xEey5t-mahoHmrg" base_Class="_2Pxt0hSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_C4Z9wn3sEeyivuDeOiJBMg" base_Class="_2Pxt0hSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PhysicalExamSectionTemplateId PhysicalExamSectionCode PhysicalExamSectionCodeP PhysicalExamSectionTitle PhysicalExamSectionText' templateId.root='2.16.840.1.113883.10.20.2.10' code.code='29545-1' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='PHYSICAL EXAMINATION' constraints.validation.info='PhysicalExamSectionPressureUlcerObservation PhysicalExamSectionNumberOfPressureUlcersObservation PhysicalExamSectionHighestPressureUlcerStage'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qs4bIl9xEey5t-mahoHmrg" base_Class="_2Pxt6xSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_C4gEYH3sEeyivuDeOiJBMg" base_Class="_2Pxt6xSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='GeneralStatusSectionTemplateId GeneralStatusSectionCode GeneralStatusSectionCodeP GeneralStatusSectionTitle GeneralStatusSectionText' templateId.root='2.16.840.1.113883.10.20.2.5' code.code='10210-3' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='GENERAL STATUS'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qs_I0F9xEey5t-mahoHmrg" base_Class="_2RqkMBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_C4k84n3sEeyivuDeOiJBMg" base_Class="_2RqkMBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ReviewOfSystemsSectionTemplateId ReviewOfSystemsSectionCode ReviewOfSystemsSectionCodeP ReviewOfSystemsSectionTitle ReviewOfSystemsSectionText' templateId.root='1.3.6.1.4.1.19376.1.5.3.1.3.18' code.code='10187-3' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='REVIEW OF SYSTEMS'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qtFPcV9xEey5t-mahoHmrg" base_Class="_2Rwq0BSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_C4p1YX3sEeyivuDeOiJBMg" base_Class="_2Rwq0BSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AssessmentAndPlanSectionTemplateId AssessmentAndPlanSectionCode AssessmentAndPlanSectionCodeP AssessmentAndPlanSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.9' code.code='51847-2' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='ASSESSMENT AND PLAN' constraints.validation.info='AssessmentAndPlanSectionPlanOfCareActivityAct'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qtKH8F9xEey5t-mahoHmrg" base_Class="_2SC-sBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_C4tfwn3sEeyivuDeOiJBMg" base_Class="_2SC-sBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='FamilyHistoryDeathObservationTemplateId FamilyHistoryDeathObservationClassCode FamilyHistoryDeathObservationMoodCode FamilyHistoryDeathObservationCode FamilyHistoryDeathObservationStatusCode FamilyHistoryDeathObservationValue FamilyHistoryDeathObservationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.47' classCode='OBS' moodCode='EVN' code.code='ASSERTION' code.codeSystem='2.16.840.1.113883.5.4' code.codeSystemName='HL7ActCode' code.displayName='Assertion' statusCode.code='completed' value.code='419099009' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' value.displayName='Dead'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qtT48F9xEey5t-mahoHmrg" base_Class="_luQh8DVzEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_C42CoH3sEeyivuDeOiJBMg" base_Class="_luQh8DVzEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SurgicalDrainsSectionTemplateId SurgicalDrainsSectionCode SurgicalDrainsSectionCodeP SurgicalDrainsSectionText SurgicalDrainsSectionTitle' templateId.root='2.16.840.1.113883.10.20.7.13' code.code='11537-8' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Surgical Drains'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qtZ_kF9xEey5t-mahoHmrg" base_Class="_2TeiIRSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_C467IH3sEeyivuDeOiJBMg" base_Class="_2TeiIRSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='GeneralHeaderConstraintsTemplateId UnstructuredDocumentRecordTarget UnstructuredDocumentAuthor UnstructuredDocumentComponent UnstructuredDocumentCustodian UnstructuredDocumentRecordTargetPatientRole2Id UnstructuredDocumentRecordTargetPatientRole2 UnstructuredDocumentAuthorAssignedAuthor2Addr UnstructuredDocumentAuthorAssignedAuthor2Telecom UnstructuredDocumentAuthorAssignedAuthor2 UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationAddr UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationId UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationName UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationTelecom UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganization UnstructuredDocumentCustodianAssignedCustodian2' templateId.root='2.16.840.1.113883.10.20.22.1.10' constraints.validation.query='UnstructuredDocumentRecordTargetPatientRole2Id UnstructuredDocumentRecordTargetPatientRole2 UnstructuredDocumentAuthorAssignedAuthor2Addr UnstructuredDocumentAuthorAssignedAuthor2Telecom UnstructuredDocumentAuthorAssignedAuthor2 UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationAddr UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationId UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationName UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationTelecom UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganization UnstructuredDocumentCustodianAssignedCustodian2'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolUnstructuredDocumentRecordTarget constraints.validation.error='UnstructuredDocumentRecordTargetPatientRole2'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolUnstructuredDocumentRecordTargetPatientRole2 constraints.validation.error='UnstructuredDocumentRecordTargetPatientRole2Id'</annotation>
@@ -46637,32 +46637,32 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolUnstructuredDocumentCustodianAssignedCustodian3CustodianOrganization constraints.validation.error='UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationAddr UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationId UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationName UnstructuredDocumentCustodianAssignedCustodian3CustodianOrganizationTelecom'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolUnstructuredDocumentComponentNonXMLBody constraints.validation.error='UnstructuredDocumentComponentNonXMLBodyHasReferenceOrRepresentation UnstructuredDocumentComponentNonXMLBodyMediaTypeFileFormats UnstructuredDocumentComponentNonXMLBodyText'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_qtmz4l9xEey5t-mahoHmrg" base_Class="_2T9DQBSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_C5EsIX3sEeyivuDeOiJBMg" base_Class="_2T9DQBSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicationInformationTemplateId MedicationInformationClassCode MedicationInformationManufacturedMaterial MedicationInformationMedicationInformationManufacturedMaterialCode' templateId.root='2.16.840.1.113883.10.20.22.4.23' constraints.validation.info='MedicationInformationId MedicationInformationManufacturerOrganization MedicationInformationMedicationInformationManufacturedMaterialCodeTranslation' classCode='MANU' constraints.validation.warning='MedicationInformationMedicationInformationManufacturedMaterialCodeOriginalText MedicationInformationMedicationInformationManufacturedMaterialReference MedicationInformationMedicationInformationManufacturedMaterialOriginalTextReferenceValue' constraints.validation.query='MedicationInformationMedicationInformationManufacturedMaterialCodeOriginalText MedicationInformationMedicationInformationManufacturedMaterialReference MedicationInformationMedicationInformationManufacturedMaterialOriginalTextReferenceValue MedicationInformationMedicationInformationManufacturedMaterialCodeTranslation MedicationInformationMedicationInformationManufacturedMaterialCode'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMedicationInformationMedicationInformationManufacturedMaterial constraints.validation.warning='MedicationInformationMedicationInformationManufacturedMaterialCodeOriginalText MedicationInformationMedicationInformationManufacturedMaterialReference MedicationInformationMedicationInformationManufacturedMaterialOriginalTextReferenceValue' constraints.validation.info='MedicationInformationMedicationInformationManufacturedMaterialCodeTranslation' code.codeSystem='2.16.840.1.113883.6.88' code.codeSystemName='RxNorm' constraints.validation.error='MedicationInformationMedicationInformationManufacturedMaterialCode'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_quJmcl9xEey5t-mahoHmrg" base_Class="_2UnxkRSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_C5j0UH3sEeyivuDeOiJBMg" base_Class="_2UnxkRSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='GeneralHeaderConstraintsTemplateId DischargeSummaryDoesNotHaveChiefComplaintAndReasonForVisitWithChiefComplaintSectionOrReasonSection DischargeSummaryCode DischargeSummaryCodeP DischargeSummaryHospitalDischargeDiagnosisSection DischargeSummaryHospitalDischargeMedicationsSectionEntriesOptional DischargeSummaryHospitalCourseSection DischargeSummaryPlanOfCareSection DischargeSummaryComponentOf DischargeSummaryAllergiesSectionEntriesOptional DischargeSummaryComponentOfEncompassingEncounter3ResponsiblePartyAssignedEntityHasPersonOrOrganization DischargeSummaryComponentOfEncompassingEncounter3ResponsiblePartyAssignedEntity DischargeSummaryComponentOfEncompassingEncounter3EncounterParticipantAssignedEntityHasPersonOrOrganization DischargeSummaryComponentOfEncompassingEncounter3EncounterParticipantAssignedEntity DischargeSummaryComponentOfEncompassingEncounter3EncompassingEncounterHasEffectiveTimeLow DischargeSummaryComponentOfEncompassingEncounter3EncompassingEncounterHasEffectiveTimeHigh DischargeSummaryComponentOfEncompassingEncounter3DischargeDispositionCode DischargeSummaryComponentOfEncompassingEncounter3EffectiveTime DischargeSummaryComponentOfEncompassingEncounter' templateId.root='2.16.840.1.113883.10.20.22.1.8' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.DischargeSummaryCode='DischargeSummaryCodeP' constraints.validation.info='DischargeSummaryHospitalAdmissionMedicationsSectionEntriesOptional DischargeSummaryHospitalAdmissionDiagnosisSection DischargeSummaryDischargeDietSection DischargeSummaryFunctionalStatusSection DischargeSummaryHistoryOfPresentIllnessSection DischargeSummaryHistoryOfPastIllnessSection DischargeSummaryChiefComplaintAndReasonForVisitSection DischargeSummaryChiefComplaintSection DischargeSummaryFamilyHistorySection DischargeSummaryHospitalConsultationsSection DischargeSummaryHospitalDischargeInstructionsSection DischargeSummaryHospitalDischargePhysicalSection DischargeSummaryHospitalDischargeStudiesSummarySection DischargeSummaryImmunizationsSectionEntriesOptional DischargeSummaryProblemSectionEntriesOptional DischargeSummaryProceduresSectionEntriesOptional DischargeSummaryReasonForVisitSection DischargeSummaryReviewOfSystemsSection DischargeSummarySocialHistorySection DischargeSummaryVitalSignsSectionEntriesOptional DischargeSummaryComponentOfEncompassingEncounter3DischargeDispositionCodeCodeSystem DischargeSummaryComponentOfEncompassingEncounter3ResponsibleParty DischargeSummaryComponentOfEncompassingEncounter3EncounterParticipant' constraints.validation.query='DischargeSummaryComponentOfEncompassingEncounter3ResponsiblePartyAssignedEntityHasPersonOrOrganization DischargeSummaryComponentOfEncompassingEncounter3ResponsiblePartyAssignedEntity DischargeSummaryComponentOfEncompassingEncounter3EncounterParticipantAssignedEntityHasPersonOrOrganization DischargeSummaryComponentOfEncompassingEncounter3EncounterParticipantAssignedEntity DischargeSummaryComponentOfEncompassingEncounter3EncompassingEncounterHasEffectiveTimeLow DischargeSummaryComponentOfEncompassingEncounter3EncompassingEncounterHasEffectiveTimeHigh DischargeSummaryComponentOfEncompassingEncounter3DischargeDispositionCodeValueSet DischargeSummaryComponentOfEncompassingEncounter3DischargeDispositionCodeCodeSystem DischargeSummaryComponentOfEncompassingEncounter3DischargeDispositionCode DischargeSummaryComponentOfEncompassingEncounter3EffectiveTime DischargeSummaryComponentOfEncompassingEncounter3ResponsibleParty DischargeSummaryComponentOfEncompassingEncounter3EncounterParticipant DischargeSummaryComponentOfEncompassingEncounter' constraints.validation.warning='DischargeSummaryComponentOfEncompassingEncounter3DischargeDispositionCodeValueSet'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDischargeSummaryComponentOf constraints.validation.error='DischargeSummaryComponentOfEncompassingEncounter'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDischargeSummaryComponentOfEncompassingEncounter3 constraints.validation.error='DischargeSummaryComponentOfEncompassingEncounter3EncompassingEncounterHasEffectiveTimeLow DischargeSummaryComponentOfEncompassingEncounter3EncompassingEncounterHasEffectiveTimeHigh DischargeSummaryComponentOfEncompassingEncounter3DischargeDispositionCode DischargeSummaryComponentOfEncompassingEncounter3EffectiveTime' constraints.validation.warning='DischargeSummaryComponentOfEncompassingEncounter3DischargeDispositionCodeValueSet' constraints.validation.info='DischargeSummaryComponentOfEncompassingEncounter3DischargeDispositionCodeCodeSystem DischargeSummaryComponentOfEncompassingEncounter3ResponsibleParty DischargeSummaryComponentOfEncompassingEncounter3EncounterParticipant'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDischargeSummaryComponentOfEncompassingEncounter3ResponsibleParty constraints.validation.error='DischargeSummaryComponentOfEncompassingEncounter3ResponsiblePartyAssignedEntityHasPersonOrOrganization DischargeSummaryComponentOfEncompassingEncounter3ResponsiblePartyAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDischargeSummaryComponentOfEncompassingEncounter3EncounterParticipant constraints.validation.error='DischargeSummaryComponentOfEncompassingEncounter3EncounterParticipantAssignedEntityHasPersonOrOrganization DischargeSummaryComponentOfEncompassingEncounter3EncounterParticipantAssignedEntity'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_q0mzwl9xEey5t-mahoHmrg" base_Class="_sHrUoBUSEeG6PvUxSTZnaw">
+  <Ecore:EClass xmi:id="_C_GboH3sEeyivuDeOiJBMg" base_Class="_sHrUoBUSEeG6PvUxSTZnaw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='IndicationTemplateId IndicationClassCode IndicationMoodCode IndicationId IndicationCodeP IndicationStatusCode' templateId.root='2.16.840.1.113883.10.20.22.4.19' constraints.validation.info='IndicationCodeNullFlavor' classCode='OBS' moodCode='EVN' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' constraints.validation.warning='IndicationCode IndicationEffectiveTime IndicationValue IndicationValueP' constraints.validation.dependOn.IndicationCode='IndicationCodeP' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_q3GuIF9xEey5t-mahoHmrg" base_Class="_VBXq8BUTEeG6PvUxSTZnaw">
+  <Ecore:EClass xmi:id="_DBbW4n3sEeyivuDeOiJBMg" base_Class="_VBXq8BUTEeG6PvUxSTZnaw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='DrugVehicleTemplateId DrugVehiclePlayingEntityCode DrugVehicleClassCode DrugVehicleCode DrugVehiclePlayingEntity' templateId.root='2.16.840.1.113883.10.20.22.4.24' constraints.validation.info='DrugVehiclePlayingEntityName' classCode='MANU' code.code='412307009' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_q3KYgl9xEey5t-mahoHmrg" base_Class="_DpoGkBUUEeG6PvUxSTZnaw">
+  <Ecore:EClass xmi:id="_DBfBQH3sEeyivuDeOiJBMg" base_Class="_DpoGkBUUEeG6PvUxSTZnaw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicationDispenseTemplateId MedicationDispenseContainsMedicationOrImmunization MedicationDispenseClassCode MedicationDispenseId MedicationDispenseMoodCode MedicationDispenseStatusCode MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine MedicationDispensePerformerMedicationDispenseAssignedEntity' templateId.root='2.16.840.1.113883.10.20.22.4.18' classCode='SPLY' constraints.validation.warning='MedicationDispenseEffectiveTime MedicationDispenseRepeatNumber MedicationDispenseQuantity MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressState MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode MedicationDispensePerformerMedicationDispenseAssignedEntityAddr' moodCode='EVN' constraints.validation.info='MedicationDispenseMedicationSupplyOrder MedicationDispensePerformer' constraints.validation.query='MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressState MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode MedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine MedicationDispensePerformerMedicationDispenseAssignedEntityAddr MedicationDispensePerformerMedicationDispenseAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMedicationDispensePerformer constraints.validation.error='MedicationDispensePerformerMedicationDispenseAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMedicationDispensePerformerMedicationDispenseAssignedEntity constraints.validation.warning='MedicationDispensePerformerMedicationDispenseAssignedEntityAddr MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressState MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode' constraints.validation.error='MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine' constraints.validation.query='MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressState MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode MedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_q4VdN19xEey5t-mahoHmrg" base_Class="_chEhQBUUEeG6PvUxSTZnaw">
+  <Ecore:EClass xmi:id="_DCdRon3sEeyivuDeOiJBMg" base_Class="_chEhQBUUEeG6PvUxSTZnaw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PreconditionForSubstanceAdministrationTemplateId' templateId.root='2.16.840.1.113883.10.20.22.4.25' constraints.validation.warning='PreconditionForSubstanceAdministrationCode PreconditionForSubstanceAdministrationValue' constraints.validation.info='PreconditionForSubstanceAdministrationText'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_q43os19xEey5t-mahoHmrg" base_Class="_PZBdMBUlEeGvPruliC3crg">
+  <Ecore:EClass xmi:id="_DC-PAH3sEeyivuDeOiJBMg" base_Class="_PZBdMBUlEeGvPruliC3crg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PolicyActivityTemplateId PolicyActivityClassCode PolicyActivityMoodCode PolicyActivityId PolicyActivityCodeP PolicyActivityStatusCode PolicyActivityPayer PolicyActivityCoverage PolicyActivityEntryRelationship PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine PolicyActivityPayerPayerAssignedEntityId PolicyActivityPayerTemplateId PolicyActivityPayerTypeCode PolicyActivityPayerPayerAssignedEntity PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine PolicyActivityGuarantorGuarantorAssignedEntityCode PolicyActivityGuarantorGuarantorAssignedEntityCodeP PolicyActivityGuarantorTemplateId PolicyActivityGuarantorGuarantorAssignedEntity PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressUse PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressCity PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressStreetAddressLine PolicyActivityCoverageCoverageRoleCoveragePlayingEntityName PolicyActivityCoverageCoverageRoleId PolicyActivityCoverageCoverageRoleCodeP PolicyActivityCoverageTemplateId PolicyActivityCoverageTypeCode PolicyActivityCoverageCoverageRole PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressUse PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressCity PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressStreetAddressLine PolicyActivityHolderHolderRoleId PolicyActivityHolderTemplateId PolicyActivityHolderTypeCode PolicyActivityHolderHolderRole PolicyActivityEntryRelationshipTargetActActivity PolicyActivityEntryRelationshipDescriptionCoveragePlan PolicyActivityEntryRelationshipTypeCode' templateId.root='2.16.840.1.113883.10.20.22.4.61' classCode='ACT' moodCode='EVN' code.codeSystemName='' constraints.validation.warning='PolicyActivityCode PolicyActivityGuarantor PolicyActivityHolder PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressState PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode PolicyActivityPayerPayerAssignedEntityPayerOrganizationName PolicyActivityPayerPayerAssignedEntityCodeP PolicyActivityPayerPayerAssignedEntityCode PolicyActivityPayerPayerAssignedEntityPayerOrganization PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressState PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode PolicyActivityGuarantorGuarantorAssignedEntityPersonNameAndOrOrgName PolicyActivityGuarantorGuarantorAssignedEntityAddr PolicyActivityGuarantorGuarantorAssignedEntityTelecom PolicyActivityGuarantorTime PolicyActivityGuarantorTypeCode PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressUseP PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressCountry PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressState PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressPostalCode PolicyActivityCoverageCoverageRoleCode PolicyActivityCoverageCoverageRoleAddr PolicyActivityCoverageCoverageRoleCoveragePlayingEntity PolicyActivityCoverageLowTime PolicyActivityCoverageHighTime PolicyActivityCoverageTime PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressUseP PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressCountry PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressState PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressPostalCode PolicyActivityHolderHolderRoleAddr' constraints.validation.dependOn.PolicyActivityCode='PolicyActivityCodeP' statusCode.code='completed' constraints.validation.query='PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressState PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode PolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine PolicyActivityPayerPayerAssignedEntityPayerOrganizationName PolicyActivityPayerPayerAssignedEntityId PolicyActivityPayerPayerAssignedEntityCodeP PolicyActivityPayerPayerAssignedEntityCode PolicyActivityPayerPayerAssignedEntityAddr PolicyActivityPayerPayerAssignedEntityTelecom PolicyActivityPayerPayerAssignedEntityPayerOrganization PolicyActivityPayerTemplateId PolicyActivityPayerTypeCode PolicyActivityPayerPayerAssignedEntity PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressState PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode PolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine PolicyActivityGuarantorGuarantorAssignedEntityPersonNameAndOrOrgName PolicyActivityGuarantorGuarantorAssignedEntityCode PolicyActivityGuarantorGuarantorAssignedEntityCodeP PolicyActivityGuarantorGuarantorAssignedEntityAddr PolicyActivityGuarantorGuarantorAssignedEntityTelecom PolicyActivityGuarantorTemplateId PolicyActivityGuarantorTime PolicyActivityGuarantorTypeCode PolicyActivityGuarantorGuarantorAssignedEntity PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressUse PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressUseP PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressCountry PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressState PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressCity PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressPostalCode PolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressStreetAddressLine PolicyActivityCoverageCoverageRoleCoveragePlayingEntityName PolicyActivityCoverageCoverageRoleId PolicyActivityCoverageCoverageRoleCode PolicyActivityCoverageCoverageRoleCodeP PolicyActivityCoverageCoverageRoleAddr PolicyActivityCoverageCoverageRoleCoveragePlayingEntity PolicyActivityCoverageLowTime PolicyActivityCoverageHighTime PolicyActivityCoverageTemplateId PolicyActivityCoverageTypeCode PolicyActivityCoverageTime PolicyActivityCoverageCoverageRole PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressUse PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressUseP PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressCountry PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressState PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressCity PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressPostalCode PolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressStreetAddressLine PolicyActivityHolderHolderRoleId PolicyActivityHolderHolderRoleAddr PolicyActivityHolderTemplateId PolicyActivityHolderTypeCode PolicyActivityHolderTime PolicyActivityHolderHolderRole PolicyActivityEntryRelationshipTargetActActivity PolicyActivityEntryRelationshipDescriptionCoveragePlan PolicyActivityEntryRelationshipTypeCode' constraints.validation.dependOn.PolicyActivityPayerPayerAssignedEntityCode='PolicyActivityPayerPayerAssignedEntityCodeP' constraints.validation.info='PolicyActivityPayerPayerAssignedEntityAddr PolicyActivityPayerPayerAssignedEntityTelecom PolicyActivityHolderTime'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPolicyActivityPayer constraints.validation.error='PolicyActivityPayerTemplateId PolicyActivityPayerTypeCode PolicyActivityPayerPayerAssignedEntity PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine PayerPolicyActivityPayerPayerAssignedEntityId' templateId.root='2.16.840.1.113883.10.20.22.4.87' typeCode='PRF' constraints.validation.query='PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressState PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine PayerPayerAssignedEntityPolicyActivityPayerPayerAssignedEntityPayerOrganizationName PayerPolicyActivityPayerPayerAssignedEntityId PayerPolicyActivityPayerPayerAssignedEntityCodeP PayerPolicyActivityPayerPayerAssignedEntityCode PayerPolicyActivityPayerPayerAssignedEntityAddr PayerPolicyActivityPayerPayerAssignedEntityTelecom PayerPolicyActivityPayerPayerAssignedEntityPayerOrganization' constraints.validation.warning='PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressState PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode PayerPayerAssignedEntityPolicyActivityPayerPayerAssignedEntityPayerOrganizationName PayerPolicyActivityPayerPayerAssignedEntityCodeP PayerPolicyActivityPayerPayerAssignedEntityCode PayerPolicyActivityPayerPayerAssignedEntityPayerOrganization' constraints.validation.dependOn.PayerPolicyActivityPayerPayerAssignedEntityCode='PolicyActivityPayerPayerAssignedEntityCodeP' constraints.validation.info='PayerPolicyActivityPayerPayerAssignedEntityAddr PayerPolicyActivityPayerPayerAssignedEntityTelecom'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPolicyActivityPayerPayerAssignedEntity constraints.validation.error='PolicyActivityPayerPayerAssignedEntityId PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine' code.codeSystem='2.16.840.1.113883.5.110' code.codeSystemName='HL7RoleClass' constraints.validation.warning='PolicyActivityPayerPayerAssignedEntityCode PolicyActivityPayerPayerAssignedEntityCodeP PolicyActivityPayerPayerAssignedEntityPayerOrganization PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressState PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode PayerAssignedEntityPolicyActivityPayerPayerAssignedEntityPayerOrganizationName' constraints.validation.dependOn.PolicyActivityPayerPayerAssignedEntityCode='PolicyActivityPayerPayerAssignedEntityCodeP' constraints.validation.info='PolicyActivityPayerPayerAssignedEntityAddr PolicyActivityPayerPayerAssignedEntityTelecom' constraints.validation.query='PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressState PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine PayerAssignedEntityPolicyActivityPayerPayerAssignedEntityPayerOrganizationName'</annotation>
@@ -46676,50 +46676,50 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPolicyActivityHolderHolderRole constraints.validation.error='PolicyActivityHolderHolderRoleId HolderRoleGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet HolderRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement HolderRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement HolderRoleGeneralHeaderConstraintsUSRealmAddressUse HolderRoleGeneralHeaderConstraintsUSRealmAddressCity HolderRoleGeneralHeaderConstraintsUSRealmAddressStreetAddressLine' constraints.validation.warning='PolicyActivityHolderHolderRoleAddr HolderRoleGeneralHeaderConstraintsUSRealmAddressUseP HolderRoleGeneralHeaderConstraintsUSRealmAddressCountry HolderRoleGeneralHeaderConstraintsUSRealmAddressState HolderRoleGeneralHeaderConstraintsUSRealmAddressPostalCode' constraints.validation.query='HolderRoleGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet HolderRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement HolderRoleGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement HolderRoleGeneralHeaderConstraintsUSRealmAddressUse HolderRoleGeneralHeaderConstraintsUSRealmAddressUseP HolderRoleGeneralHeaderConstraintsUSRealmAddressCountry HolderRoleGeneralHeaderConstraintsUSRealmAddressState HolderRoleGeneralHeaderConstraintsUSRealmAddressCity HolderRoleGeneralHeaderConstraintsUSRealmAddressPostalCode HolderRoleGeneralHeaderConstraintsUSRealmAddressStreetAddressLine'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPolicyActivityEntryRelationship constraints.validation.error='PolicyActivityEntryRelationshipTargetActActivity PolicyActivityEntryRelationshipDescriptionCoveragePlan PolicyActivityEntryRelationshipTypeCode' typeCode='REFR'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_q8bTAV9xEey5t-mahoHmrg" base_Class="_Cg3pkBUmEeGvPruliC3crg">
+  <Ecore:EClass xmi:id="_DGe2An3sEeyivuDeOiJBMg" base_Class="_Cg3pkBUmEeGvPruliC3crg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='CoverageActivityTemplateId CoverageActivityClassCode CoverageActivityMoodCode CoverageActivityId CoverageActivityCode CoverageActivityStatusCode CoverageActivityPolicyActivity' templateId.root='2.16.840.1.113883.10.20.22.4.60' constraints.validation.info='CoverageActivityCoverageActivityRelationshipSequenceNumber' classCode='ACT' moodCode='EVN' code.code='48768-6' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Payment Sources' statusCode.code='completed'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_q-GG8l9xEey5t-mahoHmrg" base_Class="_5Ha7ABUyEeGbmN_W114JUw">
+  <Ecore:EClass xmi:id="_DH1g4n3sEeyivuDeOiJBMg" base_Class="_5Ha7ABUyEeGbmN_W114JUw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProblemObservationTemplateId ProblemObservationTextReferenceValue ProblemObservationHasTextReferenceValue ProblemObservationHasOnsetDate ProblemObservationAgeObservationInversion ProblemObservationClassCode ProblemObservationMoodCode ProblemObservationId ProblemObservationCodeP ProblemObservationStatusCode ProblemObservationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.4' constraints.validation.warning='ProblemObservationHasTextReference ProblemObservationCode ProblemObservationText ProblemObservationEffectiveTime ProblemObservationValue' constraints.validation.info='ProblemObservationHasResolutionDate ProblemObservationValueNullFlavor ProblemObservationValueTranslation ProblemObservationValueTranslationCode ProblemObservationNegationInd ProblemObservationAgeObservation ProblemObservationHealthStatusObservation ProblemObservationProblemStatus' classCode='OBS' moodCode='EVN' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' constraints.validation.dependOn.ProblemObservationCode='ProblemObservationCodeP' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rCNK4V9xEey5t-mahoHmrg" base_Class="_SjN_8BUzEeGbmN_W114JUw">
+  <Ecore:EClass xmi:id="_DLBXwH3sEeyivuDeOiJBMg" base_Class="_SjN_8BUzEeGbmN_W114JUw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProblemStatusTemplateId ProblemStatusReferenceValue ProblemStatusTextReferenceValue ProblemStatusClassCode ProblemStatusMoodCode ProblemStatusCode ProblemStatusStatusCode ProblemStatusValue' templateId.root='2.16.840.1.113883.10.20.22.4.6' constraints.validation.warning='ProblemStatusTextReference ProblemStatusText' classCode='OBS' moodCode='EVN' code.code='33999-4' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Status' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rHVigl9xEey5t-mahoHmrg" base_Class="__qYdcBVNEeGbmN_W114JUw">
+  <Ecore:EClass xmi:id="_DPtDdX3sEeyivuDeOiJBMg" base_Class="__qYdcBVNEeGbmN_W114JUw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ImmunizationRefusalReasonTemplateId ImmunizationRefusalReasonClassCode ImmunizationRefusalReasonCode ImmunizationRefusalReasonId ImmunizationRefusalReasonMoodCode ImmunizationRefusalReasonStatusCode' templateId.root='2.16.840.1.113883.10.20.22.4.53' classCode='OBS' code.codeSystem='2.16.840.1.113883.5.8' code.codeSystemName='ActReason' moodCode='EVN' statusCode.code='completed'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rIfZEF9xEey5t-mahoHmrg" base_Class="_daTqABVOEeGbmN_W114JUw">
+  <Ecore:EClass xmi:id="_DQo3kH3sEeyivuDeOiJBMg" base_Class="_daTqABVOEeGbmN_W114JUw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ImmunizationMedicationInformationTemplateId ImmunizationMedicationInformationClassCode ImmunizationMedicationInformationManufacturedMaterial ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCode' templateId.root='2.16.840.1.113883.10.20.22.4.54' classCode='MANU' constraints.validation.info='ImmunizationMedicationInformationId ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeTranslation' constraints.validation.warning='ImmunizationMedicationInformationManufacturerOrganization ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeOriginalText ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialOriginalTextReference ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialTextReferenceValue ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialLotNumberText' constraints.validation.query='ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeOriginalText ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialOriginalTextReference ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialTextReferenceValue ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeTranslation ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCode ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialLotNumberText'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterial constraints.validation.warning='ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeOriginalText ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialOriginalTextReference ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialTextReferenceValue ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialLotNumberText' constraints.validation.info='ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeTranslation' code.codeSystem='2.16.840.1.113883.12.292' code.codeSystemName='Vaccines administered (CVX)' constraints.validation.error='ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCode'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rKHJsF9xEey5t-mahoHmrg" base_Class="_bGzYgBVdEeGQCvUGzi1kDQ">
+  <Ecore:EClass xmi:id="_DSDM0H3sEeyivuDeOiJBMg" base_Class="_bGzYgBVdEeGQCvUGzi1kDQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AllergiesSectionEntriesOptionalTemplateId AllergiesSectionEntriesOptionalCode AllergiesSectionEntriesOptionalCodeP AllergiesSectionEntriesOptionalTitle AllergiesSectionEntriesOptionalText' templateId.root='2.16.840.1.113883.10.20.22.2.6' code.code='48765-2' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Allergies, adverse reactions, alerts' constraints.validation.warning='AllergiesSectionEntriesOptionalAllergyProblemAct'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rKNQUF9xEey5t-mahoHmrg" base_Class="_iAoXEBVdEeGQCvUGzi1kDQ">
+  <Ecore:EClass xmi:id="_DSIFUn3sEeyivuDeOiJBMg" base_Class="_iAoXEBVdEeGQCvUGzi1kDQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicationsSectionEntriesOptionalTemplateId MedicationsSectionEntriesOptionalCode MedicationsSectionEntriesOptionalCodeP MedicationsSectionEntriesOptionalTitle MedicationsSectionEntriesOptionalText' templateId.root='2.16.840.1.113883.10.20.22.2.1' code.code='10160-0' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='History of medication use' constraints.validation.warning='MedicationsSectionEntriesOptionalMedicationActivity'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rKSv4l9xEey5t-mahoHmrg" base_Class="_naxrkBVdEeGQCvUGzi1kDQ">
+  <Ecore:EClass xmi:id="_DSM90n3sEeyivuDeOiJBMg" base_Class="_naxrkBVdEeGQCvUGzi1kDQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProblemSectionEntriesOptionalTemplateId ProblemSectionEntriesOptionalCode ProblemSectionEntriesOptionalCodeP ProblemSectionEntriesOptionalTitle ProblemSectionEntriesOptionalText' templateId.root='2.16.840.1.113883.10.20.22.2.5' code.code='11450-4' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Problem List' constraints.validation.warning='ProblemSectionEntriesOptionalProblemConcern'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rKYPcF9xEey5t-mahoHmrg" base_Class="_s9Ig4BVdEeGQCvUGzi1kDQ">
+  <Ecore:EClass xmi:id="_DSR2Un3sEeyivuDeOiJBMg" base_Class="_s9Ig4BVdEeGQCvUGzi1kDQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProceduresSectionEntriesOptionalTemplateId ProceduresSectionEntriesOptionalCode ProceduresSectionEntriesOptionalCodeP ProceduresSectionEntriesOptionalTitle ProceduresSectionEntriesOptionalText' templateId.root='2.16.840.1.113883.10.20.22.2.7' code.code='47519-4' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='History of Procedures' constraints.validation.info='ProceduresSectionEntriesOptionalProcedureActivityProcedure ProceduresSectionEntriesOptionalProcedureActivityObservation ProceduresSectionEntriesOptionalProcedureActivityAct'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rKdvAF9xEey5t-mahoHmrg" base_Class="_xGqiEBVdEeGQCvUGzi1kDQ">
+  <Ecore:EClass xmi:id="_DSWu0n3sEeyivuDeOiJBMg" base_Class="_xGqiEBVdEeGQCvUGzi1kDQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ResultsSectionEntriesOptionalTemplateId ResultsSectionEntriesOptionalCode ResultsSectionEntriesOptionalCodeP ResultsSectionEntriesOptionalTitle ResultsSectionEntriesOptionalText' templateId.root='2.16.840.1.113883.10.20.22.2.3' code.code='30954-2' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Relevant diagnostic tests and/or laboratory data' constraints.validation.warning='ResultsSectionEntriesOptionalResultOrganizer'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rKjOkV9xEey5t-mahoHmrg" base_Class="_1RZdIBVdEeGQCvUGzi1kDQ">
+  <Ecore:EClass xmi:id="_DSbnUn3sEeyivuDeOiJBMg" base_Class="_1RZdIBVdEeGQCvUGzi1kDQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AdvanceDirectivesSectionEntriesOptionalTemplateId AdvanceDirectivesSectionEntriesOptionalCode AdvanceDirectivesSectionEntriesOptionalCodeP AdvanceDirectivesSectionEntriesOptionalTitle AdvanceDirectivesSectionEntriesOptionalText' templateId.root='2.16.840.1.113883.10.20.22.2.21' code.code='42348-3' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Advance Directives' constraints.validation.info='AdvanceDirectivesSectionEntriesOptionalAdvanceDirectiveObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rKouIV9xEey5t-mahoHmrg" base_Class="_4yj2wBVdEeGQCvUGzi1kDQ">
+  <Ecore:EClass xmi:id="_DShG4X3sEeyivuDeOiJBMg" base_Class="_4yj2wBVdEeGQCvUGzi1kDQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='EncountersSectionEntriesOptionalTemplateId EncountersSectionEntriesOptionalCode EncountersSectionEntriesOptionalCodeP EncountersSectionEntriesOptionalTitle EncountersSectionEntriesOptionalText' templateId.root='2.16.840.1.113883.10.20.22.2.22' code.code='46240-8' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Encounters' constraints.validation.warning='EncountersSectionEntriesOptionalEncounterActivities'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rKuNsl9xEey5t-mahoHmrg" base_Class="_EuPloBVeEeGQCvUGzi1kDQ">
+  <Ecore:EClass xmi:id="_DSl_YH3sEeyivuDeOiJBMg" base_Class="_EuPloBVeEeGQCvUGzi1kDQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ImmunizationsSectionEntriesOptionalTemplateId ImmunizationsSectionEntriesOptionalCode ImmunizationsSectionEntriesOptionalCodeP ImmunizationsSectionEntriesOptionalTitle ImmunizationsSectionEntriesOptionalText' templateId.root='2.16.840.1.113883.10.20.22.2.2' code.code='11369-6' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.warning='ImmunizationsSectionEntriesOptionalImmunizationActivity'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rKztQV9xEey5t-mahoHmrg" base_Class="_bRH8sBVeEeGQCvUGzi1kDQ">
+  <Ecore:EClass xmi:id="_DSq34n3sEeyivuDeOiJBMg" base_Class="_bRH8sBVeEeGQCvUGzi1kDQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='VitalSignsSectionEntriesOptionalTemplateId VitalSignsSectionEntriesOptionalCode VitalSignsSectionEntriesOptionalCodeP VitalSignsSectionEntriesOptionalTitle VitalSignsSectionEntriesOptionalText' templateId.root='2.16.840.1.113883.10.20.22.2.4' code.code='8716-3' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Vital Signs' constraints.validation.warning='VitalSignsSectionEntriesOptionalVitalSignsOrganizer'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rK5M0F9xEey5t-mahoHmrg" base_Class="_Aj7JkBg4EeGs5a462vYX5Q">
+  <Ecore:EClass xmi:id="_DSwXcX3sEeyivuDeOiJBMg" base_Class="_Aj7JkBg4EeGs5a462vYX5Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProcedureActivityObservationTemplateId ProcedureActivityObservationReferenceValue ProcedureActivityObservationEncounterInversion ProcedureActivityObservationServiceDeliveryLocationTypeCode ProcedureActivityObservationInstructionsInversion ProcedureActivityObservationClassCode ProcedureActivityObservationMoodCode ProcedureActivityObservationId ProcedureActivityObservationCode ProcedureActivityObservationStatusCode ProcedureActivityObservationPriorityCode ProcedureActivityObservationValue ProcedureActivityObservationTargetSiteCode ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityProcedureObservationRepresentedOrganizationTelecom ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityProcedureObservationRepresentedOrganizationAddr ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityId ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityAddr ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityTelecom ProcedureActivityObservationProcedureObservationPerformerAssignedEntity ProcedureActivityObservationEntryRelationshipProcedureObservationEncounterClassCode ProcedureActivityObservationEntryRelationshipProcedureObservationEncounterMoodCode ProcedureActivityObservationEntryRelationshipProcedureObservationEncounterId ProcedureActivityObservationEntryRelationshipInversionInd ProcedureActivityObservationEntryRelationshipTypeCode ProcedureActivityObservationEntryRelationshipProcedureObservationEncounter' templateId.root='2.16.840.1.113883.10.20.22.4.13' constraints.validation.warning='ProcedureActivityObservationCodeCodeSystems ProcedureActivityObservationCodeOriginalText ProcedureActivityObservationOriginalTextReference ProcedureActivityObservationOriginalTextReferenceValue ProcedureActivityObservationEffectiveTime ProcedureActivityObservationTargetSiteCodeP ProcedureActivityObservationPerformer ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityProcedureObservationRepresentedOrganizationId ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityRepresentedOrganization' classCode='OBS' priorityCode.codeSystem='2.16.840.1.113883.5.7' priorityCode.codeSystemName='ActPriority' constraints.validation.info='ProcedureActivityObservationPriorityCodeP ProcedureActivityObservationMethodCode ProcedureActivityObservationServiceDeliveryLocation ProcedureActivityObservationInstructions ProcedureActivityObservationIndication ProcedureActivityObservationMedicationActivity ProcedureActivityObservationEntryRelationship ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityProcedureObservationRepresentedOrganizationName' constraints.validation.dependOn.ProcedureActivityObservationPriorityCode='ProcedureActivityObservationPriorityCodeP' targetSiteCode.codeSystem='2.16.840.1.113883.6.96' targetSiteCode.codeSystemName='SNOMEDCT' constraints.validation.dependOn.ProcedureActivityObservationTargetSiteCode='ProcedureActivityObservationTargetSiteCodeP' constraints.validation.query='ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityProcedureObservationRepresentedOrganizationId ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityProcedureObservationRepresentedOrganizationName ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityProcedureObservationRepresentedOrganizationTelecom ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityProcedureObservationRepresentedOrganizationAddr ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityId ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityAddr ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityTelecom ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityRepresentedOrganization ProcedureActivityObservationProcedureObservationPerformerAssignedEntity ProcedureActivityObservationEntryRelationshipProcedureObservationEncounterClassCode ProcedureActivityObservationEntryRelationshipProcedureObservationEncounterMoodCode ProcedureActivityObservationEntryRelationshipProcedureObservationEncounterId ProcedureActivityObservationEntryRelationshipInversionInd ProcedureActivityObservationEntryRelationshipTypeCode ProcedureActivityObservationEntryRelationshipProcedureObservationEncounter'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityObservationProcedureObservationPerformer constraints.validation.error='ProcedureActivityObservationProcedureObservationPerformerAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntity constraints.validation.error='ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityId ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityAddr ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityTelecom' constraints.validation.warning='ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityRepresentedOrganization'</annotation>
@@ -46727,7 +46727,7 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityObservationEntryRelationship inversionInd='true' constraints.validation.error='ProcedureActivityObservationEntryRelationshipInversionInd ProcedureActivityObservationEntryRelationshipTypeCode ProcedureActivityObservationEntryRelationshipProcedureObservationEncounter' typeCode='COMP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityObservationEntryRelationshipProcedureObservationEncounter classCode='ENC' constraints.validation.error='ProcedureActivityObservationEntryRelationshipProcedureObservationEncounterClassCode ProcedureActivityObservationEntryRelationshipProcedureObservationEncounterMoodCode ProcedureActivityObservationEntryRelationshipProcedureObservationEncounterId' moodCode='EVN'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rOTGIV9xEey5t-mahoHmrg" base_Class="_awdH4Bg4EeGs5a462vYX5Q">
+  <Ecore:EClass xmi:id="_DVwBEH3sEeyivuDeOiJBMg" base_Class="_awdH4Bg4EeGs5a462vYX5Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProcedureActivityActTemplateId ProcedureActivityActReferenceValue ProcedureActivityActServiceDeliveryLocationTypeCode ProcedureActivityActEncounterInversion ProcedureActivityActInstructionsInversion ProcedureActivityActClassCode ProcedureActivityActMoodCode ProcedureActivityActId ProcedureActivityActCode ProcedureActivityActStatusCode ProcedureActivityActPriorityCode ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationTelecom ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationAddr ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityId ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityAddr ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityTelecom ProcedureActivityActProcedureActPerformerAssignedEntity ProcedureActivityActEntryRelationshipProcedureActEncounterClassCode ProcedureActivityActEntryRelationshipProcedureActEncounterMoodCode ProcedureActivityActEntryRelationshipProcedureActEncounterId ProcedureActivityActEntryRelationshipInversionInd ProcedureActivityActEntryRelationshipTypeCode ProcedureActivityActEntryRelationshipProcedureActEncounter' templateId.root='2.16.840.1.113883.10.20.22.4.12' constraints.validation.warning='ProcedureActivityActCodeOriginalText ProcedureActivityActOriginalTextReference ProcedureActivityActCodeCodeSystems ProcedureActivityActEffectiveTime ProcedureActivityActPerformer ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationId ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityRepresentedOrganization' constraints.validation.info='ProcedureActivityActOriginalTextReferenceValue ProcedureActivityActPriorityCodeP ProcedureActivityActServiceDeliveryLocation ProcedureActivityActInstructions ProcedureActivityActIndication ProcedureActivityActMedicationActivity ProcedureActivityActEntryRelationship ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationName' classCode='ACT' priorityCode.codeSystem='2.16.840.1.113883.5.7' priorityCode.codeSystemName='ActPriority' constraints.validation.dependOn.ProcedureActivityActPriorityCode='ProcedureActivityActPriorityCodeP' constraints.validation.query='ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationId ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationName ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationTelecom ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationAddr ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityId ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityAddr ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityTelecom ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityRepresentedOrganization ProcedureActivityActProcedureActPerformerAssignedEntity ProcedureActivityActEntryRelationshipProcedureActEncounterClassCode ProcedureActivityActEntryRelationshipProcedureActEncounterMoodCode ProcedureActivityActEntryRelationshipProcedureActEncounterId ProcedureActivityActEntryRelationshipInversionInd ProcedureActivityActEntryRelationshipTypeCode ProcedureActivityActEntryRelationshipProcedureActEncounter'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityActProcedureActPerformer constraints.validation.error='ProcedureActivityActProcedureActPerformerAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityActProcedureActPerformerProcedureActAssignedEntity constraints.validation.error='ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityId ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityAddr ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityTelecom' constraints.validation.warning='ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityRepresentedOrganization'</annotation>
@@ -46735,120 +46735,120 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityActEntryRelationship inversionInd='true' constraints.validation.error='ProcedureActivityActEntryRelationshipInversionInd ProcedureActivityActEntryRelationshipTypeCode ProcedureActivityActEntryRelationshipProcedureActEncounter' typeCode='COMP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityActEntryRelationshipProcedureActEncounter classCode='ENC' constraints.validation.error='ProcedureActivityActEntryRelationshipProcedureActEncounterClassCode ProcedureActivityActEntryRelationshipProcedureActEncounterMoodCode ProcedureActivityActEntryRelationshipProcedureActEncounterId' moodCode='EVN'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rQuvEl9xEey5t-mahoHmrg" base_Class="_XUoXwBnZEeGs5a462vYX5Q">
+  <Ecore:EClass xmi:id="_DYKb4n3sEeyivuDeOiJBMg" base_Class="_XUoXwBnZEeGs5a462vYX5Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AuthorizationActivityTemplateId AuthorizationActivityClassCode AuthorizationActivityId AuthorizationActivityMoodCode AuthorizationActivityEntryRelationship AuthorizationActivityEntryRelationshipHasClinicalStatement AuthorizationActivityEntryRelationshipTypeCode' templateId.root='2.16.840.1.113883.10.20.1.19' classCode='ACT' moodCode='EVN' constraints.validation.query='AuthorizationActivityEntryRelationshipHasClinicalStatement AuthorizationActivityEntryRelationshipHasAuthorizedPerformers AuthorizationActivityEntryRelationshipTypeCode' constraints.validation.info='AuthorizationActivityEntryRelationshipHasAuthorizedPerformers'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAuthorizationActivityEntryRelationship constraints.validation.error='AuthorizationActivityEntryRelationshipHasClinicalStatement AuthorizationActivityEntryRelationshipTypeCode' constraints.validation.info='AuthorizationActivityEntryRelationshipHasAuthorizedPerformers' typeCode='SUBJ'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rRx38l9xEey5t-mahoHmrg" base_Class="_j3aTQBrTEeGo461UQq-B1g">
+  <Ecore:EClass xmi:id="_DZHeIH3sEeyivuDeOiJBMg" base_Class="_j3aTQBrTEeGo461UQq-B1g">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicationSupplyOrderTemplateId MedicationSupplyOrderInstructionInversionInd MedicationSupplyOrderEffectiveTimeHigh MedicationSupplyOrderContainsMedicationOrImmunization MedicationSupplyOrderClassCode MedicationSupplyOrderMoodCode MedicationSupplyOrderId MedicationSupplyOrderStatusCode' templateId.root='2.16.840.1.113883.10.20.22.4.17' classCode='SPLY' moodCode='INT' constraints.validation.warning='MedicationSupplyOrderEffectiveTime MedicationSupplyOrderRepeatNumber MedicationSupplyOrderQuantity' constraints.validation.info='MedicationSupplyOrderAuthor MedicationSupplyOrderInstructions'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_reT4El9xEey5t-mahoHmrg" base_Class="_vBswQBtpEeGT89b80j3MTg">
+  <Ecore:EClass xmi:id="_Dje7EX3sEeyivuDeOiJBMg" base_Class="_vBswQBtpEeGT89b80j3MTg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='EstimatedDateOfDeliveryTemplateId EstimatedDateOfDeliveryClassCode EstimatedDateOfDeliveryCode EstimatedDateOfDeliveryMoodCode EstimatedDateOfDeliveryStatusCode EstimatedDateOfDeliveryValue' templateId.root='2.16.840.1.113883.10.20.15.3.1' classCode='OBS' code.code='11778-8' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' moodCode='EVN' statusCode.code='completed'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rjdd0F9xEey5t-mahoHmrg" base_Class="_hD-z0CUPEeGiOPpZVnfEJA">
+  <Ecore:EClass xmi:id="_DnZxwH3sEeyivuDeOiJBMg" base_Class="_hD-z0CUPEeGiOPpZVnfEJA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='DischargeMedicationMedicationActivity DischargeMedicationTemplateId DischargeMedicationClassCode DischargeMedicationMoodCode DischargeMedicationCode' templateId.root='2.16.840.1.113883.10.20.22.4.35' classCode='ACT' moodCode='EVN' code.code='10183-2' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Discharge Medication'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rkW1sl9xEey5t-mahoHmrg" base_Class="_KtwVgCULEeGiOPpZVnfEJA">
+  <Ecore:EClass xmi:id="_Dn5hAn3sEeyivuDeOiJBMg" base_Class="_KtwVgCULEeGiOPpZVnfEJA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HospitalDischargeDiagnosisProblemObservation HospitalDischargeDiagnosisTemplateId HospitalDischargeDiagnosisClassCode HospitalDischargeDiagnosisMoodCode HospitalDischargeDiagnosisCode' templateId.root='2.16.840.1.113883.10.20.22.4.33' classCode='ACT' moodCode='EVN' code.code='11535-2' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Hospital Discharge Diagnosis'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rkYD0V9xEey5t-mahoHmrg" base_Class="_2PidURSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_Dn6IEn3sEeyivuDeOiJBMg" base_Class="_2PidURSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HospitalDischargeDiagnosisSectionTemplateId HospitalDischargeDiagnosisSectionCode HospitalDischargeDiagnosisSectionCodeP HospitalDischargeDiagnosisSectionTitle HospitalDischargeDiagnosisSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.24' code.code='11535-2' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Hospital Discharge Diagnosis' constraints.validation.warning='HospitalDischargeDiagnosisSectionHospitalDischargeDiagnosis'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rkf_ol9xEey5t-mahoHmrg" base_Class="_2Poj7RSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_DoAOsX3sEeyivuDeOiJBMg" base_Class="_2Poj7RSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HospitalDischargeMedicationsSectionEntriesOptionalTemplateId HospitalDischargeMedicationsSectionEntriesOptionalCode HospitalDischargeMedicationsSectionEntriesOptionalCodeP HospitalDischargeMedicationsSectionEntriesOptionalTitle HospitalDischargeMedicationsSectionEntriesOptionalText' templateId.root='2.16.840.1.113883.10.20.22.2.11' code.code='10183-2' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='HOSPITAL DISCHARGE MEDICATIONS' constraints.validation.warning='HospitalDischargeMedicationsSectionEntriesOptionalDischargeMedication'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rkpJkF9xEey5t-mahoHmrg" base_Class="_2RqkOxSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_DoGVUH3sEeyivuDeOiJBMg" base_Class="_2RqkOxSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HospitalCourseSectionTemplateId HospitalCourseSectionCode HospitalCourseSectionCodeP HospitalCourseSectionTitle HospitalCourseSectionText' templateId.root='1.3.6.1.4.1.19376.1.5.3.1.3.5' code.code='8648-8' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Hospital Course'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rkv3Ql9xEey5t-mahoHmrg" base_Class="_2Uz-4xSVEeGGzu7fmW9pXw">
+  <Ecore:EClass xmi:id="_DoL04n3sEeyivuDeOiJBMg" base_Class="_2Uz-4xSVEeGGzu7fmW9pXw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='DischargeDietSectionTemplateId DischargeDietSectionCode DischargeDietSectionCodeP DischargeDietSectionTitle DischargeDietSectionText' templateId.root='1.3.6.1.4.1.19376.1.5.3.1.3.33' code.code='42344-2' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Discharge Diet'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rk2k8V9xEey5t-mahoHmrg" base_Class="_38AXoCUTEeGiOPpZVnfEJA">
+  <Ecore:EClass xmi:id="_DoZQQX3sEeyivuDeOiJBMg" base_Class="_38AXoCUTEeGiOPpZVnfEJA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HospitalDischargeStudiesSummarySectionTemplateId HospitalDischargeStudiesSummarySectionCode HospitalDischargeStudiesSummarySectionCodeP HospitalDischargeStudiesSummarySectionTitle HospitalDischargeStudiesSummarySectionText' templateId.root='2.16.840.1.113883.10.20.22.2.16' code.code='11493-4' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Hospital Discharge Studies Summary'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rlI40V9xEey5t-mahoHmrg" base_Class="_lBergCUMEeGiOPpZVnfEJA">
+  <Ecore:EClass xmi:id="_DosLMX3sEeyivuDeOiJBMg" base_Class="_lBergCUMEeGiOPpZVnfEJA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HospitalDischargeInstructionsSectionTemplateId HospitalDischargeInstructionsSectionCode HospitalDischargeInstructionsSectionCodeP HospitalDischargeInstructionsSectionTitle HospitalDischargeInstructionsSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.41' code.code='8653-8' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Hospital Discharge Instructions'</annotation>
   </Ecore:EClass>
-  <CDA:ConformsTo xmi:id="_rlO_cF9xEey5t-mahoHmrg" base_Generalization="_TytVkSUQEeGiOPpZVnfEJA"/>
-  <Ecore:EClass xmi:id="_rlPmgl9xEey5t-mahoHmrg" base_Class="_TytVkCUQEeGiOPpZVnfEJA">
+  <CDA:ConformsTo xmi:id="_DoxqwH3sEeyivuDeOiJBMg" base_Generalization="_TytVkSUQEeGiOPpZVnfEJA"/>
+  <Ecore:EClass xmi:id="_DoyR0X3sEeyivuDeOiJBMg" base_Class="_TytVkCUQEeGiOPpZVnfEJA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HospitalDischargeMedicationsSectionEntriesOptionalTemplateId HospitalDischargeMedicationsSectionEntriesOptionalCode HospitalDischargeMedicationsSectionEntriesOptionalCodeP HospitalDischargeMedicationsSectionEntriesOptionalText HospitalDischargeMedicationsSectionEntriesOptionalTitle HospitalDischargeMedicationsSectionEntriesOptionalDischargeMedication' templateId.root='2.16.840.1.113883.10.20.22.2.11.1' constraints.validation.dependOn.HospitalDischargeMedicationsSectionEntriesOptionalCode='HospitalDischargeMedicationsSectionEntriesOptionalCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rpTnIF9xEey5t-mahoHmrg" base_Class="_WikGsCUTEeGiOPpZVnfEJA">
+  <Ecore:EClass xmi:id="_DsXxUH3sEeyivuDeOiJBMg" base_Class="_WikGsCUTEeGiOPpZVnfEJA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HospitalDischargePhysicalSectionTemplateId HospitalDischargePhysicalSectionCode HospitalDischargePhysicalSectionCodeP HospitalDischargePhysicalSectionTitle HospitalDischargePhysicalSectionText' templateId.root='1.3.6.1.4.1.19376.1.5.3.1.3.26' code.code='10184-0' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Hospital Discharge Physical'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rq3GV19xEey5t-mahoHmrg" base_Class="_oI7CQCsaEeGHF88-qhhUMA">
+  <Ecore:EClass xmi:id="_DtsnAn3sEeyivuDeOiJBMg" base_Class="_oI7CQCsaEeGHF88-qhhUMA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ChiefComplaintAndReasonForVisitSectionTemplateId ChiefComplaintAndReasonForVisitSectionCode ChiefComplaintAndReasonForVisitSectionCodeP ChiefComplaintAndReasonForVisitSectionText ChiefComplaintAndReasonForVisitSectionTitle' templateId.root='2.16.840.1.113883.10.20.22.2.13' code.code='46239-0' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Chief Complaint and Reason for Visit'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_rq9M8l9xEey5t-mahoHmrg" base_Class="_Nm64UCscEeGHF88-qhhUMA">
+  <Ecore:EClass xmi:id="_Dtxfgn3sEeyivuDeOiJBMg" base_Class="_Nm64UCscEeGHF88-qhhUMA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ReasonForVisitSectionTemplateId ReasonForVisitSectionCode ReasonForVisitSectionCodeP ReasonForVisitSectionText ReasonForVisitSectionTitle' templateId.root='2.16.840.1.113883.10.20.22.2.12' code.code='29299-5' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Reason for Visit'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r50vYF9xEey5t-mahoHmrg" base_Class="_OA_Q0DVyEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D63gVH3sEeyivuDeOiJBMg" base_Class="_OA_Q0DVyEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AnesthesiaSectionTemplateId AnesthesiaSectionCode AnesthesiaSectionCodeP AnesthesiaSectionTitle AnesthesiaSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.25' code.code='59774-0' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.info='AnesthesiaSectionProcedureActivityProcedure AnesthesiaSectionMedicationActivity'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r55n4l9xEey5t-mahoHmrg" base_Class="_R1OXcDVyEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D68_4X3sEeyivuDeOiJBMg" base_Class="_R1OXcDVyEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ComplicationsSectionTemplateId ComplicationsSectionCode ComplicationsSectionCodeP ComplicationsSectionTitle ComplicationsSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.37' code.code='55109-3' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Complications' constraints.validation.info='ComplicationsSectionProblemObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r5_HcV9xEey5t-mahoHmrg" base_Class="_WPTWEDVyEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D7B4YX3sEeyivuDeOiJBMg" base_Class="_WPTWEDVyEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='DICOMObjectCatalogSectionTemplateId DICOMObjectCatalogSectionCode DICOMObjectCatalogSectionCodeP DICOMObjectCatalogSectionStudyAct' templateId.root='2.16.840.1.113883.10.20.6.1.1' code.code='121181' code.codeSystem='1.2.840.10008.2.16.4' code.codeSystemName='DCM' code.displayName='Dicom Object Catalog'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r6CKwF9xEey5t-mahoHmrg" base_Class="_ZcC-4DVyEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D7E7sX3sEeyivuDeOiJBMg" base_Class="_ZcC-4DVyEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='FindingsSectionTemplateId' templateId.root='2.16.840.1.113883.10.20.6.1.2'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r6Cx0F9xEey5t-mahoHmrg" base_Class="_eKFbUDVyEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D7Fiwn3sEeyivuDeOiJBMg" base_Class="_eKFbUDVyEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HospitalConsultationsSectionTemplateId HospitalConsultationsSectionCode HospitalConsultationsSectionCodeP HospitalConsultationsSectionText HospitalConsultationsSectionTitle' templateId.root='2.16.840.1.113883.10.20.22.2.42' code.code='18841-7' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r6HqUV9xEey5t-mahoHmrg" base_Class="_hqzJADVyEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D7LCUn3sEeyivuDeOiJBMg" base_Class="_hqzJADVyEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='InterventionsSectionTemplateId InterventionsSectionCode InterventionsSectionCodeP InterventionsSectionTitle InterventionsSectionText' templateId.root='2.16.840.1.113883.10.20.21.2.3' code.code='62387-6' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r6NJ4F9xEey5t-mahoHmrg" base_Class="_mEIgwDVyEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D7Qh4n3sEeyivuDeOiJBMg" base_Class="_mEIgwDVyEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicalHistorySectionTemplateId MedicalHistorySectionCode MedicalHistorySectionCodeP MedicalHistorySectionText MedicalHistorySectionTitle' templateId.root='2.16.840.1.113883.10.20.22.2.39' code.code='11329-0' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r6Spcl9xEey5t-mahoHmrg" base_Class="_rNJpADVyEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D7WBcn3sEeyivuDeOiJBMg" base_Class="_rNJpADVyEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ObjectiveSectionTemplateId ObjectiveSectionCode ObjectiveSectionCodeP ObjectiveSectionText ObjectiveSectionTitle' templateId.root='2.16.840.1.113883.10.20.21.2.1' code.code='61149-1' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Objective'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r6Z-MV9xEey5t-mahoHmrg" base_Class="_vHfXoDVyEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D7cIEX3sEeyivuDeOiJBMg" base_Class="_vHfXoDVyEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='OperativeNoteFluidSectionTemplateId OperativeNoteFluidSectionCode OperativeNoteFluidSectionCodeP OperativeNoteFluidSectionText OperativeNoteFluidSectionTitle' templateId.root='2.16.840.1.113883.10.20.7.12' code.code='10216-0' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Operative Note Fluids'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r6fdwV9xEey5t-mahoHmrg" base_Class="_zel6wDVyEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D7hnon3sEeyivuDeOiJBMg" base_Class="_zel6wDVyEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='OperativeNoteSurgicalProcedureSectionTemplateId OperativeNoteSurgicalProcedureSectionCode OperativeNoteSurgicalProcedureSectionCodeP OperativeNoteSurgicalProcedureSectionText OperativeNoteSurgicalProcedureSectionTitle' templateId.root='2.16.840.1.113883.10.20.7.14' code.code='10223-6' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Operative Note Surgical'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r6k9UF9xEey5t-mahoHmrg" base_Class="_3b6E4DVyEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D7mgIn3sEeyivuDeOiJBMg" base_Class="_3b6E4DVyEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlannedProcedureSectionTemplateId PlannedProcedureSectionCode PlannedProcedureSectionCodeP PlannedProcedureSectionTitle PlannedProcedureSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.30' code.code='59772-4' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Planned Procedure' constraints.validation.info='PlannedProcedureSectionPlanOfCareActivityProcedure'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r6qc4F9xEey5t-mahoHmrg" base_Class="_7UA-4DVyEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D7rYon3sEeyivuDeOiJBMg" base_Class="_7UA-4DVyEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PostoperativeDiagnosisSectionTemplateId PostoperativeDiagnosisSectionCode PostoperativeDiagnosisSectionCodeP PostoperativeDiagnosisSectionText PostoperativeDiagnosisSectionTitle' templateId.root='2.16.840.1.113883.10.20.22.2.35' code.code='10218-6' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Postoperative Diagnosis'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r6vVYV9xEey5t-mahoHmrg" base_Class="_-jlSMDVyEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D7wRIX3sEeyivuDeOiJBMg" base_Class="_-jlSMDVyEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PostprocedureDiagnosisSectionTemplateId PostprocedureDiagnosisSectionCode PostprocedureDiagnosisSectionCodeP PostprocedureDiagnosisSectionTitle PostprocedureDiagnosisSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.36' code.code='59769-0' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Postprocedure Diagnosis' constraints.validation.warning='PostprocedureDiagnosisSectionPostprocedureDiagnosis'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r60N4l9xEey5t-mahoHmrg" base_Class="_Cu6qMDVzEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D71JoX3sEeyivuDeOiJBMg" base_Class="_Cu6qMDVzEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PreoperativeDiagnosisSectionTemplateId PreoperativeDiagnosisSectionCode PreoperativeDiagnosisSectionCodeP PreoperativeDiagnosisSectionTitle PreoperativeDiagnosisSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.34' code.code='10219-4' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Preoperative Diagnosis' constraints.validation.warning='PreoperativeDiagnosisSectionPreoperativeDiagnosis'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r65tcF9xEey5t-mahoHmrg" base_Class="_HNUIIDVzEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D76CIH3sEeyivuDeOiJBMg" base_Class="_HNUIIDVzEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProcedureDescriptionSectionTemplateId ProcedureDescriptionSectionCode ProcedureDescriptionSectionCodeP ProcedureDescriptionSectionText ProcedureDescriptionSectionTitle' templateId.root='2.16.840.1.113883.10.20.22.2.27' code.code='29554-3' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Procedure Description'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r6-l8F9xEey5t-mahoHmrg" base_Class="_QhXGYDVzEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D7-6on3sEeyivuDeOiJBMg" base_Class="_QhXGYDVzEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProcedureDispositionSectionTemplateId ProcedureDispositionSectionCode ProcedureDispositionSectionCodeP ProcedureDispositionSectionText ProcedureDispositionSectionTitle' templateId.root='2.16.840.1.113883.10.20.18.2.12' code.code='59775-7' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Procedure Disposition'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r7Decl9xEey5t-mahoHmrg" base_Class="_TvcL8DVzEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D8EaMH3sEeyivuDeOiJBMg" base_Class="_TvcL8DVzEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProcedureEstimatedBloodLossSectionTemplateId ProcedureEstimatedBloodLossSectionCode ProcedureEstimatedBloodLossSectionCodeP ProcedureEstimatedBloodLossSectionText ProcedureEstimatedBloodLossSectionTitle' templateId.root='2.16.840.1.113883.10.20.18.2.9' code.code='59770-8' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Procedure Estimated Blood Loss'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r7IW8l9xEey5t-mahoHmrg" base_Class="_W4UBYDVzEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D8JSsH3sEeyivuDeOiJBMg" base_Class="_W4UBYDVzEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProcedureFindingsSectionTemplateId ProcedureFindingsSectionCode ProcedureFindingsSectionCodeP ProcedureFindingsSectionTitle ProcedureFindingsSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.28' code.code='59776-5' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Procedure Findings' constraints.validation.info='ProcedureFindingsSectionProblemObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r7OdkF9xEey5t-mahoHmrg" base_Class="_Z662wDVzEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D8NkIn3sEeyivuDeOiJBMg" base_Class="_Z662wDVzEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProcedureImplantsSectionTemplateId ProcedureImplantsSectionCode ProcedureImplantsSectionCodeP ProcedureImplantsSectionText ProcedureImplantsSectionTitle' templateId.root='2.16.840.1.113883.10.20.22.2.40' code.code='59771-6' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Procedure Implants'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r7VLQF9xEey5t-mahoHmrg" base_Class="_cjmJMDVzEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D8Scon3sEeyivuDeOiJBMg" base_Class="_cjmJMDVzEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProcedureIndicationsSectionTemplateId ProcedureIndicationsSectionCode ProcedureIndicationsSectionCodeP ProcedureIndicationsSectionTitle ProcedureIndicationsSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.29' code.code='59768-2' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Procedure Indications' constraints.validation.info='ProcedureIndicationsSectionIndication'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r7aq0l9xEey5t-mahoHmrg" base_Class="_gSUdsDVzEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D8XVIn3sEeyivuDeOiJBMg" base_Class="_gSUdsDVzEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProcedureSpecimensTakenSectionTemplateId ProcedureSpecimensTakenSectionCode ProcedureSpecimensTakenSectionCodeP ProcedureSpecimensTakenSectionText ProcedureSpecimensTakenSectionTitle' templateId.root='2.16.840.1.113883.10.20.22.2.31' code.code='59773-2' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Procedure Specimens Taken'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r7gKYF9xEey5t-mahoHmrg" base_Class="_iy8nYDVzEeGaW4kr-GbV8Q">
+  <Ecore:EClass xmi:id="_D8c0sH3sEeyivuDeOiJBMg" base_Class="_iy8nYDVzEeGaW4kr-GbV8Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SubjectiveSectionTemplateId SubjectiveSectionCode SubjectiveSectionCodeP SubjectiveSectionText SubjectiveSectionTitle' templateId.root='2.16.840.1.113883.10.20.21.2.2' code.code='61150-9' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Subjective'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_r8lIcF9xEey5t-mahoHmrg" base_Class="_R-vIoDssEeGvzMYhXuqAEA">
+  <Ecore:EClass xmi:id="_D9U-cH3sEeyivuDeOiJBMg" base_Class="_R-vIoDssEeGvzMYhXuqAEA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='GeneralHeaderConstraintsTemplateId ConsultationNoteHasAnAssementAndPlanSectionOrIndividualAssementAndPlanSections ConsultationNoteDoesNotHaveIndividualAssementAndPlanSectionsWhenAssementAndPlanSectionPresent ConsultationNoteDoesNotHaveChiefComplaintAndReasonForVisitWithChiefComplaintSectionOrReasonSection ConsultationNoteHasReasonForReferralOrReasonForVisit GeneralHeaderConstraintsCode GeneralHeaderConstraintsCodeP ConsultationNoteComponentOf ConsultationNoteHistoryOfPresentIllness ConsultationNoteInFulfillmentOf ConsultationNoteComponentOfEncompassingEncounter2ResponsiblePartyAssignedEntityHasPersonOrganizationOrBoth ConsultationNoteComponentOfEncompassingEncounter2ResponsiblePartyAssignedEntity ConsultationNoteComponentOfEncompassingEncounter2EncounterParticipantAssignedEntityHasPersonOrganizationOrBoth ConsultationNoteComponentOfEncompassingEncounter2EncounterParticipantAssignedEntity ConsultationNoteComponentOfEncompassingEncounter2PreciseToTheDay ConsultationNoteComponentOfEncompassingEncounter2EffectiveTime ConsultationNoteComponentOfEncompassingEncounter2Id ConsultationNoteComponentOfEncompassingEncounter ConsultationNoteInFulfillmentOfOrderId ConsultationNoteInFulfillmentOfOrder' templateId.root='2.16.840.1.113883.10.20.22.1.4' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.GeneralHeaderConstraintsCode='GeneralHeaderConstraintsCodeP' constraints.validation.info='ConsultationNoteAssessmentSection ConsultationNoteAssessmentAndPlanSection ConsultationNotePlanOfCareSection ConsultationNoteReasonForReferralSection ConsultationNoteReasonForVisitSection ConsultationNoteAllergiesSection ConsultationNoteChiefComplaintSection ConsultationNoteChiefComplaintAndReasonForVisitSection ConsultationNoteFamilyHistorySection ConsultationNoteGeneralStatusSection ConsultationNoteHistoryOfPastIllnessSection ConsultationNoteImmunizationsSection ConsultationNoteMedicationsSectionEntriesOptional ConsultationNoteProblemSectionEntriesOptional ConsultationNoteProceduresSectionEntriesOptional ConsultationNoteResultsSectionEntriesOptional ConsultationNoteReviewOfSystemsSection ConsultationNoteSocialHistorySection ConsultationNoteVitalSignsSectionEntriesOptional ConsultationNoteComponentOfEncompassingEncounter2PreciseToTheSecond ConsultationNoteComponentOfEncompassingEncounter2ResponsibleParty ConsultationNoteComponentOfEncompassingEncounter2EncounterParticipant' constraints.validation.warning='ConsultationNotePhysicalExamSection ConsultationNoteComponentOfEncompassingEncounter2PreciseToTheMinute ConsultationNoteComponentOfEncompassingEncounter2IfMorePreciseThanDayIncludeTimeZoneOffset' constraints.validation.query='ConsultationNoteComponentOfEncompassingEncounter2ResponsiblePartyAssignedEntityHasPersonOrganizationOrBoth ConsultationNoteComponentOfEncompassingEncounter2ResponsiblePartyAssignedEntity ConsultationNoteComponentOfEncompassingEncounter2EncounterParticipantAssignedEntityHasPersonOrganizationOrBoth ConsultationNoteComponentOfEncompassingEncounter2EncounterParticipantAssignedEntity ConsultationNoteComponentOfEncompassingEncounter2PreciseToTheDay ConsultationNoteComponentOfEncompassingEncounter2PreciseToTheMinute ConsultationNoteComponentOfEncompassingEncounter2PreciseToTheSecond ConsultationNoteComponentOfEncompassingEncounter2IfMorePreciseThanDayIncludeTimeZoneOffset ConsultationNoteComponentOfEncompassingEncounter2EffectiveTime ConsultationNoteComponentOfEncompassingEncounter2Id ConsultationNoteComponentOfEncompassingEncounter2ResponsibleParty ConsultationNoteComponentOfEncompassingEncounter2EncounterParticipant ConsultationNoteComponentOfEncompassingEncounter ConsultationNoteInFulfillmentOfOrderId ConsultationNoteInFulfillmentOfOrder'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolConsultationNoteComponentOf constraints.validation.error='ConsultationNoteComponentOfEncompassingEncounter'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolConsultationNoteComponentOfEncompassingEncounter2 constraints.validation.error='ConsultationNoteComponentOfEncompassingEncounter2PreciseToTheDay ConsultationNoteComponentOfEncompassingEncounter2EffectiveTime ConsultationNoteComponentOfEncompassingEncounter2Id' constraints.validation.warning='ConsultationNoteComponentOfEncompassingEncounter2PreciseToTheMinute ConsultationNoteComponentOfEncompassingEncounter2IfMorePreciseThanDayIncludeTimeZoneOffset' constraints.validation.info='ConsultationNoteComponentOfEncompassingEncounter2PreciseToTheSecond ConsultationNoteComponentOfEncompassingEncounter2ResponsibleParty ConsultationNoteComponentOfEncompassingEncounter2EncounterParticipant'</annotation>
@@ -46857,24 +46857,24 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolConsultationNoteInFulfillmentOf constraints.validation.error='ConsultationNoteInFulfillmentOfOrder'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolConsultationNoteInFulfillmentOfOrder constraints.validation.error='ConsultationNoteInFulfillmentOfOrderId'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_sBePgF9xEey5t-mahoHmrg" base_Class="_W8pI4DszEeGvzMYhXuqAEA">
+  <Ecore:EClass xmi:id="_EBJHcH3sEeyivuDeOiJBMg" base_Class="_W8pI4DszEeGvzMYhXuqAEA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AssessmentSectionTemplateId AssessmentSectionCode AssessmentSectionCodeP AssessmentSectionText AssessmentSectionTitle' templateId.root='2.16.840.1.113883.10.20.22.2.8' code.code='51848-0' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Assessments'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_sU9zQl9xEey5t-mahoHmrg" base_Class="_-Qa60D1jEeG3tde5scYNWA">
+  <Ecore:EClass xmi:id="_ESHisH3sEeyivuDeOiJBMg" base_Class="_-Qa60D1jEeG3tde5scYNWA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='GeneralHeaderConstraintsTemplateId HistoryAndPhysicalNoteHasAnAssementAndPlanSectionOrIndividualAssementAndPlanSections HistoryAndPhysicalNoteDoesNotHaveIndividualAssementAndPlanSectionsWhenAssementAndPlanSectionPresent HistoryAndPhysicalNoteHasChiefComplaintAndReasonForVisitChiefComplaintOrReasonForVisit HistoryAndPhysicalNoteDoesNotHaveChiefComplaintAndReasonForVisitWithChiefComplaintSectionOrReasonSection GeneralHeaderConstraintsCode GeneralHeaderConstraintsCodeP HistoryAndPhysicalNoteComponentOf HistoryAndPhysicalNoteAllergiesSectionEntriesOptional HistoryAndPhysicalNoteFamilyHistorySection HistoryAndPhysicalNoteGeneralStatusSection HistoryAndPhysicalNoteHistoryOfPastIllnessSection HistoryAndPhysicalNoteMedicationsSectionEntriesOptional HistoryAndPhysicalNotePhysicalExamSection HistoryAndPhysicalNoteResultsSectionEntriesOptional HistoryAndPhysicalNoteReviewOfSystemsSection HistoryAndPhysicalNoteSocialHistorySection HistoryAndPhysicalNoteVitalSignsSectionEntriesOptional HistoryAndPhysicalNoteComponentOfEncompassingEncounter4ResponsiblePartyAssignedEntityHasPersonOrOrganization HistoryAndPhysicalNoteComponentOfEncompassingEncounter4ResponsiblePartyAssignedEntity HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EncounterParticipantAssignedEntityHasPersonOrOrganization HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EncounterParticipantAssignedEntity HistoryAndPhysicalNoteComponentOfEncompassingEncounter4PreciseToTheDay HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EffectiveTime HistoryAndPhysicalNoteComponentOfEncompassingEncounter4Id HistoryAndPhysicalNoteComponentOfEncompassingEncounter' templateId.root='2.16.840.1.113883.10.20.22.1.3' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.GeneralHeaderConstraintsCode='GeneralHeaderConstraintsCodeP' constraints.validation.info='HistoryAndPhysicalNoteInFulfillmentOf HistoryAndPhysicalNoteAssessmentSection HistoryAndPhysicalNotePlanOfCareSection HistoryAndPhysicalNoteAssessmentAndPlanSection HistoryAndPhysicalNoteChiefComplaintSection HistoryAndPhysicalNoteChiefComplaintAndReasonForVisitSection HistoryAndPhysicalNoteReasonForVisitSection HistoryAndPhysicalNoteImmunizationsSectionEntriesOptional HistoryAndPhysicalNoteProblemSectionEntriesOptional HistoryAndPhysicalNoteProceduresSectionEntriesOptional HistoryAndPhysicalNoteInstructionsSection HistoryAndPhysicalNoteComponentOfEncompassingEncounter4PreciseToTheSecond HistoryAndPhysicalNoteComponentOfEncompassingEncounter4Location HistoryAndPhysicalNoteComponentOfEncompassingEncounter4ResponsibleParty HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EncounterParticipant' constraints.validation.warning='HistoryAndPhysicalNoteHistoryOfPresentIllnessSection HistoryAndPhysicalNoteComponentOfEncompassingEncounter4PreciseToTheMinute HistoryAndPhysicalNoteComponentOfEncompassingEncounter4IfMorePreciseThanDayIncludeTimeZoneOffset' constraints.validation.query='HistoryAndPhysicalNoteComponentOfEncompassingEncounter4ResponsiblePartyAssignedEntityHasPersonOrOrganization HistoryAndPhysicalNoteComponentOfEncompassingEncounter4ResponsiblePartyAssignedEntity HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EncounterParticipantAssignedEntityHasPersonOrOrganization HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EncounterParticipantAssignedEntity HistoryAndPhysicalNoteComponentOfEncompassingEncounter4PreciseToTheDay HistoryAndPhysicalNoteComponentOfEncompassingEncounter4PreciseToTheMinute HistoryAndPhysicalNoteComponentOfEncompassingEncounter4PreciseToTheSecond HistoryAndPhysicalNoteComponentOfEncompassingEncounter4IfMorePreciseThanDayIncludeTimeZoneOffset HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EffectiveTime HistoryAndPhysicalNoteComponentOfEncompassingEncounter4Id HistoryAndPhysicalNoteComponentOfEncompassingEncounter4Location HistoryAndPhysicalNoteComponentOfEncompassingEncounter4ResponsibleParty HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EncounterParticipant HistoryAndPhysicalNoteComponentOfEncompassingEncounter'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolHistoryAndPhysicalNoteComponentOf constraints.validation.error='HistoryAndPhysicalNoteComponentOfEncompassingEncounter'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolHistoryAndPhysicalNoteComponentOfEncompassingEncounter4 constraints.validation.error='HistoryAndPhysicalNoteComponentOfEncompassingEncounter4PreciseToTheDay HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EffectiveTime HistoryAndPhysicalNoteComponentOfEncompassingEncounter4Id' constraints.validation.warning='HistoryAndPhysicalNoteComponentOfEncompassingEncounter4PreciseToTheMinute HistoryAndPhysicalNoteComponentOfEncompassingEncounter4IfMorePreciseThanDayIncludeTimeZoneOffset' constraints.validation.info='HistoryAndPhysicalNoteComponentOfEncompassingEncounter4PreciseToTheSecond HistoryAndPhysicalNoteComponentOfEncompassingEncounter4Location HistoryAndPhysicalNoteComponentOfEncompassingEncounter4ResponsibleParty HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EncounterParticipant'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolHistoryAndPhysicalNoteComponentOfEncompassingEncounter4ResponsibleParty constraints.validation.error='HistoryAndPhysicalNoteComponentOfEncompassingEncounter4ResponsiblePartyAssignedEntityHasPersonOrOrganization HistoryAndPhysicalNoteComponentOfEncompassingEncounter4ResponsiblePartyAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolHistoryAndPhysicalNoteComponentOfEncompassingEncounter4EncounterParticipant constraints.validation.error='HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EncounterParticipantAssignedEntityHasPersonOrOrganization HistoryAndPhysicalNoteComponentOfEncompassingEncounter4EncounterParticipantAssignedEntity'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_sl4kIF9xEey5t-mahoHmrg" base_Class="_xe9MsD4iEeGhnL_c4sBHGg">
+  <Ecore:EClass xmi:id="_Ef6HEH3sEeyivuDeOiJBMg" base_Class="_xe9MsD4iEeGhnL_c4sBHGg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='GeneralHeaderConstraintsTemplateId GeneralHeaderConstraintsCode GeneralHeaderConstraintsCodeP OperativeNoteDocumentationOf OperativeNoteAnesthesiaSection OperativeNoteComplicationsSection OperativeNotePostoperativeDiagnosisSection OperativeNotePreoperativeDiagnosisSection OperativeNoteProcedureEstimatedBloodLossSection OperativeNoteProcedureFindingsSection OperativeNoteProcedureSpecimensTakenSection OperativeNoteProcedureDescriptionSection OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntityCode OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntityCodeP OperativeNoteDocumentationOfServiceEventPrimaryPerformerTypeCode OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntity OperativeNoteDocumentationOfServiceEventProcedureCodes OperativeNoteDocumentationOfServiceEventEffectiveTimeHasLow OperativeNoteDocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth OperativeNoteDocumentationOfServiceEventEffectiveTimeNoHighIfWidth OperativeNoteDocumentationOfServiceEventPreciseToTheDay OperativeNoteDocumentationOfServiceEventCode OperativeNoteDocumentationOfServiceEventEffectiveTime OperativeNoteDocumentationOfServiceEventPrimaryPerformer OperativeNoteDocumentationOfServiceEvent' templateId.root='2.16.840.1.113883.10.20.22.1.7' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.GeneralHeaderConstraintsCode='GeneralHeaderConstraintsCodeP' constraints.validation.info='OperativeNoteProcedureImplantsSection OperativeNoteOperativeNoteFluidSection OperativeNoteOperativeNoteSurgicalProcedureSection OperativeNotePlanOfCareSection OperativeNotePlannedProcedureSection OperativeNoteProcedureDispositionSection OperativeNoteProcedureIndicationsSection OperativeNoteSurgicalDrainsSection OperativeNoteDocumentationOfServiceEventPreciseToTheSecond' constraints.validation.query='OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntityCode OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntityCodeP OperativeNoteDocumentationOfServiceEventPrimaryPerformerTypeCode OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntity OperativeNoteDocumentationOfServiceEventProcedureCodes OperativeNoteDocumentationOfServiceEventEffectiveTimeHasLow OperativeNoteDocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth OperativeNoteDocumentationOfServiceEventEffectiveTimeNoHighIfWidth OperativeNoteDocumentationOfServiceEventPreciseToTheDay OperativeNoteDocumentationOfServiceEventPreciseToTheMinute OperativeNoteDocumentationOfServiceEventPreciseToTheSecond OperativeNoteDocumentationOfServiceEventIfMorePreciseThanDayIncludeTimeZoneOffset OperativeNoteDocumentationOfServiceEventCode OperativeNoteDocumentationOfServiceEventEffectiveTime OperativeNoteDocumentationOfServiceEventPrimaryPerformer OperativeNoteDocumentationOfServiceEvent' constraints.validation.warning='OperativeNoteDocumentationOfServiceEventPreciseToTheMinute OperativeNoteDocumentationOfServiceEventIfMorePreciseThanDayIncludeTimeZoneOffset'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolOperativeNoteDocumentationOf constraints.validation.error='OperativeNoteDocumentationOfServiceEvent'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolOperativeNoteDocumentationOfServiceEvent constraints.validation.error='OperativeNoteDocumentationOfServiceEventProcedureCodes OperativeNoteDocumentationOfServiceEventEffectiveTimeHasLow OperativeNoteDocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth OperativeNoteDocumentationOfServiceEventEffectiveTimeNoHighIfWidth OperativeNoteDocumentationOfServiceEventPreciseToTheDay OperativeNoteDocumentationOfServiceEventCode OperativeNoteDocumentationOfServiceEventEffectiveTime OperativeNoteDocumentationOfServiceEventPrimaryPerformer OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntityCode OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntityCodeP OperativeNoteDocumentationOfServiceEventPrimaryPerformerTypeCode ServiceEventOperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntity' constraints.validation.warning='OperativeNoteDocumentationOfServiceEventPreciseToTheMinute OperativeNoteDocumentationOfServiceEventIfMorePreciseThanDayIncludeTimeZoneOffset' constraints.validation.info='OperativeNoteDocumentationOfServiceEventPreciseToTheSecond' constraints.validation.query='OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntityCode OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntityCodeP OperativeNoteDocumentationOfServiceEventPrimaryPerformerTypeCode ServiceEventOperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolOperativeNoteDocumentationOfServiceEventPrimaryPerformer typeCode='PPRF' constraints.validation.error='OperativeNoteDocumentationOfServiceEventPrimaryPerformerTypeCode OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolOperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntity code.codeSystem='2.16.840.1.113883.6.101' code.codeSystemName='NUCC Health Care Provider Taxonomy' constraints.validation.error='OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntityCode OperativeNoteDocumentationOfServiceEventPrimaryPerformerAssignedEntityCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_sySocl9xEey5t-mahoHmrg" base_Class="_LuYEsD7YEeGvOdejHZ7dYg">
+  <Ecore:EClass xmi:id="_EpncsH3sEeyivuDeOiJBMg" base_Class="_LuYEsD7YEeGvOdejHZ7dYg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='GeneralHeaderConstraintsTemplateId ProcedureNoteHasAnAssementAndPlanSectionOrIndividualAssementAndPlanSections ProcedureNoteDoesNotHaveIndividualAssementAndPlanSectionsWhenAssementAndPlanSectionPresent ProcedureNoteDoesNotHaveChiefComplaintAndReasonForVisitWithChiefComplaintSectionOrReasonSection ProcedureNoteSectionTitles GeneralHeaderConstraintsCode GeneralHeaderConstraintsCodeP ProcedureNoteComplicationsSection ProcedureNotePostprocedureDiagnosisSection ProcedureNoteProcedureDescriptionSection ProcedureNoteProcedureIndicationsSection ProcedureNoteDocumentationOf ProcedureNoteComponentOfEncompassingEncounter5LocationHealthCareFacilityId ProcedureNoteComponentOfEncompassingEncounter5LocationHealthCareFacility ProcedureNoteComponentOfEncompassingEncounter5EncounterParticipantTypeCode ProcedureNoteComponentOfEncompassingEncounter5Code ProcedureNoteComponentOfEncompassingEncounter5Location ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntityCode ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerTypeCode ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntity ProcedureNoteDocumentationOfServiceEvent1ProcedureCodes ProcedureNoteDocumentationOfServiceEvent1EffectiveTimeHasLow ProcedureNoteDocumentationOfServiceEvent1EffectiveTimeHasHighWhenNoWidth ProcedureNoteDocumentationOfServiceEvent1EffectiveTimeNoHighIfWidth ProcedureNoteDocumentationOfServiceEvent1PreciseToTheDay ProcedureNoteDocumentationOfServiceEvent1Code ProcedureNoteDocumentationOfServiceEvent1EffectiveTime ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformer ProcedureNoteDocumentationOfServiceEvent1' templateId.root='2.16.840.1.113883.10.20.22.1.6' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.GeneralHeaderConstraintsCode='GeneralHeaderConstraintsCodeP' constraints.validation.warning='ProcedureNoteComponentOf ProcedureNoteComponentOfEncompassingEncounter5 ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntityCodeP ProcedureNoteDocumentationOfServiceEvent1PreciseToTheMinute ProcedureNoteDocumentationOfServiceEvent1IfMorePreciseThanDayIncludeTimeZoneOffset' constraints.validation.info='ProcedureNoteAssessmentSection ProcedureNotePlanOfCareSection ProcedureNoteAssessmentAndPlanSection ProcedureNoteAllergiesSectionEntriesOptional ProcedureNoteAnesthesiaSection ProcedureNoteChiefComplaintSection ProcedureNoteChiefComplaintAndReasonForVisitSection ProcedureNoteFamilyHistorySection ProcedureNoteHistoryOfPastIllnessSection ProcedureNoteHistoryOfPresentIllnessSection ProcedureNoteMedicalHistorySection ProcedureNoteMedicationsSectionEntriesOptional ProcedureNoteMedicationsAdministeredSection ProcedureNotePhysicalExamSection ProcedureNotePlannedProcedureSection ProcedureNoteProcedureDispositionSection ProcedureNoteProcedureEstimatedBloodLossSection ProcedureNoteProcedureFindingsSection ProcedureNoteProcedureImplantsSection ProcedureNoteProcedureSpecimensTakenSection ProcedureNoteProceduresSectionEntriesOptional ProcedureNoteReasonForVisitSection ProcedureNoteReviewOfSystemsSection ProcedureNoteSocialHistorySection ProcedureNoteParticipant1 ProcedureNoteComponentOfEncompassingEncounter5EncounterParticipant ProcedureNoteDocumentationOfServiceEvent1PreciseToTheSecond' constraints.validation.query='ProcedureNoteComponentOfEncompassingEncounter5LocationHealthCareFacilityId ProcedureNoteComponentOfEncompassingEncounter5LocationHealthCareFacility ProcedureNoteComponentOfEncompassingEncounter5EncounterParticipantTypeCode ProcedureNoteComponentOfEncompassingEncounter5Code ProcedureNoteComponentOfEncompassingEncounter5Location ProcedureNoteComponentOfEncompassingEncounter5EncounterParticipant ProcedureNoteComponentOfEncompassingEncounter5 ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntityCodeP ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntityCode ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerTypeCode ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntity ProcedureNoteDocumentationOfServiceEvent1ProcedureCodes ProcedureNoteDocumentationOfServiceEvent1EffectiveTimeHasLow ProcedureNoteDocumentationOfServiceEvent1EffectiveTimeHasHighWhenNoWidth ProcedureNoteDocumentationOfServiceEvent1EffectiveTimeNoHighIfWidth ProcedureNoteDocumentationOfServiceEvent1PreciseToTheDay ProcedureNoteDocumentationOfServiceEvent1PreciseToTheMinute ProcedureNoteDocumentationOfServiceEvent1PreciseToTheSecond ProcedureNoteDocumentationOfServiceEvent1IfMorePreciseThanDayIncludeTimeZoneOffset ProcedureNoteDocumentationOfServiceEvent1Code ProcedureNoteDocumentationOfServiceEvent1EffectiveTime ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformer ProcedureNoteDocumentationOfServiceEvent1' constraints.validation.dependOn.ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntityCode='ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntityCodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureNoteComponentOf constraints.validation.warning='ProcedureNoteComponentOfEncompassingEncounter5'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureNoteComponentOfEncompassingEncounter5 constraints.validation.error='ProcedureNoteComponentOfEncompassingEncounter5Code ProcedureNoteComponentOfEncompassingEncounter5Location ProcedureNoteComponentOfEncompassingEncounter5EncounterParticipantTypeCode' constraints.validation.info='ProcedureNoteComponentOfEncompassingEncounter5EncounterParticipant' constraints.validation.query='ProcedureNoteComponentOfEncompassingEncounter5EncounterParticipantTypeCode'</annotation>
@@ -46886,7 +46886,7 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureNoteDocumentationOfServiceEvent1PrimaryPerformer typeCode='PPRF' constraints.validation.error='ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerTypeCode ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntity code.codeSystem='2.16.840.1.113883.6.101' code.codeSystemName='NUCC Health Care Provider Taxonomy' constraints.validation.error='ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntityCode' constraints.validation.warning='ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntityCodeP' constraints.validation.dependOn.ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntityCode='ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntityCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_tFWHUF9xEey5t-mahoHmrg" base_Class="_UBzvED_LEeGXieeKs7NJjA">
+  <Ecore:EClass xmi:id="_E5JGcn3sEeyivuDeOiJBMg" base_Class="_UBzvED_LEeGXieeKs7NJjA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='GeneralHeaderConstraintsTemplateId ProgressNoteHasAnAssementAndPlanSectionOrIndividualAssementAndPlanSections ProgressNoteDoesNotHaveIndividualAssementAndPlanSectionsWhenAssementAndPlanSectionPresent GeneralHeaderConstraintsCode GeneralHeaderConstraintsCodeP ProgressNoteComponentOf ProgressNoteDocumentationOfServiceEvent2EffectiveTimeHigh ProgressNoteDocumentationOfServiceEvent2PreciseToTheDay ProgressNoteDocumentationOfServiceEvent2TemplateId ProgressNoteDocumentationOfServiceEvent2ClassCode ProgressNoteDocumentationOfServiceEvent2 ProgressNoteComponentOfEncompassingEncounter6LocationHealthCareFacility1Id ProgressNoteComponentOfEncompassingEncounter6LocationHealthCareFacility ProgressNoteComponentOfEncompassingEncounter6PreciseToTheDay ProgressNoteComponentOfEncompassingEncounter6EffectiveTime ProgressNoteComponentOfEncompassingEncounter6Id ProgressNoteComponentOfEncompassingEncounter6Location ProgressNoteComponentOfEncompassingEncounter6' templateId.root='2.16.840.1.113883.10.20.22.1.9' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.GeneralHeaderConstraintsCode='GeneralHeaderConstraintsCodeP' constraints.validation.warning='ProgressNoteDocumentationOf ProgressNoteDocumentationOfServiceEvent2EffectiveTimeLow ProgressNoteDocumentationOfServiceEvent2PreciseToTheMinute ProgressNoteDocumentationOfServiceEvent2IfMorePreciseThanDayIncludeTimeZoneOffset ProgressNoteDocumentationOfServiceEvent2EffectiveTime ProgressNoteComponentOfEncompassingEncounter6PreciseToTheMinute ProgressNoteComponentOfEncompassingEncounter6IfMorePreciseThanDayIncludeTimeZoneOffset' constraints.validation.info='ProgressNoteAssessmentSection ProgressNotePlanOfCareSection ProgressNoteAssessmentAndPlanSection ProgressNoteAllergiesSectionEntriesOptional ProgressNoteChiefComplaintSection ProgressNoteInterventionsSection ProgressNoteMedicationsSectionEntriesOptional ProgressNoteObjectiveSection ProgressNotePhysicalExamSection ProgressNoteProblemSectionEntriesOptional ProgressNoteResultsSectionEntriesOptional ProgressNoteReviewOfSystemsSection ProgressNoteSubjectiveSection ProgressNoteVitalSignsSectionEntriesOptional ProgressNoteInstructionsSection ProgressNoteDocumentationOfServiceEvent2PreciseToTheSecond ProgressNoteComponentOfEncompassingEncounter6PreciseToTheSecond' constraints.validation.query='ProgressNoteDocumentationOfServiceEvent2EffectiveTimeLow ProgressNoteDocumentationOfServiceEvent2EffectiveTimeHigh ProgressNoteDocumentationOfServiceEvent2PreciseToTheDay ProgressNoteDocumentationOfServiceEvent2PreciseToTheMinute ProgressNoteDocumentationOfServiceEvent2PreciseToTheSecond ProgressNoteDocumentationOfServiceEvent2IfMorePreciseThanDayIncludeTimeZoneOffset ProgressNoteDocumentationOfServiceEvent2TemplateId ProgressNoteDocumentationOfServiceEvent2ClassCode ProgressNoteDocumentationOfServiceEvent2EffectiveTime ProgressNoteDocumentationOfServiceEvent2 ProgressNoteComponentOfEncompassingEncounter6LocationHealthCareFacility1Id ProgressNoteComponentOfEncompassingEncounter6LocationHealthCareFacility ProgressNoteComponentOfEncompassingEncounter6PreciseToTheDay ProgressNoteComponentOfEncompassingEncounter6PreciseToTheMinute ProgressNoteComponentOfEncompassingEncounter6PreciseToTheSecond ProgressNoteComponentOfEncompassingEncounter6IfMorePreciseThanDayIncludeTimeZoneOffset ProgressNoteComponentOfEncompassingEncounter6EffectiveTime ProgressNoteComponentOfEncompassingEncounter6Id ProgressNoteComponentOfEncompassingEncounter6Location ProgressNoteComponentOfEncompassingEncounter6'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProgressNoteDocumentationOf constraints.validation.error='ProgressNoteDocumentationOfServiceEvent2'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProgressNoteDocumentationOfServiceEvent2 constraints.validation.error='ProgressNoteDocumentationOfServiceEvent2TemplateId ProgressNoteDocumentationOfServiceEvent2EffectiveTimeHigh ProgressNoteDocumentationOfServiceEvent2PreciseToTheDay ProgressNoteDocumentationOfServiceEvent2ClassCode' templateId.root='2.16.840.1.113883.10.20.21.3.1' constraints.validation.warning='ProgressNoteDocumentationOfServiceEvent2EffectiveTimeLow ProgressNoteDocumentationOfServiceEvent2PreciseToTheMinute ProgressNoteDocumentationOfServiceEvent2IfMorePreciseThanDayIncludeTimeZoneOffset ProgressNoteDocumentationOfServiceEvent2EffectiveTime' constraints.validation.info='ProgressNoteDocumentationOfServiceEvent2PreciseToTheSecond' classCode='PCPR'</annotation>
@@ -46895,22 +46895,22 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProgressNoteComponentOfEncompassingEncounter6Location constraints.validation.error='ProgressNoteComponentOfEncompassingEncounter6LocationHealthCareFacility'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProgressNoteComponentOfEncompassingEncounter6LocationHealthCareFacility1 constraints.validation.error='ProgressNoteComponentOfEncompassingEncounter6LocationHealthCareFacility1Id'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_tVCwMF9xEey5t-mahoHmrg" base_Class="_0fjXAEEvEeGdmoWy_aLP0Q">
+  <Ecore:EClass xmi:id="_FGPHR33sEeyivuDeOiJBMg" base_Class="_0fjXAEEvEeGdmoWy_aLP0Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PostprocedureDiagnosisTemplateId PostprocedureDiagnosisClassCode PostprocedureDiagnosisMoodCode PostprocedureDiagnosisCode PostprocedureDiagnosisProblemObservation' templateId.root='2.16.840.1.113883.10.20.22.4.51' classCode='ACT' moodCode='EVN' code.code='59769-0' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Postprocedure Diagnosis'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_tWHuQl9xEey5t-mahoHmrg" base_Class="_0baBYEEwEeGdmoWy_aLP0Q">
+  <Ecore:EClass xmi:id="_FHMJgn3sEeyivuDeOiJBMg" base_Class="_0baBYEEwEeGdmoWy_aLP0Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PreoperativeDiagnosisTemplateId PreoperativeDiagnosisClassCode PreoperativeDiagnosisMoodCode PreoperativeDiagnosisCode PreoperativeDiagnosisProblemObservation' templateId.root='2.16.840.1.113883.10.20.22.4.65' classCode='ACT' moodCode='EVN' code.code='10219-4' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Preoperative Diagnosis'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_tXp_Ul9xEey5t-mahoHmrg" base_Class="_4qKukEE1EeGdmoWy_aLP0Q">
+  <Ecore:EClass xmi:id="_FIhmQH3sEeyivuDeOiJBMg" base_Class="_4qKukEE1EeGdmoWy_aLP0Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='InstructionsSectionTemplateId InstructionsSectionCode InstructionsSectionCodeP InstructionsSectionTitle InstructionsSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.45' code.code='69730-0' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Instructions' constraints.validation.warning='InstructionsSectionInstructions'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_tYg68F9xEey5t-mahoHmrg" base_Class="_LNP08EFGEeGorO80f-Cppg">
+  <Ecore:EClass xmi:id="_FJBVgH3sEeyivuDeOiJBMg" base_Class="_LNP08EFGEeGorO80f-Cppg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AdmissionMedicationTemplateId AdmissionMedicationClassCode AdmissionMedicationMoodCode AdmissionMedicationCodeP AdmissionMedicationMedicationActivity' templateId.root='2.16.840.1.113883.10.20.22.4.36' classCode='ACT' moodCode='EVN' code.code='42346-7' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Medications on Admission' constraints.validation.info='AdmissionMedicationCode' constraints.validation.dependOn.AdmissionMedicationCode='AdmissionMedicationCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_tZnHIF9xEey5t-mahoHmrg" base_Class="_5K6mAEFHEeGorO80f-Cppg">
+  <Ecore:EClass xmi:id="_FJ6GUX3sEeyivuDeOiJBMg" base_Class="_5K6mAEFHEeGorO80f-Cppg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HospitalAdmissionDiagnosisTemplateId HospitalAdmissionDiagnosisClassCode HospitalAdmissionDiagnosisMoodCode HospitalAdmissionDiagnosisCode HospitalAdmissionDiagnosisProblemObservation' templateId.root='2.16.840.1.113883.10.20.22.4.34' classCode='ACT' moodCode='EVN' code.code='46241-6' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Admission diagnosis'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_tl8S8F9xEey5t-mahoHmrg" base_Class="_XwBooEUuEeGdQ4KWAmnbhw">
+  <Ecore:EClass xmi:id="_FUiB8n3sEeyivuDeOiJBMg" base_Class="_XwBooEUuEeGdQ4KWAmnbhw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='GeneralHeaderConstraintsTemplateId DiagnosticImagingReportSectionsHaveText GeneralHeaderConstraintsCode GeneralHeaderConstraintsCodeP GeneralHeaderConstraintsId DiagnosticImagingReportInformant DiagnosticImagingReportDocumentationOf DiagnosticImagingReportFindingsSection DiagnosticImagingReportParticipantAssociatedEntityPersonName DiagnosticImagingReportParticipantAssociatedEntityAssociatedPerson DiagnosticImagingReportParticipantAssociatedEntity DiagnosticImagingReportDocumentationOfServiceEvent4ClassCode DiagnosticImagingReportDocumentationOfServiceEvent4Code DiagnosticImagingReportDocumentationOfServiceEvent3 DiagnosticImagingReportComponentOfEncompassingEncounter7ResponsiblePartyAssignedEntity DiagnosticImagingReportComponentOfEncompassingEncounter7PreciseToTheDay DiagnosticImagingReportComponentOfEncompassingEncounter7EffectiveTime DiagnosticImagingReportComponentOfEncompassingEncounter7Id DiagnosticImagingReportComponentOfEncompassingEncounter' templateId.root='2.16.840.1.113883.10.20.22.1.5' constraints.validation.warning='DiagnosticImagingReportUseDiagnosticImagingCode DiagnosticImagingReportAllSectionsHaveTitle DiagnosticImagingReportDICOMObjectCatalogSection DiagnosticImagingReportDocumentationOfServiceEvent4Id DiagnosticImagingReportDocumentationOfServiceEvent4PhysicianReadingStudyPerformer DiagnosticImagingReportComponentOfEncompassingEncounter7ResponsiblePartyAssignedEntityHasAssignPersonOrRepresentedOrganization DiagnosticImagingReportComponentOfEncompassingEncounter7PreciseToTheMinute DiagnosticImagingReportComponentOfEncompassingEncounter7IfMorePreciseThanDayIncludeTimeZoneOffset DiagnosticImagingReportComponentOfEncompassingEncounter7PhysicianofRecordParticipant' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.GeneralHeaderConstraintsCode='GeneralHeaderConstraintsCodeP' constraints.validation.info='DiagnosticImagingReportInformationRecipient DiagnosticImagingReportParticipant1 DiagnosticImagingReportInFulfillmentOf DiagnosticImagingReportRelatedDocument DiagnosticImagingReportComponentOf DiagnosticImagingReportComponentOfEncompassingEncounter7PreciseToTheSecond DiagnosticImagingReportComponentOfEncompassingEncounter7ResponsibleParty' constraints.validation.query='DiagnosticImagingReportParticipantAssociatedEntityPersonName DiagnosticImagingReportParticipantAssociatedEntityAssociatedPerson DiagnosticImagingReportParticipantAssociatedEntity DiagnosticImagingReportDocumentationOfServiceEvent4ClassCode DiagnosticImagingReportDocumentationOfServiceEvent4Code DiagnosticImagingReportDocumentationOfServiceEvent4Id DiagnosticImagingReportDocumentationOfServiceEvent4PhysicianReadingStudyPerformer DiagnosticImagingReportDocumentationOfServiceEvent3 DiagnosticImagingReportComponentOfEncompassingEncounter7ResponsiblePartyAssignedEntityHasAssignPersonOrRepresentedOrganization DiagnosticImagingReportComponentOfEncompassingEncounter7ResponsiblePartyAssignedEntity DiagnosticImagingReportComponentOfEncompassingEncounter7PreciseToTheDay DiagnosticImagingReportComponentOfEncompassingEncounter7PreciseToTheMinute DiagnosticImagingReportComponentOfEncompassingEncounter7PreciseToTheSecond DiagnosticImagingReportComponentOfEncompassingEncounter7IfMorePreciseThanDayIncludeTimeZoneOffset DiagnosticImagingReportComponentOfEncompassingEncounter7EffectiveTime DiagnosticImagingReportComponentOfEncompassingEncounter7Id DiagnosticImagingReportComponentOfEncompassingEncounter7PhysicianofRecordParticipant DiagnosticImagingReportComponentOfEncompassingEncounter7ResponsibleParty DiagnosticImagingReportComponentOfEncompassingEncounter'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDiagnosticImagingReportParticipant constraints.validation.error='DiagnosticImagingReportParticipantAssociatedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDiagnosticImagingReportParticipantAssociatedEntity constraints.validation.error='DiagnosticImagingReportParticipantAssociatedEntityAssociatedPerson'</annotation>
@@ -46922,113 +46922,113 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDiagnosticImagingReportComponentOfEncompassingEncounter7ResponsibleParty constraints.validation.error='DiagnosticImagingReportComponentOfEncompassingEncounter7ResponsiblePartyAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDiagnosticImagingReportComponentOfEncompassingEncounter7ResponsiblePartyAssignedEntity constraints.validation.warning='DiagnosticImagingReportComponentOfEncompassingEncounter7ResponsiblePartyAssignedEntityHasAssignPersonOrRepresentedOrganization'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_trjLsF9xEey5t-mahoHmrg" base_Class="_H1UdcEVEEeGAh_iQGJvI5w">
+  <Ecore:EClass xmi:id="_FY6ysH3sEeyivuDeOiJBMg" base_Class="_H1UdcEVEEeGAh_iQGJvI5w">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PhysicianReadingStudyPerformerTemplateId PhysicianReadingStudyPerformerTypeCode PhysicianReadingStudyPerformerAssignedEntity PhysicianReadingStudyPerformerGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheDayIVLTS PhysicianReadingStudyPerformerAssignedEntityHasDICOM PhysicianReadingStudyPerformerAssignedEntityHasAssignedPersonOrRepresentedOrganization PhysicianReadingStudyPerformerAssignedEntityId PhysicianReadingStudyPerformerAssignedEntityCode' templateId.root='2.16.840.1.113883.10.20.6.2.1' constraints.validation.info='PhysicianReadingStudyPerformerTime PhysicianReadingStudyPerformerGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheSecondIVLTS' typeCode='PRF' constraints.validation.query='PhysicianReadingStudyPerformerGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheDayIVLTS PhysicianReadingStudyPerformerGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheMinuteIVLTS PhysicianReadingStudyPerformerGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheSecondIVLTS PhysicianReadingStudyPerformerGeneralHeaderConstraintsUSRealmDateAndTimeDTIfMorePreciseThanDayIncludeTimeZoneOffsetIVLTS PhysicianReadingStudyPerformerAssignedEntityHasDICOM PhysicianReadingStudyPerformerAssignedEntityHasAssignedPersonOrRepresentedOrganization PhysicianReadingStudyPerformerAssignedEntityHasNationalProviderId PhysicianReadingStudyPerformerAssignedEntityId PhysicianReadingStudyPerformerAssignedEntityCode' constraints.validation.warning='PhysicianReadingStudyPerformerGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheMinuteIVLTS PhysicianReadingStudyPerformerGeneralHeaderConstraintsUSRealmDateAndTimeDTIfMorePreciseThanDayIncludeTimeZoneOffsetIVLTS PhysicianReadingStudyPerformerAssignedEntityHasNationalProviderId'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPhysicianReadingStudyPerformerAssignedEntity constraints.validation.error='PhysicianReadingStudyPerformerAssignedEntityHasDICOM PhysicianReadingStudyPerformerAssignedEntityHasAssignedPersonOrRepresentedOrganization PhysicianReadingStudyPerformerAssignedEntityId PhysicianReadingStudyPerformerAssignedEntityCode' constraints.validation.warning='PhysicianReadingStudyPerformerAssignedEntityHasNationalProviderId'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_tstCQF9xEey5t-mahoHmrg" base_Class="_H_izsEb1EeGp67IkyTw1fg">
+  <Ecore:EClass xmi:id="_FZ2m0n3sEeyivuDeOiJBMg" base_Class="_H_izsEb1EeGp67IkyTw1fg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PhysicianofRecordParticipantTemplateId PhysicianofRecordParticipantTypeCode PhysicianofRecordParticipantAssignedEntity PhysicianofRecordParticipantAssignedEntityHasDICOMOrNUCCCode PhysicianofRecordParticipantAssignedEntityCode PhysicianofRecordParticipantAssignedEntityId' templateId.root='2.16.840.1.113883.10.20.6.2.2' typeCode='ATND' constraints.validation.warning='PhysicianofRecordParticipantAssignedEntityAssignedPersonName PhysicianofRecordParticipantAssignedEntityHasNationalProviderId PhysicianofRecordParticipantAssignedEntityAssignedPerson' constraints.validation.query='PhysicianofRecordParticipantAssignedEntityAssignedPersonName PhysicianofRecordParticipantAssignedEntityHasDICOMOrNUCCCode PhysicianofRecordParticipantAssignedEntityHasNationalProviderId PhysicianofRecordParticipantAssignedEntityCode PhysicianofRecordParticipantAssignedEntityId PhysicianofRecordParticipantAssignedEntityAssignedPerson'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPhysicianofRecordParticipantAssignedEntity constraints.validation.error='PhysicianofRecordParticipantAssignedEntityHasDICOMOrNUCCCode PhysicianofRecordParticipantAssignedEntityCode PhysicianofRecordParticipantAssignedEntityId' constraints.validation.warning='PhysicianofRecordParticipantAssignedEntityHasNationalProviderId PhysicianofRecordParticipantAssignedEntityAssignedPerson'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPhysicianofRecordParticipantAssignedEntityAssignedPerson constraints.validation.warning='PhysicianofRecordParticipantAssignedEntityAssignedPersonName'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_tu3lcV9xEey5t-mahoHmrg" base_Class="_vjf-wEb4EeGp67IkyTw1fg">
+  <Ecore:EClass xmi:id="_FbsZ4H3sEeyivuDeOiJBMg" base_Class="_vjf-wEb4EeGp67IkyTw1fg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='StudyActTemplateId StudyActIdsHaveRoot StudyActNoIdExtension StudyActReferenceValue StudyActClassCode StudyActMoodCode StudyActId StudyActCode StudyActSeriesAct' templateId.root='2.16.840.1.113883.10.20.6.2.6' constraints.validation.warning='StudyActTextReference StudyActTextReferenceValue StudyActEffectiveTime' classCode='ACT' moodCode='EVN' code.code='113014' code.codeSystem='1.2.840.10008.2.16.4' code.codeSystemName='DCM' constraints.validation.info='StudyActText'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_tvCkkF9xEey5t-mahoHmrg" base_Class="_N2wscEb6EeGp67IkyTw1fg">
+  <Ecore:EClass xmi:id="_Fb1j0n3sEeyivuDeOiJBMg" base_Class="_N2wscEb6EeGp67IkyTw1fg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SeriesActTemplateId SeriesActIdHasRoot SeriesActIdNoExtension SeriesActCodeQualifier SeriesActCodeQualifierCode SeriesActCodeQualifierValue SeriesActCodeQualifierValueCode SeriesActClassCode SeriesActMoodCode SeriesActCode SeriesActId SeriesActSOPInstanceObservation' templateId.root='2.16.840.1.113883.10.20.22.4.63' classCode='ACT' moodCode='EVN' code.code='113015' code.codeSystem='1.2.840.10008.2.16.4' code.codeSystemName='DCM' constraints.validation.warning='SeriesActEffectiveTime' constraints.validation.info='SeriesActText'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_tvNjsl9xEey5t-mahoHmrg" base_Class="_9o7WcEb6EeGp67IkyTw1fg">
+  <Ecore:EClass xmi:id="_Fb-twX3sEeyivuDeOiJBMg" base_Class="_9o7WcEb6EeGp67IkyTw1fg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SOPInstanceObservationTemplateId SOPInstanceObservationEffectiveTimeHasValue SOPInstanceObservationEffectiveTimeNoLow SOPInstanceObservationEffectiveTimeNoHigh SOPInstanceObservationTextMediaType SOPInstanceObservationTextReference SOPInstanceObservationTextReferenceValue SOPInstanceObservationClassCode SOPInstanceObservationId SOPInstanceObservationMoodCode SOPInstanceObservationCode SOPInstanceObservationCodeP' templateId.root='2.16.840.1.113883.10.20.6.2.8' classCode='DGIMG' constraints.validation.warning='SOPInstanceObservationEffectiveTime SOPInstanceObservationText' moodCode='EVN' code.codeSystem='1.2.840.10008.2.6.1' code.codeSystemName='DCMUID' constraints.validation.dependOn.SOPInstanceObservationCode='SOPInstanceObservationCodeP' constraints.validation.info='SOPInstanceObservationSOPInstanceObservation SOPInstanceObservationPurposeofReferenceObservation SOPInstanceObservationReferencedFramesObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_tva_EV9xEey5t-mahoHmrg" base_Class="_J-F8UEb7EeGp67IkyTw1fg">
+  <Ecore:EClass xmi:id="_FcJF0H3sEeyivuDeOiJBMg" base_Class="_J-F8UEb7EeGp67IkyTw1fg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PurposeofReferenceObservationTemplateId PurposeofReferenceObservationClassCode PurposeofReferenceObservationCode PurposeofReferenceObservationMoodCode' templateId.root='2.16.840.1.113883.10.20.6.2.9' constraints.validation.warning='PurposeofReferenceObservationCodeCodeSystem PurposeofReferenceObservationValue' classCode='OBS' moodCode='EVN' value.codeSystem='1.2.840.10008.2.16.4' value.codeSystemName='DCM'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_twEfUl9xEey5t-mahoHmrg" base_Class="_1Zyf4Eb8EeGp67IkyTw1fg">
+  <Ecore:EClass xmi:id="_FcoOAn3sEeyivuDeOiJBMg" base_Class="_1Zyf4Eb8EeGp67IkyTw1fg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ReferencedFramesObservationTemplateId ReferencedFramesObservationClassCode ReferencedFramesObservationMoodCode ReferencedFramesObservationCode ReferencedFramesObservationBoundaryObservation' templateId.root='2.16.840.1.113883.10.20.6.2.10' classCode='ROIBND' moodCode='EVN' code.code='121190' code.codeSystem='1.2.840.10008.2.16.4' code.codeSystemName='DCM' code.displayName='Referenced Frames'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_twLNAF9xEey5t-mahoHmrg" base_Class="_9Yv6gEb8EeGp67IkyTw1fg">
+  <Ecore:EClass xmi:id="_FctGgn3sEeyivuDeOiJBMg" base_Class="_9Yv6gEb8EeGp67IkyTw1fg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='BoundaryObservationTemplateId BoundaryObservationClassCode BoundaryObservationCode BoundaryObservationMoodCode BoundaryObservationValue' templateId.root='2.16.840.1.113883.10.20.6.2.11' classCode='OBS' code.code='113036' code.codeSystem='1.2.840.10008.2.16.4' code.codeSystemName='DCM' code.displayName='Frames for Display' moodCode='EVN'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_twR6sV9xEey5t-mahoHmrg" base_Class="_9xjKIEb-EeGp67IkyTw1fg">
+  <Ecore:EClass xmi:id="_FcymEH3sEeyivuDeOiJBMg" base_Class="_9xjKIEb-EeGp67IkyTw1fg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='TextObservationTemplateId TextObservationReferenceValue TextObservationClassCode TextObservationMoodCode TextObservationCode TextObservationValue' templateId.root='2.16.840.1.113883.10.20.6.2.12' constraints.validation.warning='TextObservationTextReference TextObservationTextReferenceValue TextObservationEffectiveTime' classCode='OBS' moodCode='EVN' constraints.validation.info='TextObservationText TextObservationSOPInstanceObservation TextObservationQuantityMeasurementObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_twdg4V9xEey5t-mahoHmrg" base_Class="_Px2t4Eb_EeGp67IkyTw1fg">
+  <Ecore:EClass xmi:id="_Fc6h4n3sEeyivuDeOiJBMg" base_Class="_Px2t4Eb_EeGp67IkyTw1fg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='QuantityMeasurementObservationTemplateId QuantityMeasurementObservationClassCode QuantityMeasurementObservationMoodCode QuantityMeasurementObservationCode QuantityMeasurementObservationValue' templateId.root='2.16.840.1.113883.10.20.6.2.14' constraints.validation.warning='QuantityMeasurementObservationCodeCodeSystemDIR QuantityMeasurementObservationCodeCodeSystemDICOM QuantityMeasurementObservationEffectiveTime' classCode='OBS' moodCode='EVN' constraints.validation.info='QuantityMeasurementObservationSOPInstanceObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_twnR4l9xEey5t-mahoHmrg" base_Class="_pmiz8Eb_EeGp67IkyTw1fg">
+  <Ecore:EClass xmi:id="_FdBPkn3sEeyivuDeOiJBMg" base_Class="_pmiz8Eb_EeGp67IkyTw1fg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='CodeObservationsTemplateId CodeObservationsClassCode CodeObservationsMoodCode CodeObservationsCode CodeObservationsValue' templateId.root='2.16.840.1.113883.10.20.6.2.13' classCode='OBS' moodCode='EVN' constraints.validation.warning='CodeObservationsEffectiveTime' constraints.validation.info='CodeObservationsSOPInstanceObservation CodeObservationsQuantityMeasurementObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_twxC4F9xEey5t-mahoHmrg" base_Class="_crHC0EcAEeGp67IkyTw1fg">
+  <Ecore:EClass xmi:id="_FdH9Qn3sEeyivuDeOiJBMg" base_Class="_crHC0EcAEeGp67IkyTw1fg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProcedureContextTemplateId ProcedureContextEffectiveTimeValue ProcedureContextClassCode ProcedureContextMoodCode ProcedureContextCode' templateId.root='2.16.840.1.113883.10.20.6.2.5' classCode='ACT' moodCode='EVN' constraints.validation.warning='ProcedureContextEffectiveTime'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_uHx0sF9xEey5t-mahoHmrg" base_Class="_Ker6MOM2EeGfv4R-kzpM0g">
+  <Ecore:EClass xmi:id="_Fvp3sn3sEeyivuDeOiJBMg" base_Class="_Ker6MOM2EeGfv4R-kzpM0g">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='EncounterDiagnosisTemplateId EncounterDiagnosisClassCode EncounterDiagnosisMoodCode EncounterDiagnosisCode EncounterDiagnosisCodeP EncounterDiagnosisProblemObservation' templateId.root='2.16.840.1.113883.10.20.22.4.80' classCode='ACT' moodCode='EVN' code.code='29308-4' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Diagnosis' constraints.validation.dependOn.EncounterDiagnosisCode='EncounterDiagnosisCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_uKsl0F9xEey5t-mahoHmrg" base_Class="_RYJj0OWQEeGKmvzED_He2w">
+  <Ecore:EClass xmi:id="_Fx56cX3sEeyivuDeOiJBMg" base_Class="_RYJj0OWQEeGKmvzED_He2w">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SmokingStatusObservationTemplateId SmokingStatusObservationClassCode SmokingStatusObservationMoodCode SmokingStatusObservationCode SmokingStatusObservationStatusCode SmokingStatusObservationStatusCodeP SmokingStatusObservationEffectiveTime SmokingStatusObservationValue SmokingStatusObservationValueP SmokingStatusObservationCDCodeTermAssertionOrLoinc SmokingStatusObservationCDCode SmokingStatusObservationCDCodeSystem' templateId.root='2.16.840.1.113883.10.20.22.4.78' classCode='OBS' moodCode='EVN' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.query='SmokingStatusObservationCDCodeTermAssertionOrLoinc SmokingStatusObservationCDCode SmokingStatusObservationCDCodeSystem SmokingStatusObservationIVLTSCenter SmokingStatusObservationIVLTSHigh SmokingStatusObservationIVLTSLow SmokingStatusObservationIVLTSWidth' constraints.validation.warning='SmokingStatusObservationIVLTSCenter SmokingStatusObservationIVLTSHigh SmokingStatusObservationIVLTSLow SmokingStatusObservationIVLTSWidth'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolSmokingStatusObservationIVLTS constraints.validation.warning='SmokingStatusObservationIVLTSCenter SmokingStatusObservationIVLTSHigh SmokingStatusObservationIVLTSLow SmokingStatusObservationIVLTSWidth'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolSmokingStatusObservationCD constraints.validation.error='SmokingStatusObservationCDCodeTermAssertionOrLoinc SmokingStatusObservationCDCode SmokingStatusObservationCDCodeSystem'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_uMR6MV9xEey5t-mahoHmrg" base_Class="_gIH_QOWQEeGKmvzED_He2w">
+  <Ecore:EClass xmi:id="_Fy-4gH3sEeyivuDeOiJBMg" base_Class="_gIH_QOWQEeGKmvzED_He2w">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='TobaccoUseTemplateId TobaccoUseEffectiveTimeLow TobaccoUseClassCode TobaccoUseMoodCode TobaccoUseCode TobaccoUseStatusCode TobaccoUseStatusCodeP TobaccoUseEffectiveTime TobaccoUseValue TobaccoUseValueP TobaccoUseCDCodeTermAssertionOrLoinc TobaccoUseCDCode TobaccoUseCDCodeSystem' templateId.root='2.16.840.1.113883.10.20.22.4.85' classCode='OBS' moodCode='EVN' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.query='TobaccoUseCDCodeTermAssertionOrLoinc TobaccoUseCDCode TobaccoUseCDCodeSystem'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolTobaccoUseCD constraints.validation.error='TobaccoUseCDCodeTermAssertionOrLoinc TobaccoUseCDCode TobaccoUseCDCodeSystem'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_uPEIcF9xEey5t-mahoHmrg" base_Class="_Zi33YOYxEeGINOJ_SD9_dA">
+  <Ecore:EClass xmi:id="_F1INkn3sEeyivuDeOiJBMg" base_Class="_Zi33YOYxEeGINOJ_SD9_dA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AssessmentScaleObservationTemplateId AssessmentScaleObservationClassCode AssessmentScaleObservationMoodCode AssessmentScaleObservationCode AssessmentScaleObservationEffectiveTime AssessmentScaleObservationId AssessmentScaleObservationStatusCode AssessmentScaleObservationStatusCodeP AssessmentScaleObservationValue AssessmentScaleObservationReferenceRangeObservationRangeReferenceValue AssessmentScaleObservationReferenceRangeObservationRange' templateId.root='2.16.840.1.113883.10.20.22.4.69' constraints.validation.warning='AssessmentScaleObservationCodeCodeSystem AssessmentScaleObservationAssessmentScaleSupportingObservation AssessmentScaleObservationReferenceRangeObservationRangeTextReference AssessmentScaleObservationReferenceRangeObservationRangeText' constraints.validation.info='AssessmentScaleObservationInterpretationCodeTranslation AssessmentScaleObservationDerivationExpr AssessmentScaleObservationInterpretationCode AssessmentScaleObservationAuthor AssessmentScaleObservationReferenceRange AssessmentScaleObservationReferenceRangeObservationRangeTextReferenceValue' classCode='OBS' moodCode='EVN' statusCode.code='completed' constraints.validation.query='AssessmentScaleObservationReferenceRangeObservationRangeTextReference AssessmentScaleObservationReferenceRangeObservationRangeTextReferenceValue AssessmentScaleObservationReferenceRangeObservationRangeReferenceValue AssessmentScaleObservationReferenceRangeObservationRangeText AssessmentScaleObservationReferenceRangeObservationRange'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAssessmentScaleObservationReferenceRange constraints.validation.error='AssessmentScaleObservationReferenceRangeObservationRange'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAssessmentScaleObservationReferenceRangeObservationRange constraints.validation.warning='AssessmentScaleObservationReferenceRangeObservationRangeTextReference AssessmentScaleObservationReferenceRangeObservationRangeText' constraints.validation.info='AssessmentScaleObservationReferenceRangeObservationRangeTextReferenceValue' constraints.validation.error='AssessmentScaleObservationReferenceRangeObservationRangeReferenceValue'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_uQzN0V9xEey5t-mahoHmrg" base_Class="_1ZKPgOY2EeGINOJ_SD9_dA">
+  <Ecore:EClass xmi:id="_F2p3k33sEeyivuDeOiJBMg" base_Class="_1ZKPgOY2EeGINOJ_SD9_dA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AssessmentScaleSupportingObservationTemplateId AssessmentScaleSupportingObservationCodeCodeSystem AssessmentScaleSupportingObservationClassCode AssessmentScaleSupportingObservationMoodCode AssessmentScaleSupportingObservationCode AssessmentScaleSupportingObservationId AssessmentScaleSupportingObservationStatusCode AssessmentScaleSupportingObservationStatusCodeP AssessmentScaleSupportingObservationValue' templateId.root='2.16.840.1.113883.10.20.22.4.86' constraints.validation.info='AssessmentScaleSupportingObservationValueTranslation' classCode='OBS' moodCode='EVN' statusCode.code='completed'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_uRfKVl9xEey5t-mahoHmrg" base_Class="__pNCUOY-EeGINOJ_SD9_dA">
+  <Ecore:EClass xmi:id="_F3OfUH3sEeyivuDeOiJBMg" base_Class="__pNCUOY-EeGINOJ_SD9_dA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='CaregiverCharacteristicsTemplateId CaregiverCharacteristicsValueCodeSystem CaregiverCharacteristicsClassCode CaregiverCharacteristicsMoodCode CaregiverCharacteristicsId CaregiverCharacteristicsCode CaregiverCharacteristicsStatusCode CaregiverCharacteristicsStatusCodeP CaregiverCharacteristicsValue CaregiverCharacteristicsParticipant CaregiverCharacteristicsParticipantParticipantRoleClassCode CaregiverCharacteristicsParticipantTimeLow CaregiverCharacteristicsParticipantTypeCode CaregiverCharacteristicsParticipantParticipantRole' templateId.root='2.16.840.1.113883.10.20.22.4.72' classCode='OBS' moodCode='EVN' statusCode.code='completed' constraints.validation.query='CaregiverCharacteristicsParticipantParticipantRoleClassCode CaregiverCharacteristicsParticipantTimeLow CaregiverCharacteristicsParticipantTimeHigh CaregiverCharacteristicsParticipantTypeCode CaregiverCharacteristicsParticipantTime CaregiverCharacteristicsParticipantParticipantRole' constraints.validation.info='CaregiverCharacteristicsParticipantTimeHigh CaregiverCharacteristicsParticipantTime'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCaregiverCharacteristicsParticipant constraints.validation.error='CaregiverCharacteristicsParticipantTimeLow CaregiverCharacteristicsParticipantTypeCode CaregiverCharacteristicsParticipantParticipantRole' constraints.validation.info='CaregiverCharacteristicsParticipantTimeHigh CaregiverCharacteristicsParticipantTime' typeCode='IND'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCaregiverCharacteristicsParticipantParticipantRole classCode='CAREGIVER' constraints.validation.error='CaregiverCharacteristicsParticipantParticipantRoleClassCode'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_uT3v8V9xEey5t-mahoHmrg" base_Class="_6kIXMOZEEeGINOJ_SD9_dA">
+  <Ecore:EClass xmi:id="_F5E5cH3sEeyivuDeOiJBMg" base_Class="_6kIXMOZEEeGINOJ_SD9_dA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicationUseNoneKnownTemplateId MedicationUseNoneKnownReferenceValue MedicationUseNoneKnownClassCode MedicationUseNoneKnownMoodCode MedicationUseNoneKnownId MedicationUseNoneKnownCode MedicationUseNoneKnownCodeP MedicationUseNoneKnownStatusCode MedicationUseNoneKnownStatusCodeP MedicationUseNoneKnownValue MedicationUseNoneKnownValueP' templateId.root='2.16.840.1.113883.10.20.22.4.29' constraints.validation.warning='MedicationUseNoneKnownTextReference MedicationUseNoneKnownTextReferenceValue MedicationUseNoneKnownEffectiveTime' classCode='OBS' moodCode='EVN' code.code='ASSERTION' code.codeSystem='2.16.840.1.113883.5.4' code.codeSystemName='HL7ActCode' code.displayName='Assertion' constraints.validation.dependOn.MedicationUseNoneKnownCode='MedicationUseNoneKnownCodeP' statusCode.code='completed' constraints.validation.info='MedicationUseNoneKnownText' value.code='182904002' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' value.displayName='Drug treatment unknown'</annotation>
   </Ecore:EClass>
-  <CDA:ConformsTo xmi:id="_uVkZFl9xEey5t-mahoHmrg" base_Generalization="_JGpG8OZcEeGINOJ_SD9_dA"/>
-  <Ecore:EClass xmi:id="_uVlAIl9xEey5t-mahoHmrg" base_Class="_dXKPQOZbEeGINOJ_SD9_dA">
+  <CDA:ConformsTo xmi:id="_F6kHMH3sEeyivuDeOiJBMg" base_Generalization="_JGpG8OZcEeGINOJ_SD9_dA"/>
+  <Ecore:EClass xmi:id="_F6kHM33sEeyivuDeOiJBMg" base_Class="_dXKPQOZbEeGINOJ_SD9_dA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProblemObservationTemplateId ProblemObservationHasTextReferenceValue ProblemObservationHasOnsetDate ProblemObservationClassCode ProblemObservationMoodCode ProblemObservationId ProblemObservationCodeP ProblemObservationStatusCode ProblemObservationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.73' constraints.validation.warning='ProblemObservationHasTextReference ProblemObservationHasResolutionDate ProblemObservationCode ProblemObservationText ProblemObservationEffectiveTime ProblemObservationValue' classCode='OBS' moodCode='EVN' constraints.validation.info='ProblemObservationNegationInd CognitiveStatusProblemObservationMethodCode CognitiveStatusProblemObservationNonMedicinalSupplyActivity CognitiveStatusProblemObservationCaregiverCharacteristics CognitiveStatusProblemObservationAssessmentScaleObservation' code.code='373930000' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' code.displayName='Cognitive function finding' constraints.validation.dependOn.ProblemObservationCode='ProblemObservationCodeP' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.dependOn.ProblemObservationValue='ProblemObservationValueP'</annotation>
   </Ecore:EClass>
-  <CDA:ConformsTo xmi:id="_uW4AoF9xEey5t-mahoHmrg" base_Generalization="_gLy9QOZfEeGINOJ_SD9_dA"/>
-  <Ecore:EClass xmi:id="_uW5OwF9xEey5t-mahoHmrg" base_Class="_gkBM0OZbEeGINOJ_SD9_dA">
+  <CDA:ConformsTo xmi:id="_F7rhgH3sEeyivuDeOiJBMg" base_Generalization="_gLy9QOZfEeGINOJ_SD9_dA"/>
+  <Ecore:EClass xmi:id="_F7sIkH3sEeyivuDeOiJBMg" base_Class="_gkBM0OZbEeGINOJ_SD9_dA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ResultObservationTemplateId ResultObservationTextReferenceValue ResultObservationClassCode ResultObservationMoodCode ResultObservationId ResultObservationCodeP ResultObservationStatusCode ResultObservationStatusCodeP ResultObservationEffectiveTime ResultObservationValue CognitiveStatusResultObservationReferenceRangeObservationRangeNoCode CognitiveStatusResultObservationReferenceRangeObservationRange' templateId.root='2.16.840.1.113883.10.20.22.4.74' constraints.validation.warning='ResultObservationTextReference CognitiveStatusResultObservationValueDatatype ResultObservationCode ResultObservationText ResultObservationInterpretationCode CognitiveStatusResultObservationReferenceRange' classCode='OBS' moodCode='EVN' code.code='373930000' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' code.displayName='Cognitive function finding' constraints.validation.dependOn.ResultObservationCode='ResultObservationCodeP' statusCode.code='completed' constraints.validation.dependOn.ResultObservationStatusCode='ResultObservationStatusCodeP' constraints.validation.info='ResultObservationMethodCode ResultObservationTargetSiteCode CognitiveStatusResultObservationAuthor CognitiveStatusResultObservationNonMedicinalSupplyActivity CognitiveStatusResultObservationCaregiverCharacteristics CognitiveStatusResultObservationAssessmentScaleObservation' constraints.validation.query='CognitiveStatusResultObservationReferenceRangeObservationRangeNoCode CognitiveStatusResultObservationReferenceRangeObservationRange'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCognitiveStatusResultObservationReferenceRange constraints.validation.error='CognitiveStatusResultObservationReferenceRangeObservationRange'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCognitiveStatusResultObservationReferenceRangeObservationRange constraints.validation.error='CognitiveStatusResultObservationReferenceRangeObservationRangeNoCode'</annotation>
   </Ecore:EClass>
-  <CDA:ConformsTo xmi:id="_uXOl8V9xEey5t-mahoHmrg" base_Generalization="_-QfYkOZiEeGINOJ_SD9_dA"/>
-  <Ecore:EClass xmi:id="_uXPNAl9xEey5t-mahoHmrg" base_Class="_jfoCUOZbEeGINOJ_SD9_dA">
+  <CDA:ConformsTo xmi:id="_F8A4sX3sEeyivuDeOiJBMg" base_Generalization="_-QfYkOZiEeGINOJ_SD9_dA"/>
+  <Ecore:EClass xmi:id="_F8BfwH3sEeyivuDeOiJBMg" base_Class="_jfoCUOZbEeGINOJ_SD9_dA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ResultOrganizerTemplateId ResultOrganizerClassCode ResultOrganizerMoodCode ResultOrganizerId ResultOrganizerCode ResultOrganizerStatusCode ResultOrganizerStatusCodeP ResultOrganizerResultObservation' templateId.root='2.16.840.1.113883.10.20.22.4.75' constraints.validation.warning='CognitiveStatusResultOrganizerCodeCodeSystem' classCode='CLUSTER' moodCode='EVN' statusCode.code='completed' constraints.validation.dependOn.ResultOrganizerStatusCode='ResultOrganizerStatusCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_uXY-AF9xEey5t-mahoHmrg" base_Class="_lm3boOZbEeGINOJ_SD9_dA">
+  <Ecore:EClass xmi:id="_F8Jbkn3sEeyivuDeOiJBMg" base_Class="_lm3boOZbEeGINOJ_SD9_dA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='DeceasedObservationTemplateId DeceasedObservationEffectiveTimeLow DeceasedObservationClassCode DeceasedObservationMoodCode DeceasedObservationId DeceasedObservationCode DeceasedObservationCodeP DeceasedObservationStatusCode DeceasedObservationStatusCodeP DeceasedObservationEffectiveTime DeceasedObservationValue DeceasedObservationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.79' classCode='OBS' moodCode='EVN' code.code='ASSERTION' code.codeSystem='2.16.840.1.113883.5.4' code.codeSystemName='HL7ActCode' code.displayName='Assertion' constraints.validation.dependOn.DeceasedObservationCode='DeceasedObservationCodeP' statusCode.code='completed' value.code='419099009' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' value.displayName='Dead' constraints.validation.warning='DeceasedObservationProblemObservation'</annotation>
   </Ecore:EClass>
-  <CDA:ConformsTo xmi:id="_uXlyUF9xEey5t-mahoHmrg" base_Generalization="_whRx8ObjEeGINOJ_SD9_dA"/>
-  <Ecore:EClass xmi:id="_uXlyU19xEey5t-mahoHmrg" base_Class="_rVl5AOZbEeGINOJ_SD9_dA">
+  <CDA:ConformsTo xmi:id="_F8VBwH3sEeyivuDeOiJBMg" base_Generalization="_whRx8ObjEeGINOJ_SD9_dA"/>
+  <Ecore:EClass xmi:id="_F8Vo0H3sEeyivuDeOiJBMg" base_Class="_rVl5AOZbEeGINOJ_SD9_dA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProblemObservationTemplateId ProblemObservationHasTextReferenceValue ProblemObservationHasOnsetDate ProblemObservationClassCode ProblemObservationMoodCode ProblemObservationId ProblemObservationCodeP ProblemObservationStatusCode ProblemObservationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.68' constraints.validation.warning='ProblemObservationHasTextReference ProblemObservationTextReferenceValue ProblemObservationHasResolutionDate ProblemObservationCode ProblemObservationText ProblemObservationEffectiveTime ProblemObservationValue' constraints.validation.info='ProblemObservationValueNullFlavor ProblemObservationNegationInd FunctionalStatusProblemObservationMethodCode FunctionalStatusProblemObservationNonMedicinalSupplyActivity FunctionalStatusProblemObservationCaregiverCharacteristics FunctionalStatusProblemObservationAssessmentScaleObservation' classCode='OBS' moodCode='EVN' code.code='248536006' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' code.displayName='finding of functional performance and activity' constraints.validation.dependOn.ProblemObservationCode='ProblemObservationCodeP' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.dependOn.ProblemObservationValue='ProblemObservationValueP'</annotation>
   </Ecore:EClass>
-  <CDA:ConformsTo xmi:id="_uY2WkF9xEey5t-mahoHmrg" base_Generalization="_dM_VcObxEeGINOJ_SD9_dA"/>
-  <Ecore:EClass xmi:id="_uY29oF9xEey5t-mahoHmrg" base_Class="_viRU0OZbEeGINOJ_SD9_dA">
+  <CDA:ConformsTo xmi:id="_F9b1AH3sEeyivuDeOiJBMg" base_Generalization="_dM_VcObxEeGINOJ_SD9_dA"/>
+  <Ecore:EClass xmi:id="_F9ccEH3sEeyivuDeOiJBMg" base_Class="_viRU0OZbEeGINOJ_SD9_dA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ResultObservationTemplateId ResultObservationTextReferenceValue ResultObservationClassCode ResultObservationMoodCode ResultObservationId ResultObservationCodeP ResultObservationStatusCode ResultObservationStatusCodeP ResultObservationEffectiveTime ResultObservationValue FunctionalStatusResultObservationReferenceRangeObservationRangeNoCode FunctionalStatusResultObservationReferenceRangeObservationRange' templateId.root='2.16.840.1.113883.10.20.22.4.67' constraints.validation.warning='ResultObservationTextReference FunctionalStatusResultObservationValueDatatype ResultObservationCode ResultObservationText ResultObservationInterpretationCode FunctionalStatusResultObservationReferenceRange' classCode='OBS' moodCode='EVN' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.ResultObservationCode='ResultObservationCodeP' statusCode.code='completed' constraints.validation.dependOn.ResultObservationStatusCode='ResultObservationStatusCodeP' constraints.validation.info='ResultObservationMethodCode ResultObservationTargetSiteCode FunctionalStatusResultObservationAuthor FunctionalStatusResultObservationNonMedicinalSupplyActivity FunctionalStatusResultObservationCaregiverCharacteristics FunctionalStatusResultObservationAssessmentScaleObservation' constraints.validation.query='FunctionalStatusResultObservationReferenceRangeObservationRangeNoCode FunctionalStatusResultObservationReferenceRangeObservationRange'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolFunctionalStatusResultObservationReferenceRange constraints.validation.error='FunctionalStatusResultObservationReferenceRangeObservationRange'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolFunctionalStatusResultObservationReferenceRangeObservationRange constraints.validation.error='FunctionalStatusResultObservationReferenceRangeObservationRangeNoCode'</annotation>
   </Ecore:EClass>
-  <CDA:ConformsTo xmi:id="_uZOxEF9xEey5t-mahoHmrg" base_Generalization="_8KA8YObzEeGINOJ_SD9_dA"/>
-  <Ecore:EClass xmi:id="_uZOxE19xEey5t-mahoHmrg" base_Class="_zBlUUOZbEeGINOJ_SD9_dA">
+  <CDA:ConformsTo xmi:id="_F9v-EH3sEeyivuDeOiJBMg" base_Generalization="_8KA8YObzEeGINOJ_SD9_dA"/>
+  <Ecore:EClass xmi:id="_F9wlIH3sEeyivuDeOiJBMg" base_Class="_zBlUUOZbEeGINOJ_SD9_dA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ResultOrganizerTemplateId ResultOrganizerClassCode ResultOrganizerMoodCode ResultOrganizerId ResultOrganizerCode ResultOrganizerStatusCode ResultOrganizerStatusCodeP FunctionalStatusResultOrganizerFunctionalStatusResultObservation' templateId.root='2.16.840.1.113883.10.20.22.4.66' constraints.validation.warning='ResultOrganizerCodeValue' classCode='CLUSTER' moodCode='EVN' statusCode.code='completed' constraints.validation.dependOn.ResultOrganizerStatusCode='ResultOrganizerStatusCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_uZYiEF9xEey5t-mahoHmrg" base_Class="_4YgVsOZbEeGINOJ_SD9_dA">
+  <Ecore:EClass xmi:id="_F969Mn3sEeyivuDeOiJBMg" base_Class="_4YgVsOZbEeGINOJ_SD9_dA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HighestPressureUlcerStageTemplateId HighestPressureUlcerStageClassCode HighestPressureUlcerStageMoodCode HighestPressureUlcerStageId HighestPressureUlcerStageCode HighestPressureUlcerStageCodeP HighestPressureUlcerStageValue' templateId.root='2.16.840.1.113883.10.20.22.4.77' classCode='OBS' moodCode='EVN' code.code='420905001' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' code.displayName='Highest Pressure Ulcer Stage' constraints.validation.dependOn.HighestPressureUlcerStageCode='HighestPressureUlcerStageCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_uZgd4F9xEey5t-mahoHmrg" base_Class="_7c4ssOZbEeGINOJ_SD9_dA">
+  <Ecore:EClass xmi:id="_F-DgEX3sEeyivuDeOiJBMg" base_Class="_7c4ssOZbEeGINOJ_SD9_dA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='NumberOfPressureUlcersObservationTemplateId NumberOfPressureUlcersObservationClassCode NumberOfPressureUlcersObservationMoodCode NumberOfPressureUlcersObservationId NumberOfPressureUlcersObservationCode NumberOfPressureUlcersObservationCodeP NumberOfPressureUlcersObservationStatusCode NumberOfPressureUlcersObservationStatusCodeP NumberOfPressureUlcersObservationEffectiveTime NumberOfPressureUlcersObservationValue NumberOfPressureUlcersObservationEntryRelationship NumberOfPressureUlcersObservationEntryRelationshipObservationClassCode NumberOfPressureUlcersObservationEntryRelationshipObservationMoodCode NumberOfPressureUlcersObservationEntryRelationshipObservationValueP NumberOfPressureUlcersObservationEntryRelationshipTypeCode NumberOfPressureUlcersObservationEntryRelationshipObservation' templateId.root='2.16.840.1.113883.10.20.22.4.76' classCode='OBS' moodCode='EVN' code.code='2264892003' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' code.displayName='number of pressure ulcers' constraints.validation.dependOn.NumberOfPressureUlcersObservationCode='NumberOfPressureUlcersObservationCodeP' statusCode.code='completed' constraints.validation.info='NumberOfPressureUlcersObservationAuthor' constraints.validation.query='NumberOfPressureUlcersObservationEntryRelationshipObservationClassCode NumberOfPressureUlcersObservationEntryRelationshipObservationMoodCode NumberOfPressureUlcersObservationEntryRelationshipObservationValue NumberOfPressureUlcersObservationEntryRelationshipObservationValueP NumberOfPressureUlcersObservationEntryRelationshipTypeCode NumberOfPressureUlcersObservationEntryRelationshipObservation' constraints.validation.warning='NumberOfPressureUlcersObservationEntryRelationshipObservationValue'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolNumberOfPressureUlcersObservationEntryRelationship typeCode='SUBJ' constraints.validation.error='NumberOfPressureUlcersObservationEntryRelationshipTypeCode NumberOfPressureUlcersObservationEntryRelationshipObservation'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolNumberOfPressureUlcersObservationEntryRelationshipObservation classCode='OBS' constraints.validation.error='NumberOfPressureUlcersObservationEntryRelationshipObservationClassCode NumberOfPressureUlcersObservationEntryRelationshipObservationMoodCode NumberOfPressureUlcersObservationEntryRelationshipObservationValueP' moodCode='EVN' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.warning='NumberOfPressureUlcersObservationEntryRelationshipObservationValue'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_uav0AF9xEey5t-mahoHmrg" base_Class="_9rQowOZbEeGINOJ_SD9_dA">
+  <Ecore:EClass xmi:id="_F_K6YH3sEeyivuDeOiJBMg" base_Class="_9rQowOZbEeGINOJ_SD9_dA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PressureUlcerObservationTemplateId PressureUlcerObservationTextReferenceValue PressureUlcerObservationHasTextReferenceValue PressureUlcerObservationTargetSiteQualifierName PressureUlcerObservationTargetSiteQualifierValue PressureUlcerObservationClassCode PressureUlcerObservationMoodCode PressureUlcerObservationId PressureUlcerObservationCodeP PressureUlcerObservationStatusCode PressureUlcerObservationEffectiveTime PressureUlcerObservationValueP PressureUlcerObservationEntryRelationship1Observation1ClassCode PressureUlcerObservationEntryRelationship1Observation1MoodCode PressureUlcerObservationEntryRelationship1Observation1CodeP PressureUlcerObservationEntryRelationship1Observation1Code PressureUlcerObservationEntryRelationship1Observation1Value PressureUlcerObservationEntryRelationship1TypeCode PressureUlcerObservationEntryRelationship1Observation1 PressureUlcerObservationEntryRelationship2Observation2ClassCode PressureUlcerObservationEntryRelationship2Observation2MoodCode PressureUlcerObservationEntryRelationship2Observation2CodeP PressureUlcerObservationEntryRelationship2Observation2Code PressureUlcerObservationEntryRelationship2Observation2Value PressureUlcerObservationEntryRelationship2TypeCode PressureUlcerObservationEntryRelationship2Observation2 PressureUlcerObservationEntryRelationship3Observation3ClassCode PressureUlcerObservationEntryRelationship3Observation3MoodCode PressureUlcerObservationEntryRelationship3Observation3CodeP PressureUlcerObservationEntryRelationship3Observation3Code PressureUlcerObservationEntryRelationship3Observation3Value PressureUlcerObservationEntryRelationship3TypeCode PressureUlcerObservationEntryRelationship3Observation3' templateId.root='2.16.840.1.113883.10.20.22.4.70' constraints.validation.warning='PressureUlcerObservationHasTextReference PressureUlcerObservationTargetSiteQualifier PressureUlcerObservationTargetSiteQualifierNameCode PressureUlcerObservationTargetSiteQualifierValueCode PressureUlcerObservationCode PressureUlcerObservationText PressureUlcerObservationValue PressureUlcerObservationTargetSiteCode PressureUlcerObservationTargetSiteCodeP PressureUlcerObservationEntryRelationship PressureUlcerObservationEntryRelationship2 PressureUlcerObservationEntryRelationship3' constraints.validation.info='PressureUlcerObservationValueNullFlavor PressureUlcerObservationNegationInd' classCode='OBS' moodCode='EVN' code.code='ASSERTION' code.codeSystem='2.16.840.1.113883.5.4' code.codeSystemName='HL7ActCode' code.displayName='Assertion' constraints.validation.dependOn.PressureUlcerObservationCode='PressureUlcerObservationCodeP' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' targetSiteCode.codeSystem='2.16.840.1.113883.6.96' targetSiteCode.codeSystemName='SNOMEDCT' constraints.validation.dependOn.PressureUlcerObservationTargetSiteCode='PressureUlcerObservationTargetSiteCodeP' constraints.validation.query='PressureUlcerObservationEntryRelationship1Observation1ClassCode PressureUlcerObservationEntryRelationship1Observation1MoodCode PressureUlcerObservationEntryRelationship1Observation1CodeP PressureUlcerObservationEntryRelationship1Observation1Code PressureUlcerObservationEntryRelationship1Observation1Value PressureUlcerObservationEntryRelationship1TypeCode PressureUlcerObservationEntryRelationship1Observation1 PressureUlcerObservationEntryRelationship2Observation2ClassCode PressureUlcerObservationEntryRelationship2Observation2MoodCode PressureUlcerObservationEntryRelationship2Observation2CodeP PressureUlcerObservationEntryRelationship2Observation2Code PressureUlcerObservationEntryRelationship2Observation2Value PressureUlcerObservationEntryRelationship2TypeCode PressureUlcerObservationEntryRelationship2Observation2 PressureUlcerObservationEntryRelationship3Observation3ClassCode PressureUlcerObservationEntryRelationship3Observation3MoodCode PressureUlcerObservationEntryRelationship3Observation3CodeP PressureUlcerObservationEntryRelationship3Observation3Code PressureUlcerObservationEntryRelationship3Observation3Value PressureUlcerObservationEntryRelationship3TypeCode PressureUlcerObservationEntryRelationship3Observation3' constraints.validation.dependOn.PressureUlcerObservationEntryRelationship1Observation1Code='PressureUlcerObservationEntryRelationship1Observation1CodeP' constraints.validation.dependOn.PressureUlcerObservationEntryRelationship2Observation2Code='PressureUlcerObservationEntryRelationship2Observation2CodeP' constraints.validation.dependOn.PressureUlcerObservationEntryRelationship3Observation3Code='PressureUlcerObservationEntryRelationship3Observation3CodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPressureUlcerObservationEntryRelationship1 typeCode='COMP' constraints.validation.error='PressureUlcerObservationEntryRelationship1TypeCode PressureUlcerObservationEntryRelationship1Observation1'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPressureUlcerObservationEntryRelationship1Observation1 classCode='OBS' constraints.validation.error='PressureUlcerObservationEntryRelationship1Observation1ClassCode PressureUlcerObservationEntryRelationship1Observation1MoodCode PressureUlcerObservationEntryRelationship1Observation1Code PressureUlcerObservationEntryRelationship1Observation1CodeP PressureUlcerObservationEntryRelationship1Observation1Value' moodCode='EVN' code.code='401238003' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' code.displayName='Length of Wound' constraints.validation.dependOn.PressureUlcerObservationEntryRelationship1Observation1Code='PressureUlcerObservationEntryRelationship1Observation1CodeP'</annotation>
@@ -47037,148 +47037,148 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPressureUlcerObservationEntryRelationship3 typeCode='COMP' constraints.validation.error='PressureUlcerObservationEntryRelationship3TypeCode PressureUlcerObservationEntryRelationship3Observation3'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPressureUlcerObservationEntryRelationship3Observation3 classCode='OBS' constraints.validation.error='PressureUlcerObservationEntryRelationship3Observation3ClassCode PressureUlcerObservationEntryRelationship3Observation3MoodCode PressureUlcerObservationEntryRelationship3Observation3Code PressureUlcerObservationEntryRelationship3Observation3CodeP PressureUlcerObservationEntryRelationship3Observation3Value' moodCode='EVN' code.code='425094009' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' code.displayName='Depth of Wound' constraints.validation.dependOn.PressureUlcerObservationEntryRelationship3Observation3Code='PressureUlcerObservationEntryRelationship3Observation3CodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_u60bMF9xEey5t-mahoHmrg" base_Class="_TkyvwPKwEeGFUPBL8qS7yQ">
+  <Ecore:EClass xmi:id="_GaDfl33sEeyivuDeOiJBMg" base_Class="_TkyvwPKwEeGFUPBL8qS7yQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='FetusSubjectContextTemplateId FetusSubjectContextCode FetusSubjectContextSubject' templateId.root='2.16.840.1.113883.10.20.6.2.3' code.code='121026' code.codeSystem='1.2.840.10008.2.16.4' code.codeSystemName='DCM'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolFetusSubjectContextSubjectPerson constraints.validation.error='FetusSubjectContextSubjectPersonName'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_u7UxgF9xEey5t-mahoHmrg" base_Class="_XIE-YPKyEeGFUPBL8qS7yQ">
+  <Ecore:EClass xmi:id="_GagLgH3sEeyivuDeOiJBMg" base_Class="_XIE-YPKyEeGFUPBL8qS7yQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ObserverContextTemplateId ObserverContextAssignedAuthor' templateId.root='2.16.840.1.113883.10.20.6.2.4'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolObserverContextAssignedAuthor constraints.validation.error='ObserverContextAssignedAuthorHasAssignedPersonorAuthoringDevice ObserverContextAssignedAuthorId'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vDZvcF9xEey5t-mahoHmrg" base_Class="_u_keoIkOEeOJGtGyq_dBbA">
+  <Ecore:EClass xmi:id="_GhN3gH3sEeyivuDeOiJBMg" base_Class="_u_keoIkOEeOJGtGyq_dBbA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='EntryReferenceTemplateId EntryReferenceClassCode EntryReferenceMoodCode EntryReferenceId EntryReferenceCode EntryReferenceStatusCodeP EntryReferenceIINullFlavor EntryReferenceCDNullFlavor EntryReferenceCDNullFlavorP' templateId.root='2.16.840.1.113883.10.20.22.4.122' classCode='ACT' moodCode='EVN' statusCode.code='completed' constraints.validation.info='EntryReferenceStatusCode' constraints.validation.query='EntryReferenceIINullFlavor EntryReferenceCDNullFlavor EntryReferenceCDNullFlavorP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolEntryReferenceCD nullFlavor='NP' constraints.validation.error='EntryReferenceCDNullFlavor EntryReferenceCDNullFlavorP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolEntryReferenceII constraints.validation.error='EntryReferenceIINullFlavor'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vDl8sF9xEey5t-mahoHmrg" base_Class="_Z8VQYIlFEeOJGtGyq_dBbA">
+  <Ecore:EClass xmi:id="_GhXog33sEeyivuDeOiJBMg" base_Class="_Z8VQYIlFEeOJGtGyq_dBbA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AdvanceDirectiveOrganizerTemplateId AdvanceDirectiveOrganizerClassCode AdvanceDirectiveOrganizerMoodCode AdvanceDirectiveOrganizerId AdvanceDirectiveOrganizerCode AdvanceDirectiveOrganizerCodeP AdvanceDirectiveOrganizerStatusCode AdvanceDirectiveOrganizerStatusCodeP AdvanceDirectiveOrganizerAdvanceDirectiveObservation2' templateId.root='2.16.840.1.113883.10.20.22.4.108' templateId.extension='2015-08-01' classCode='CLUSTER' moodCode='EVN' code.code='45473-6' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Advance directive - living will' statusCode.code='completed' constraints.validation.dependOn.AdvanceDirectiveOrganizerStatusCode='AdvanceDirectiveOrganizerStatusCodeP' constraints.validation.warning='AdvanceDirectiveOrganizerAuthorParticipation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vEWxsF9xEey5t-mahoHmrg" base_Class="_O-O-IInUEeOJGtGyq_dBbA">
+  <Ecore:EClass xmi:id="_Gh7pMn3sEeyivuDeOiJBMg" base_Class="_O-O-IInUEeOJGtGyq_dBbA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='CharacteristicsOfHomeEnvironmentTemplateId CharacteristicsOfHomeEnvironmentClassCode CharacteristicsOfHomeEnvironmentMoodCode CharacteristicsOfHomeEnvironmentId CharacteristicsOfHomeEnvironmentCode CharacteristicsOfHomeEnvironmentCodeP CharacteristicsOfHomeEnvironmentStatusCode CharacteristicsOfHomeEnvironmentStatusCodeP CharacteristicsOfHomeEnvironmentValueP' templateId.root='2.16.840.1.113883.10.20.22.4.109' classCode='OBS' moodCode='EVN' code.code='75274-1' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Characteristics of residence' constraints.validation.dependOn.CharacteristicsOfHomeEnvironmentCode='CharacteristicsOfHomeEnvironmentCodeP' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.warning='CharacteristicsOfHomeEnvironmentValue'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vF2mgF9xEey5t-mahoHmrg" base_Class="_Y_oGkIoAEeOoMZgUoTghIg">
+  <Ecore:EClass xmi:id="_Gi9j8n3sEeyivuDeOiJBMg" base_Class="_Y_oGkIoAEeOoMZgUoTghIg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='CognitiveAbilitiesObservationTemplateId CognitiveAbilitiesObservationClassCode CognitiveAbilitiesObservationMoodCode CognitiveAbilitiesObservationId CognitiveAbilitiesObservationCodeP CognitiveAbilitiesObservationStatusCode CognitiveAbilitiesObservationStatusCodeP CognitiveAbilitiesObservationEffectiveTime CognitiveAbilitiesObservationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.126' classCode='OBS' moodCode='EVN' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' constraints.validation.warning='CognitiveAbilitiesObservationCode CognitiveAbilitiesObservationText CognitiveAbilitiesObservationValue CognitiveAbilitiesObservationAuthorParticipation' constraints.validation.dependOn.CognitiveAbilitiesObservationCode='CognitiveAbilitiesObservationCodeP' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.info='CognitiveAbilitiesObservationAssessmentScaleObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vJX0kF9xEey5t-mahoHmrg" base_Class="_H2EzIIqZEeOoMZgUoTghIg">
+  <Ecore:EClass xmi:id="_GlJVQH3sEeyivuDeOiJBMg" base_Class="_H2EzIIqZEeOoMZgUoTghIg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='CulturalAndReligiousObservationTemplateId CulturalAndReligiousObservationValueOfTypeCDIsFromSnomed CulturalAndReligiousObservationClassCode CulturalAndReligiousObservationMoodCode CulturalAndReligiousObservationId CulturalAndReligiousObservationCode CulturalAndReligiousObservationCodeP CulturalAndReligiousObservationStatusCode CulturalAndReligiousObservationStatusCodeP CulturalAndReligiousObservationValue' templateId.root='2.16.840.1.113883.10.20.22.4.111' classCode='OBS' moodCode='EVN' code.code='75281-6' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Personal belief' constraints.validation.dependOn.CulturalAndReligiousObservationCode='CulturalAndReligiousObservationCodeP' statusCode.code='completed'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vJo6UF9xEey5t-mahoHmrg" base_Class="_MbKs8IqvEeOoMZgUoTghIg">
+  <Ecore:EClass xmi:id="_GlTGQn3sEeyivuDeOiJBMg" base_Class="_MbKs8IqvEeOoMZgUoTghIg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='DrugMonitoringActTemplateId DrugMonitoringActClassCode DrugMonitoringActMoodCode DrugMonitoringActId DrugMonitoringActCode DrugMonitoringActCodeP DrugMonitoringActStatusCode DrugMonitoringActStatusCodeP DrugMonitoringActEffectiveTime DrugMonitoringActParticipant DrugMonitoringActParticipantParticipantRolePlayingEntityGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent DrugMonitoringActParticipantParticipantRolePlayingEntityClassCode DrugMonitoringActParticipantParticipantRolePlayingEntityName DrugMonitoringActParticipantParticipantRoleClassCode DrugMonitoringActParticipantParticipantRoleId DrugMonitoringActParticipantParticipantRolePlayingEntity DrugMonitoringActParticipantTypeCode DrugMonitoringActParticipantParticipantRole' templateId.root='2.16.840.1.113883.10.20.22.4.123' classCode='ACT' moodCode='INT' code.code='395170001' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' code.displayName='medication monitoring (regime/therapy)' constraints.validation.dependOn.DrugMonitoringActCode='DrugMonitoringActCodeP' constraints.validation.query='DrugMonitoringActParticipantParticipantRolePlayingEntityGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent DrugMonitoringActParticipantParticipantRolePlayingEntityClassCode DrugMonitoringActParticipantParticipantRolePlayingEntityName DrugMonitoringActParticipantParticipantRoleClassCode DrugMonitoringActParticipantParticipantRoleId DrugMonitoringActParticipantParticipantRolePlayingEntity DrugMonitoringActParticipantTypeCode DrugMonitoringActParticipantParticipantRole'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDrugMonitoringActParticipant typeCode='RESP' constraints.validation.error='DrugMonitoringActParticipantTypeCode DrugMonitoringActParticipantParticipantRole'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDrugMonitoringActParticipantParticipantRole classCode='ASSIGNED' constraints.validation.error='DrugMonitoringActParticipantParticipantRoleClassCode DrugMonitoringActParticipantParticipantRoleId DrugMonitoringActParticipantParticipantRolePlayingEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDrugMonitoringActParticipantParticipantRolePlayingEntity classCode='PSN' constraints.validation.error='DrugMonitoringActParticipantParticipantRolePlayingEntityClassCode DrugMonitoringActParticipantParticipantRolePlayingEntityName PlayingEntityGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent' constraints.validation.query='PlayingEntityGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vMnV0l9xEey5t-mahoHmrg" base_Class="_POfwAIz7EeOoMZgUoTghIg">
+  <Ecore:EClass xmi:id="_Gns6An3sEeyivuDeOiJBMg" base_Class="_POfwAIz7EeOoMZgUoTghIg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HandoffCommunicationParticipantsTemplateId HandoffCommunicationParticipantsClassCode HandoffCommunicationParticipantsMoodCode HandoffCommunicationParticipantsCode HandoffCommunicationParticipantsCodeP HandoffCommunicationParticipantsStatusCode HandoffCommunicationParticipantsStatusCodeP HandoffCommunicationParticipantsEffectiveTime HandoffCommunicationParticipantsParticipant HandoffCommunicationParticipantsAuthorParticipation HandoffCommunicationParticipantsParticipantParticipantRolePlayingEntityName HandoffCommunicationParticipantsParticipantParticipantRoleId HandoffCommunicationParticipantsParticipantParticipantRoleAddr HandoffCommunicationParticipantsParticipantTypeCode HandoffCommunicationParticipantsParticipantParticipantRole' templateId.root='2.16.840.1.113883.10.20.22.4.141' classCode='ACT' moodCode='EVN' code.code='432138007' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' code.displayName='handoff communication (procedure)' constraints.validation.dependOn.HandoffCommunicationParticipantsCode='HandoffCommunicationParticipantsCodeP' statusCode.code='completed' constraints.validation.query='HandoffCommunicationParticipantsParticipantParticipantRolePlayingEntityName HandoffCommunicationParticipantsParticipantParticipantRoleId HandoffCommunicationParticipantsParticipantParticipantRoleCodeP HandoffCommunicationParticipantsParticipantParticipantRoleCode HandoffCommunicationParticipantsParticipantParticipantRoleAddr HandoffCommunicationParticipantsParticipantParticipantRolePlayingEntity HandoffCommunicationParticipantsParticipantTypeCode HandoffCommunicationParticipantsParticipantParticipantRole' constraints.validation.warning='HandoffCommunicationParticipantsParticipantParticipantRoleCodeP HandoffCommunicationParticipantsParticipantParticipantRoleCode' constraints.validation.dependOn.HandoffCommunicationParticipantsParticipantParticipantRoleCode='HandoffCommunicationParticipantsParticipantParticipantRoleCodeP' constraints.validation.info='HandoffCommunicationParticipantsParticipantParticipantRolePlayingEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolHandoffCommunicationParticipantsParticipant typeCode='IRCP' constraints.validation.error='HandoffCommunicationParticipantsParticipantTypeCode HandoffCommunicationParticipantsParticipantParticipantRole'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolHandoffCommunicationParticipantsParticipantParticipantRole constraints.validation.error='HandoffCommunicationParticipantsParticipantParticipantRoleId HandoffCommunicationParticipantsParticipantParticipantRoleAddr' code.codeSystem='2.16.840.1.113883.6.101' code.codeSystemName='NUCC Health Care Provider Taxonomy' constraints.validation.warning='HandoffCommunicationParticipantsParticipantParticipantRoleCode HandoffCommunicationParticipantsParticipantParticipantRoleCodeP' constraints.validation.dependOn.HandoffCommunicationParticipantsParticipantParticipantRoleCode='HandoffCommunicationParticipantsParticipantParticipantRoleCodeP' constraints.validation.info='HandoffCommunicationParticipantsParticipantParticipantRolePlayingEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolHandoffCommunicationParticipantsParticipantParticipantRolePlayingEntity constraints.validation.error='HandoffCommunicationParticipantsParticipantParticipantRolePlayingEntityName'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vO5NwV9xEey5t-mahoHmrg" base_Class="_RbbCII0dEeOB0eBUISUB4Q">
+  <Ecore:EClass xmi:id="_GpiGAX3sEeyivuDeOiJBMg" base_Class="_RbbCII0dEeOB0eBUISUB4Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicalEquipmentOrganizerTemplateId MedicalEquipmentOrganizerHasNonMedSupActOrProcActProc MedicalEquipmentOrganizerClassCode MedicalEquipmentOrganizerMoodCode MedicalEquipmentOrganizerId MedicalEquipmentOrganizerStatusCode MedicalEquipmentOrganizerStatusCodeP MedicalEquipmentOrganizerEffectiveTime MedicalEquipmentOrganizerIVLTSLow MedicalEquipmentOrganizerIVLTSHigh' templateId.root='2.16.840.1.113883.10.20.22.4.135' classCode='CLUSTER' moodCode='EVN' constraints.validation.info='MedicalEquipmentOrganizerCode MedicalEquipmentOrganizerNonMedicinalSupplyActivity2 MedicalEquipmentOrganizerProcedureActivityProcedure2' constraints.validation.dependOn.MedicalEquipmentOrganizerStatusCode='MedicalEquipmentOrganizerStatusCodeP' constraints.validation.query='MedicalEquipmentOrganizerIVLTSLow MedicalEquipmentOrganizerIVLTSHigh'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMedicalEquipmentOrganizerIVLTS constraints.validation.error='MedicalEquipmentOrganizerIVLTSLow MedicalEquipmentOrganizerIVLTSHigh'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vREYAl9xEey5t-mahoHmrg" base_Class="_-lJmEI0kEeOB0eBUISUB4Q">
+  <Ecore:EClass xmi:id="_GrX5E33sEeyivuDeOiJBMg" base_Class="_-lJmEI0kEeOB0eBUISUB4Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MentalStatusObservationTemplateId MentalStatusObservationClassCode MentalStatusObservationMoodCode MentalStatusObservationId MentalStatusObservationCodeP MentalStatusObservationStatusCode MentalStatusObservationStatusCodeP MentalStatusObservationEffectiveTime MentalStatusObservationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.125' classCode='OBS' moodCode='EVN' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' constraints.validation.warning='MentalStatusObservationCode MentalStatusObservationValue MentalStatusObservationAuthorParticipation' constraints.validation.dependOn.MentalStatusObservationCode='MentalStatusObservationCodeP' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.info='MentalStatusObservationAssessmentScaleObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vUEBoF9xEey5t-mahoHmrg" base_Class="_NP5zMI05EeOB0eBUISUB4Q">
+  <Ecore:EClass xmi:id="_GticQn3sEeyivuDeOiJBMg" base_Class="_NP5zMI05EeOB0eBUISUB4Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='NutritionAssessmentTemplateId NutritionAssessmentClassCode NutritionAssessmentMoodCode NutritionAssessmentId NutritionAssessmentCode NutritionAssessmentCodeP NutritionAssessmentStatusCode NutritionAssessmentStatusCodeP NutritionAssessmentEffectiveTime NutritionAssessmentValue' templateId.root='2.16.840.1.113883.10.20.22.4.138' constraints.validation.warning='NutritionAssessmentValueOfTypeCDIsFromSnomed NutritionAssessmentAuthorParticipation' classCode='OBS' moodCode='EVN' code.code='75303-8' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Nutrition assessment' constraints.validation.dependOn.NutritionAssessmentCode='NutritionAssessmentCodeP' statusCode.code='completed'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vUTSMF9xEey5t-mahoHmrg" base_Class="_FhAIMI3FEeOB0eBUISUB4Q">
+  <Ecore:EClass xmi:id="_GttbYH3sEeyivuDeOiJBMg" base_Class="_FhAIMI3FEeOB0eBUISUB4Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='NutritionRecommendationTemplateId NutritionRecommendationClassCode NutritionRecommendationMoodCode NutritionRecommendationMoodCodeP NutritionRecommendationCodeP NutritionRecommendationStatusCode NutritionRecommendationStatusCodeP' templateId.root='2.16.840.1.113883.10.20.22.4.130' classCode='ACT' constraints.validation.dependOn.NutritionRecommendationMoodCode='NutritionRecommendationMoodCodeP' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' constraints.validation.warning='NutritionRecommendationCode NutritionRecommendationEffectiveTime' constraints.validation.dependOn.NutritionRecommendationCode='NutritionRecommendationCodeP' statusCode.code='active' constraints.validation.info='NutritionRecommendationPlannedEncounter2 NutritionRecommendationPlannedMedicationActivity2 NutritionRecommendationPlannedObservation2 NutritionRecommendationPlannedProcedure2 NutritionRecommendationPlannedSupply2 NutritionRecommendationPlannedAct2'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vWse4F9xEey5t-mahoHmrg" base_Class="_T1dcwI37EeOB0eBUISUB4Q">
+  <Ecore:EClass xmi:id="_GvhZQH3sEeyivuDeOiJBMg" base_Class="_T1dcwI37EeOB0eBUISUB4Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='NutritionalStatusObservationTemplateId NutritionalStatusObservationClassCode NutritionalStatusObservationMoodCode NutritionalStatusObservationId NutritionalStatusObservationCode NutritionalStatusObservationCodeP NutritionalStatusObservationStatusCode NutritionalStatusObservationStatusCodeP NutritionalStatusObservationEffectiveTime NutritionalStatusObservationValueP NutritionalStatusObservationNutritionAssessment' templateId.root='2.16.840.1.113883.10.20.22.4.124' classCode='OBS' moodCode='EVN' code.code='75305-3' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Nutrition status' constraints.validation.dependOn.NutritionalStatusObservationCode='NutritionalStatusObservationCodeP' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.warning='NutritionalStatusObservationValue'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vYsqAF9xEey5t-mahoHmrg" base_Class="_ihaWkI55EeOB0eBUISUB4Q">
+  <Ecore:EClass xmi:id="_Gw55Un3sEeyivuDeOiJBMg" base_Class="_ihaWkI55EeOB0eBUISUB4Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='OutcomeObservationTemplateId OutcomeObservationProgTowardGoalObsInversionIndIsTrue OutcomeObservationClassCode OutcomeObservationMoodCode OutcomeObservationId OutcomeObservationCodeP OutcomeObservationEntryRelationship OutcomeObservationReferenceTypeCode OutcomeObservationReferenceExternalDocumentReference' templateId.root='2.16.840.1.113883.10.20.22.4.144' classCode='OBS' moodCode='EVN' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.warning='OutcomeObservationCode OutcomeObservationValue OutcomeObservationEntryReferenceGoalObs OutcomeObservationAuthorParticipation OutcomeObservationProgressTowardGoalObservation' constraints.validation.dependOn.OutcomeObservationCode='OutcomeObservationCodeP' constraints.validation.info='OutcomeObservationEntryReferenceInterventionAct OutcomeObservationReference' constraints.validation.query='OutcomeObservationReferenceTypeCode OutcomeObservationReferenceExternalDocumentReference'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolOutcomeObservationReference typeCode='REFR' constraints.validation.error='OutcomeObservationReferenceTypeCode OutcomeObservationReferenceExternalDocumentReference'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vZ5j5F9xEey5t-mahoHmrg" base_Class="_50a2UI62EeOB0eBUISUB4Q">
+  <Ecore:EClass xmi:id="_Gx4Jsn3sEeyivuDeOiJBMg" base_Class="_50a2UI62EeOB0eBUISUB4Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PatientReferralActTemplateId PatientReferralActClassCode PatientReferralActMoodCode PatientReferralActMoodCodeP PatientReferralActId PatientReferralActCode PatientReferralActCodeP PatientReferralActStatusCode PatientReferralActStatusCodeP PatientReferralActEffectiveTime PatientReferralActEntryRelationshipObservationClassCode PatientReferralActEntryRelationshipObservationMoodCode PatientReferralActEntryRelationshipObservationCodeP PatientReferralActEntryRelationshipObservationCode PatientReferralActEntryRelationshipObservationStatusCode PatientReferralActEntryRelationshipObservationStatusCodeP PatientReferralActEntryRelationshipObservationValueP PatientReferralActEntryRelationshipTypeCode PatientReferralActEntryRelationshipObservation PatientReferralActParticipantTypeCode PatientReferralActParticipantParticipantRole' templateId.root='2.16.840.1.113883.10.20.22.4.140' classCode='PCPR' constraints.validation.dependOn.PatientReferralActMoodCode='PatientReferralActMoodCodeP' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' constraints.validation.dependOn.PatientReferralActCode='PatientReferralActCodeP' statusCode.code='active' constraints.validation.warning='PatientReferralActPriorityCode PatientReferralActAuthorParticipation PatientReferralActEntryRelationshipObservationPriorityCodeP PatientReferralActEntryRelationshipObservationPriorityCode PatientReferralActEntryRelationshipObservationValue PatientReferralActParticipantParticipantRoleCode' constraints.validation.info='PatientReferralActEntryRelationship PatientReferralActIndication2 PatientReferralActParticipant PatientReferralActParticipantParticipantRoleCodeP' constraints.validation.query='PatientReferralActEntryRelationshipObservationClassCode PatientReferralActEntryRelationshipObservationMoodCode PatientReferralActEntryRelationshipObservationCodeP PatientReferralActEntryRelationshipObservationCode PatientReferralActEntryRelationshipObservationStatusCode PatientReferralActEntryRelationshipObservationStatusCodeP PatientReferralActEntryRelationshipObservationPriorityCodeP PatientReferralActEntryRelationshipObservationPriorityCode PatientReferralActEntryRelationshipObservationValue PatientReferralActEntryRelationshipObservationValueP PatientReferralActEntryRelationshipTypeCode PatientReferralActEntryRelationshipObservation PatientReferralActParticipantParticipantRoleCodeP PatientReferralActParticipantParticipantRoleCode PatientReferralActParticipantTypeCode PatientReferralActParticipantParticipantRole' constraints.validation.dependOn.PatientReferralActEntryRelationshipObservationCode='PatientReferralActEntryRelationshipObservationCodeP' constraints.validation.dependOn.PatientReferralActEntryRelationshipObservationPriorityCode='PatientReferralActEntryRelationshipObservationPriorityCodeP' constraints.validation.dependOn.PatientReferralActParticipantParticipantRoleCode='PatientReferralActParticipantParticipantRoleCodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPatientReferralActEntryRelationship typeCode='SUBJ' constraints.validation.error='PatientReferralActEntryRelationshipTypeCode PatientReferralActEntryRelationshipObservation'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPatientReferralActEntryRelationshipObservation classCode='OBS' constraints.validation.error='PatientReferralActEntryRelationshipObservationClassCode PatientReferralActEntryRelationshipObservationMoodCode PatientReferralActEntryRelationshipObservationCode PatientReferralActEntryRelationshipObservationCodeP PatientReferralActEntryRelationshipObservationStatusCode PatientReferralActEntryRelationshipObservationStatusCodeP PatientReferralActEntryRelationshipObservationValueP' moodCode='RQO' code.code='ASSERTION' code.codeSystem='2.16.840.1.113883.5.4' code.codeSystemName='HL7ActCode' code.displayName='assertion' constraints.validation.dependOn.PatientReferralActEntryRelationshipObservationCode='PatientReferralActEntryRelationshipObservationCodeP' statusCode.code='completed' priorityCode.codeSystem='2.16.840.1.113883.5.7' priorityCode.codeSystemName='ActPriority' constraints.validation.warning='PatientReferralActEntryRelationshipObservationPriorityCode PatientReferralActEntryRelationshipObservationPriorityCodeP PatientReferralActEntryRelationshipObservationValue' constraints.validation.dependOn.PatientReferralActEntryRelationshipObservationPriorityCode='PatientReferralActEntryRelationshipObservationPriorityCodeP' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPatientReferralActParticipant typeCode='REFT' constraints.validation.error='PatientReferralActParticipantTypeCode PatientReferralActParticipantParticipantRole'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPatientReferralActParticipantParticipantRole code.codeSystem='2.16.840.1.113883.6.101' code.codeSystemName='NUCC Health Care Provider Taxonomy' constraints.validation.warning='PatientReferralActParticipantParticipantRoleCode' constraints.validation.info='PatientReferralActParticipantParticipantRoleCodeP' constraints.validation.dependOn.PatientReferralActParticipantParticipantRoleCode='PatientReferralActParticipantParticipantRoleCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vgKj8l9xEey5t-mahoHmrg" base_Class="_O2I3AI9DEeOB0eBUISUB4Q">
+  <Ecore:EClass xmi:id="_G3SOIn3sEeyivuDeOiJBMg" base_Class="_O2I3AI9DEeOB0eBUISUB4Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlannedCoverageTemplateId PlannedCoverageClassCode PlannedCoverageMoodCode PlannedCoverageId PlannedCoverageCode PlannedCoverageCodeP PlannedCoverageStatusCode PlannedCoverageStatusCodeP PlannedCoverageEntryRelationship PlannedCoverageEntryRelationshipActClassCode PlannedCoverageEntryRelationshipActMoodCode PlannedCoverageEntryRelationshipActId PlannedCoverageEntryRelationshipActCodeP PlannedCoverageEntryRelationshipActCode PlannedCoverageEntryRelationshipActStatusCode PlannedCoverageEntryRelationshipActStatusCodeP PlannedCoverageEntryRelationshipTypeCode PlannedCoverageEntryRelationshipAct' templateId.root='2.16.840.1.113883.10.20.22.4.129' classCode='ACT' moodCode='INT' code.code='48768-6' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Payment Sources' constraints.validation.dependOn.PlannedCoverageCode='PlannedCoverageCodeP' statusCode.code='active' constraints.validation.info='PlannedCoverageAuthorParticipation' constraints.validation.query='PlannedCoverageEntryRelationshipActClassCode PlannedCoverageEntryRelationshipActMoodCode PlannedCoverageEntryRelationshipActId PlannedCoverageEntryRelationshipActCodeP PlannedCoverageEntryRelationshipActCode PlannedCoverageEntryRelationshipActStatusCode PlannedCoverageEntryRelationshipActStatusCodeP PlannedCoverageEntryRelationshipTypeCode PlannedCoverageEntryRelationshipAct' constraints.validation.dependOn.PlannedCoverageEntryRelationshipActCode='PlannedCoverageEntryRelationshipActCodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPlannedCoverageEntryRelationship typeCode='COMP' constraints.validation.error='PlannedCoverageEntryRelationshipTypeCode PlannedCoverageEntryRelationshipAct'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPlannedCoverageEntryRelationshipAct classCode='ACT' constraints.validation.error='PlannedCoverageEntryRelationshipActClassCode PlannedCoverageEntryRelationshipActMoodCode PlannedCoverageEntryRelationshipActId PlannedCoverageEntryRelationshipActCode PlannedCoverageEntryRelationshipActCodeP PlannedCoverageEntryRelationshipActStatusCode PlannedCoverageEntryRelationshipActStatusCodeP' moodCode='INT' code.codeSystem='2.16.840.1.113883.3.221.5' code.codeSystemName='Source of Payment Typology (PHDSC)' constraints.validation.dependOn.PlannedCoverageEntryRelationshipActCode='PlannedCoverageEntryRelationshipActCodeP' statusCode.code='active'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_viW8Ul9xEey5t-mahoHmrg" base_Class="_-miMII9TEeOB0eBUISUB4Q">
+  <Ecore:EClass xmi:id="_G5J2YX3sEeyivuDeOiJBMg" base_Class="_-miMII9TEeOB0eBUISUB4Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='GoalObservationTemplateId GoalObservationClassCode GoalObservationMoodCode GoalObservationId GoalObservationCodeP GoalObservationStatusCode GoalObservationStatusCodeP GoalObservationReferenceTypeCode GoalObservationReferenceExternalDocumentReference' templateId.root='2.16.840.1.113883.10.20.22.4.121' classCode='OBS' moodCode='GOL' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.warning='GoalObservationCode GoalObservationEffectiveTime GoalObservationAuthorParticipation GoalObservationPriorityPreference' constraints.validation.dependOn.GoalObservationCode='GoalObservationCodeP' statusCode.code='active' constraints.validation.info='GoalObservationValue GoalObservationGoalObservation GoalObservationActReferenceER GoalObservationHealthConcernActER GoalObservationPlannedERs GoalObservationReference' constraints.validation.query='GoalObservationReferenceTypeCode GoalObservationReferenceExternalDocumentReference'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolGoalObservationReference typeCode='REFR' constraints.validation.error='GoalObservationReferenceTypeCode GoalObservationReferenceExternalDocumentReference'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vjqj4l9xEey5t-mahoHmrg" base_Class="_An8P8I9kEeOB0eBUISUB4Q">
+  <Ecore:EClass xmi:id="_G6JU5H3sEeyivuDeOiJBMg" base_Class="_An8P8I9kEeOB0eBUISUB4Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HealthConcernActTemplateId HealthConcernActClassCode HealthConcernActMoodCode HealthConcernActId HealthConcernActCode HealthConcernActCodeP HealthConcernActStatusCode HealthConcernActStatusCodeP HealthConcernActReferenceTypeCode HealthConcernActReferenceExternalDocumentReference' templateId.root='2.16.840.1.113883.10.20.22.4.132' templateId.extension='2015-08-01' classCode='ACT' moodCode='EVN' code.code='75310-3' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Health Concern' constraints.validation.dependOn.HealthConcernActCode='HealthConcernActCodeP' constraints.validation.info='HealthConcernActEffectiveTime HealthConcernActHealthConcernActErRefr HealthConcernActHealthConcernActErComp HealthConcernActAssessmentScaleObservation HealthConcernActFamilyHistoryOrganizer2 HealthConcernActNutritionAssessment HealthConcernActPregnancyObservation HealthConcernActCaregiverCharacteristics HealthConcernActCulturalAndReligiousObservation HealthConcernActCharacteristicsOfHomeEnvironment HealthConcernActNutritionalStatusObservation HealthConcernActEntryReferenceGeneral HealthConcernActSelfCareActivities HealthConcernActSensoryStatus HealthConcernActLongitudinalCareWoundObservation HealthConcernActPriorityPreference HealthConcernActProblemObservation2 HealthConcernActAllergyObservation2 HealthConcernActMentalStatusObservation2 HealthConcernActSmokingStatusMeaningfulUse2 HealthConcernActEncounterDiagnosis2 HealthConcernActFunctionalStatusObservation2 HealthConcernActHospitalAdmissionDiagnosis2 HealthConcernActPostprocedureDiagnosis2 HealthConcernActPreoperativeDiagnosis2 HealthConcernActReactionObservation2 HealthConcernActResultObservation2 HealthConcernActSocialHistoryObservation2 HealthConcernActSubstanceOrDeviceAllergyObservation2 HealthConcernActTobaccoUse2 HealthConcernActVitalSignObservation2 HealthConcernActProblemObservation2Support HealthConcernActResultOrganizer2 HealthConcernActProblemConcernAct2 HealthConcernActReference' constraints.validation.warning='HealthConcernActAuthorParticipation' constraints.validation.query='HealthConcernActReferenceTypeCode HealthConcernActReferenceExternalDocumentReference'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolHealthConcernActReference typeCode='REFR' constraints.validation.error='HealthConcernActReferenceTypeCode HealthConcernActReferenceExternalDocumentReference'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vqSwU19xEey5t-mahoHmrg" base_Class="_XD5vgJA8EeOZX935IVJfOg">
+  <Ecore:EClass xmi:id="_G__eMH3sEeyivuDeOiJBMg" base_Class="_XD5vgJA8EeOZX935IVJfOg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='InterventionActTemplateId InterventionActClassCode InterventionActMoodCode InterventionActId InterventionActCode InterventionActCodeP InterventionActStatusCode InterventionActStatusCodeP InterventionActReferenceTypeCode InterventionActReferenceExternalDocumentReference' templateId.root='2.16.840.1.113883.10.20.22.4.131' templateId.extension='2015-08-01' classCode='ACT' moodCode='EVN' code.code='362956003' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' code.displayName='procedure / intervention (navigational concept)' constraints.validation.dependOn.InterventionActCode='InterventionActCodeP' statusCode.code='completed' constraints.validation.warning='InterventionActEffectiveTime InterventionActGoalObsEntryReference InterventionActAuthorParticipation' constraints.validation.info='InterventionActInterventionAct InterventionActNutritionRecommendation InterventionActInterventionEntryReference InterventionActAdvanceDirectiveObservation2 InterventionActImmunizationActivity2 InterventionActMedicationActivity2 InterventionActProcedureActivityAct2 InterventionActProcedureActivityObservation2 InterventionActProcedureActivityProcedure2 InterventionActEncounterActivity2 InterventionActNonMedicinalSupplyActivity2 InterventionActInstruction2 InterventionActHandoffCommunicationParticipants InterventionActPlannedInterventionAct InterventionActReference' constraints.validation.query='InterventionActReferenceTypeCode InterventionActReferenceExternalDocumentReference'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolInterventionActReference typeCode='REFR' constraints.validation.error='InterventionActReferenceTypeCode InterventionActReferenceExternalDocumentReference'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vsfvwV9xEey5t-mahoHmrg" base_Class="_QcUL8JBGEeOZX935IVJfOg">
+  <Ecore:EClass xmi:id="_HCQIAH3sEeyivuDeOiJBMg" base_Class="_QcUL8JBGEeOZX935IVJfOg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ExternalDocumentReferenceTemplateId ExternalDocumentReferenceClassCode ExternalDocumentReferenceMoodCode ExternalDocumentReferenceId ExternalDocumentReferenceCode' templateId.root='2.16.840.1.113883.10.20.22.4.115' classCode='DOCCLIN' moodCode='EVN' constraints.validation.warning='ExternalDocumentReferenceSetId ExternalDocumentReferenceVersionNumber'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vsnrkl9xEey5t-mahoHmrg" base_Class="_KRcPwJXFEeOgXcDbh8Igkw">
+  <Ecore:EClass xmi:id="_HCYD0n3sEeyivuDeOiJBMg" base_Class="_KRcPwJXFEeOgXcDbh8Igkw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlannedImmunizationActivityTemplateId PlannedImmunizationActivityClassCode PlannedImmunizationActivityMoodCode PlannedImmunizationActivityMoodCodeP PlannedImmunizationActivityId PlannedImmunizationActivityStatusCode PlannedImmunizationActivityStatusCodeP PlannedImmunizationActivityEffectiveTime PlannedImmunizationActivityRouteCode PlannedImmunizationActivityApproachSiteCode PlannedImmunizationActivityConsumable PlannedImmunizationActivityCETranslation PlannedImmunizationActivityConsumableImmunizationMedicationInformation2 PlannedImmunizationActivityPreconditionTypeCode PlannedImmunizationActivityPreconditionPreconditionForSubstanceAdministration2' templateId.root='2.16.840.1.113883.10.20.22.4.120' classCode='SBADM' constraints.validation.dependOn.PlannedImmunizationActivityMoodCode='PlannedImmunizationActivityMoodCodeP' statusCode.code='active' constraints.validation.info='PlannedImmunizationActivityRepeatNumber PlannedImmunizationActivityRouteCodeP PlannedImmunizationActivityApproachSiteCodeP PlannedImmunizationActivityDoseQuantity PlannedImmunizationActivityPerformer PlannedImmunizationActivityAuthorParticipation PlannedImmunizationActivityPriorityPreference PlannedImmunizationActivityIndication2 PlannedImmunizationActivityInstruction2 PlannedImmunizationActivityPrecondition' routeCode.codeSystem='2.16.840.1.113883.3.26.1.1' routeCode.codeSystemName='NCI Thesaurus' constraints.validation.dependOn.PlannedImmunizationActivityRouteCode='PlannedImmunizationActivityRouteCodeP' approachSiteCode.codeSystem='2.16.840.1.113883.6.96' approachSiteCode.codeSystemName='SNOMEDCT' constraints.validation.dependOn.PlannedImmunizationActivityApproachSiteCode='PlannedImmunizationActivityApproachSiteCodeP' constraints.validation.warning='PlannedImmunizationActivityCETranslationP PlannedImmunizationActivityIVLPQUnit' constraints.validation.query='PlannedImmunizationActivityCETranslationP PlannedImmunizationActivityCETranslation PlannedImmunizationActivityIVLPQUnit PlannedImmunizationActivityConsumableImmunizationMedicationInformation2 PlannedImmunizationActivityPreconditionTypeCode PlannedImmunizationActivityPreconditionPreconditionForSubstanceAdministration2' constraints.validation.dependOn.PlannedImmunizationActivityCETranslation='PlannedImmunizationActivityCETranslationP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPlannedImmunizationActivityIVLPQ unit='1' constraints.validation.warning='PlannedImmunizationActivityIVLPQUnit'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPlannedImmunizationActivityPrecondition typeCode='PRCN' constraints.validation.error='PlannedImmunizationActivityPreconditionTypeCode PlannedImmunizationActivityPreconditionPreconditionForSubstanceAdministration2'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPlannedImmunizationActivityConsumable constraints.validation.error='PlannedImmunizationActivityConsumableImmunizationMedicationInformation2'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPlannedImmunizationActivityCE translation.codeSystem='2.16.840.1.113883.6.96' translation.codeSystemName='SNOMEDCT' constraints.validation.error='PlannedImmunizationActivityCETranslation' constraints.validation.warning='PlannedImmunizationActivityCETranslationP' constraints.validation.dependOn.PlannedImmunizationActivityCETranslation='PlannedImmunizationActivityCETranslationP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vxPs4F9xEey5t-mahoHmrg" base_Class="_GXlxYJmLEeOeSLwbllPCyw">
+  <Ecore:EClass xmi:id="_HGtKMH3sEeyivuDeOiJBMg" base_Class="_GXlxYJmLEeOeSLwbllPCyw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PrognosisObservationTemplateId PrognosisObservationClassCode PrognosisObservationMoodCode PrognosisObservationCode PrognosisObservationCodeP PrognosisObservationStatusCode PrognosisObservationStatusCodeP PrognosisObservationEffectiveTime PrognosisObservationValue' templateId.root='2.16.840.1.113883.10.20.22.4.113' classCode='OBS' moodCode='EVN' code.code='75328-5' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Prognosis' constraints.validation.dependOn.PrognosisObservationCode='PrognosisObservationCodeP' statusCode.code='completed'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vxZd4l9xEey5t-mahoHmrg" base_Class="_0NewYJmVEeOLJeQez13EkQ">
+  <Ecore:EClass xmi:id="_HG5-gH3sEeyivuDeOiJBMg" base_Class="_0NewYJmVEeOLJeQez13EkQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProgressTowardGoalObservationTemplateId ProgressTowardGoalObservationClassCode ProgressTowardGoalObservationMoodCode ProgressTowardGoalObservationId ProgressTowardGoalObservationCode ProgressTowardGoalObservationCodeP ProgressTowardGoalObservationStatusCode ProgressTowardGoalObservationStatusCodeP ProgressTowardGoalObservationValue ProgressTowardGoalObservationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.110' classCode='OBS' moodCode='EVN' code.code='ASSERTION' code.codeSystem='2.16.840.1.113883.5.4' code.codeSystemName='HL7ActCode' code.displayName='Assertion' constraints.validation.dependOn.ProgressTowardGoalObservationCode='ProgressTowardGoalObservationCodeP' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vydN0F9xEey5t-mahoHmrg" base_Class="_ncafYJmaEeOLJeQez13EkQ">
+  <Ecore:EClass xmi:id="_HH-8kH3sEeyivuDeOiJBMg" base_Class="_ncafYJmaEeOLJeQez13EkQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PriorityPreferenceTemplateId PriorityPreferenceClassCode PriorityPreferenceMoodCode PriorityPreferenceId PriorityPreferenceCode PriorityPreferenceCodeP PriorityPreferenceValue PriorityPreferenceValueP' templateId.root='2.16.840.1.113883.10.20.22.4.143' classCode='OBS' moodCode='EVN' code.code='225773000' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' code.displayName='Preference' constraints.validation.dependOn.PriorityPreferenceCode='PriorityPreferenceCodeP' constraints.validation.warning='PriorityPreferenceEffectiveTime PriorityPreferenceAuthorParticipation' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_vzfvoF9xEey5t-mahoHmrg" base_Class="_nC0xUJmzEeOLJeQez13EkQ">
+  <Ecore:EClass xmi:id="_HJOSsX3sEeyivuDeOiJBMg" base_Class="_nC0xUJmzEeOLJeQez13EkQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SelfCareActivitiesTemplateId SelfCareActivitiesClassCode SelfCareActivitiesMoodCode SelfCareActivitiesCodeP SelfCareActivitiesStatusCode SelfCareActivitiesStatusCodeP SelfCareActivitiesEffectiveTime SelfCareActivitiesValueP' templateId.root='2.16.840.1.113883.10.20.22.4.128' classCode='OBS' moodCode='EVN' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.warning='SelfCareActivitiesCode SelfCareActivitiesValue SelfCareActivitiesAuthorParticipation' constraints.validation.dependOn.SelfCareActivitiesCode='SelfCareActivitiesCodeP' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_v1wZcF9xEey5t-mahoHmrg" base_Class="_kyeGAJm4EeOLJeQez13EkQ">
+  <Ecore:EClass xmi:id="_HLWZoX3sEeyivuDeOiJBMg" base_Class="_kyeGAJm4EeOLJeQez13EkQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SensoryStatusTemplateId SensoryStatusClassCode SensoryStatusMoodCode SensoryStatusCodeP SensoryStatusStatusCode SensoryStatusStatusCodeP SensoryStatusEffectiveTime SensoryStatusValueP SensoryStatusIVLTSLow' templateId.root='2.16.840.1.113883.10.20.22.4.127' classCode='OBS' moodCode='EVN' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' constraints.validation.warning='SensoryStatusCode SensoryStatusValue SensoryStatusAuthorParticipation' constraints.validation.dependOn.SensoryStatusCode='SensoryStatusCodeP' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.info='SensoryStatusAssessmentScaleObservation SensoryStatusIVLTSHigh' constraints.validation.query='SensoryStatusIVLTSLow SensoryStatusIVLTSHigh'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolSensoryStatusIVLTS constraints.validation.error='SensoryStatusIVLTSLow' constraints.validation.info='SensoryStatusIVLTSHigh'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_v4SJAF9xEey5t-mahoHmrg" base_Class="_KTrEAJpdEeOK6dzbL4VoTA">
+  <Ecore:EClass xmi:id="_HOGLoH3sEeyivuDeOiJBMg" base_Class="_KTrEAJpdEeOK6dzbL4VoTA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SubstanceAdministeredActTemplateId SubstanceAdministeredActClassCode SubstanceAdministeredActMoodCode SubstanceAdministeredActId SubstanceAdministeredActCode SubstanceAdministeredActCodeP SubstanceAdministeredActStatusCode SubstanceAdministeredActStatusCodeP' templateId.root='2.16.840.1.113883.10.20.22.4.118' classCode='ACT' moodCode='EVN' code.code='416118004' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' code.displayName='Administration' constraints.validation.dependOn.SubstanceAdministeredActCode='SubstanceAdministeredActCodeP' statusCode.code='completed' constraints.validation.info='SubstanceAdministeredActEffectiveTime'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_v4chEV9xEey5t-mahoHmrg" base_Class="_D6Lm0JpnEeOK6dzbL4VoTA">
+  <Ecore:EClass xmi:id="_HOS_8n3sEeyivuDeOiJBMg" base_Class="_D6Lm0JpnEeOK6dzbL4VoTA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='WoundCharacteristicTemplateId WoundCharacteristicClassCode WoundCharacteristicMoodCode WoundCharacteristicId WoundCharacteristicCode WoundCharacteristicCodeP WoundCharacteristicStatusCode WoundCharacteristicStatusCodeP WoundCharacteristicEffectiveTime WoundCharacteristicValue WoundCharacteristicValueP' templateId.root='2.16.840.1.113883.10.20.22.4.134' classCode='OBS' moodCode='EVN' code.code='ASSERTION' code.codeSystem='2.16.840.1.113883.5.4' code.codeSystemName='HL7ActCode' code.displayName='assertion' constraints.validation.dependOn.WoundCharacteristicCode='WoundCharacteristicCodeP' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_v5rQIF9xEey5t-mahoHmrg" base_Class="_94MpsJp7EeOK6dzbL4VoTA">
+  <Ecore:EClass xmi:id="_HPddkX3sEeyivuDeOiJBMg" base_Class="_94MpsJp7EeOK6dzbL4VoTA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='WoundMeasurementObservationTemplateId WoundMeasurementObservationClassCode WoundMeasurementObservationMoodCode WoundMeasurementObservationId WoundMeasurementObservationCode WoundMeasurementObservationCodeP WoundMeasurementObservationStatusCode WoundMeasurementObservationStatusCodeP WoundMeasurementObservationEffectiveTime WoundMeasurementObservationValue' templateId.root='2.16.840.1.113883.10.20.22.4.133' classCode='OBS' moodCode='EVN' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.WoundMeasurementObservationCode='WoundMeasurementObservationCodeP' statusCode.code='completed'</annotation>
   </Ecore:EClass>
-  <CDA:ConformsTo xmi:id="_v6yqcF9xEey5t-mahoHmrg" base_Generalization="_09uFMZp_EeOK6dzbL4VoTA"/>
-  <Ecore:EClass xmi:id="_v6zRgF9xEey5t-mahoHmrg" base_Class="_09uFMJp_EeOK6dzbL4VoTA">
+  <CDA:ConformsTo xmi:id="_HQkQ0H3sEeyivuDeOiJBMg" base_Generalization="_09uFMZp_EeOK6dzbL4VoTA"/>
+  <Ecore:EClass xmi:id="_HQk34X3sEeyivuDeOiJBMg" base_Class="_09uFMJp_EeOK6dzbL4VoTA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProblemObservation2TemplateId LongitudinalCareWoundObservationClassCode LongitudinalCareWoundObservationMoodCode LongitudinalCareWoundObservationCode LongitudinalCareWoundObservationCodeP LongitudinalCareWoundObservationValueP LongitudinalCareWoundObservationCDCRCDCode LongitudinalCareWoundObservationCDCRName LongitudinalCareWoundObservationCDCRNameP LongitudinalCareWoundObservationCDCRValue' templateId.root='2.16.840.1.113883.10.20.22.4.114' templateId.extension='2015-08-01' classCode='OBS' moodCode='EVN' code.code='ASSERTION' code.codeSystem='2.16.840.1.113883.5.4' code.codeSystemName='HL7ActCode' code.displayName='assertion' constraints.validation.dependOn.LongitudinalCareWoundObservationCode='LongitudinalCareWoundObservationCodeP' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.warning='LongitudinalCareWoundObservationValue LongitudinalCareWoundObservationTargetSiteCode LongitudinalCareWoundObservationTargetSiteCodeP LongitudinalCareWoundObservationWoundMeasurementObservation LongitudinalCareWoundObservationWoundCharacteristics LongitudinalCareWoundObservationAuthorParticipation LongitudinalCareWoundObservationCDCRCDValueTerminology' constraints.validation.dependOn.LongitudinalCareWoundObservationValue='LongitudinalCareWoundObservationValueP' targetSiteCode.codeSystem='2.16.840.1.113883.6.96' targetSiteCode.codeSystemName='SNOMEDCT' constraints.validation.info='LongitudinalCareWoundObservationHighestPressureUlcerStage LongitudinalCareWoundObservationNumberOfPressureUlcersObservation2 LongitudinalCareWoundObservationCDQualifier' constraints.validation.query='LongitudinalCareWoundObservationCDCRCDValueTerminology LongitudinalCareWoundObservationCDCRCDCode LongitudinalCareWoundObservationCDCRName LongitudinalCareWoundObservationCDCRNameP LongitudinalCareWoundObservationCDCRValue LongitudinalCareWoundObservationCDQualifier'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolLongitudinalCareWoundObservationCD constraints.validation.info='LongitudinalCareWoundObservationCDQualifier' constraints.validation.warning='CDCRLongitudinalCareWoundObservationCDCRCDValueTerminology' constraints.validation.query='CDCRLongitudinalCareWoundObservationCDCRCDValueTerminology LongitudinalCareWoundObservationCDCRCDCode LongitudinalCareWoundObservationCDCRName LongitudinalCareWoundObservationCDCRNameP LongitudinalCareWoundObservationCDCRValue' constraints.validation.error='LongitudinalCareWoundObservationCDCRCDCode LongitudinalCareWoundObservationCDCRName LongitudinalCareWoundObservationCDCRNameP LongitudinalCareWoundObservationCDCRValue'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolLongitudinalCareWoundObservationCDCR name.code='272741003' name.codeSystemName='' name.displayName='laterality' constraints.validation.error='LongitudinalCareWoundObservationCDCRName LongitudinalCareWoundObservationCDCRNameP LongitudinalCareWoundObservationCDCRValue LongitudinalCareWoundObservationCDCRCDCode' constraints.validation.warning='CRLongitudinalCareWoundObservationCDCRCDValueTerminology' constraints.validation.query='CRLongitudinalCareWoundObservationCDCRCDValueTerminology LongitudinalCareWoundObservationCDCRCDCode'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolLongitudinalCareWoundObservationCDCRCD constraints.validation.warning='LongitudinalCareWoundObservationCDCRCDValueTerminology' constraints.validation.error='LongitudinalCareWoundObservationCDCRCDCode'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_v-bNQl9xEey5t-mahoHmrg" base_Class="_YPOXoJ14EeORR8_YW0n_jQ">
+  <Ecore:EClass xmi:id="_HUS6QH3sEeyivuDeOiJBMg" base_Class="_YPOXoJ14EeORR8_YW0n_jQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='GoalsSectionTemplateId GoalsSectionCode GoalsSectionCodeP GoalsSectionTitle GoalsSectionText GoalsSectionGoalObservation' templateId.root='2.16.840.1.113883.10.20.22.2.60' nullFlavor='NI' constraints.validation.info='GoalsSectionNullFlavor' code.code='61146-7' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Goals'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_v_AcF19xEey5t-mahoHmrg" base_Class="_2umuYJ18EeORR8_YW0n_jQ">
+  <Ecore:EClass xmi:id="_HU6lUH3sEeyivuDeOiJBMg" base_Class="_2umuYJ18EeORR8_YW0n_jQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HealthConcernsSectionTemplateId HealthConcernsSectionCode HealthConcernsSectionCodeP HealthConcernsSectionTitle HealthConcernsSectionText HealthConcernsSectionHealthConcernAct' templateId.root='2.16.840.1.113883.10.20.22.2.58' templateId.extension='2015-08-01' nullFlavor='NI' constraints.validation.info='HealthConcernsSectionNullFlavor HealthConcernsSectionRiskConcernAct' code.code='75310-3' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Health concerns document' constraints.validation.warning='HealthConcernsSectionHealthStatusObservation2'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_v_m5AF9xEey5t-mahoHmrg" base_Class="_EHgh0J2AEeORR8_YW0n_jQ">
+  <Ecore:EClass xmi:id="_HVxg8H3sEeyivuDeOiJBMg" base_Class="_EHgh0J2AEeORR8_YW0n_jQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HealthStatusEvaluationsAndOutcomesSectionTemplateId HealthStatusEvaluationsAndOutcomesSectionCode HealthStatusEvaluationsAndOutcomesSectionCodeP HealthStatusEvaluationsAndOutcomesSectionTitle HealthStatusEvaluationsAndOutcomesSectionText HealthStatusEvaluationsAndOutcomesSectionOutcomeObservation' templateId.root='2.16.840.1.113883.10.20.22.2.61' nullFlavor='NI' constraints.validation.info='HealthStatusEvaluationsAndOutcomesSectionNullFlavor' code.code='11383-7' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Patient Problem Outcome'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_wALgwF9xEey5t-mahoHmrg" base_Class="_4tfOMJ2CEeORR8_YW0n_jQ">
+  <Ecore:EClass xmi:id="_HWhu4H3sEeyivuDeOiJBMg" base_Class="_4tfOMJ2CEeORR8_YW0n_jQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MentalStatusSectionTemplateId MentalStatusSectionCode MentalStatusSectionCodeP MentalStatusSectionTitle MentalStatusSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.56' templateId.extension='2015-08-01' code.code='10190-7' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Mental Status' constraints.validation.info='MentalStatusSectionAssessmentScaleObservation MentalStatusSectionMentalStatusOrganizer2 MentalStatusSectionMentalStatusObservation2'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_wAx9sF9xEey5t-mahoHmrg" base_Class="_MlM4IJ2GEeORR8_YW0n_jQ">
+  <Ecore:EClass xmi:id="_HXMdRH3sEeyivuDeOiJBMg" base_Class="_MlM4IJ2GEeORR8_YW0n_jQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='NutritionSectionTemplateId NutritionSectionCode NutritionSectionCodeP NutritionSectionTitle NutritionSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.57' code.code='61144-2' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Diet and nutrition' constraints.validation.warning='NutritionSectionNutritionalStatusObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_wBUwQl9xEey5t-mahoHmrg" base_Class="_CDn9gJ2LEeORR8_YW0n_jQ">
+  <Ecore:EClass xmi:id="_HX62AH3sEeyivuDeOiJBMg" base_Class="_CDn9gJ2LEeORR8_YW0n_jQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PhysicalFindingsOfSkinSectionTemplateId PhysicalFindingsOfSkinSectionCode PhysicalFindingsOfSkinSectionCodeP PhysicalFindingsOfSkinSectionTitle PhysicalFindingsOfSkinSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.62' code.code='10206-1' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Physical findings of Skin Narrative' constraints.validation.info='PhysicalFindingsOfSkinSectionWoundObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_wB7NMF9xEey5t-mahoHmrg" base_Class="_dduXkJ5OEeOr4eM3k36wAg">
+  <Ecore:EClass xmi:id="_HYfdwX3sEeyivuDeOiJBMg" base_Class="_dduXkJ5OEeOr4eM3k36wAg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='USRealmHeader2TemplateId USRealmHeader2DocCodesOnly GeneralHeaderConstraintsRealmCode GeneralHeaderConstraintsTitle GeneralHeaderConstraintsRecordTarget GeneralHeaderConstraintsAuthor GeneralHeaderConstraintsCustodian USRealmHeader2RecordTargetPatientRolePatientGuardianCodeTerminology GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCode GeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToYear GeneralHeaderConstraintsRecordTargetPatientRolePatientTSValue GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlaceHasState GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlace GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCode GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCode GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthTime USRealmHeader2RecordTargetPatientRolePatientSDTCEthnicGroupCode GeneralHeaderConstraintsRecordTargetPatientRolePatient GeneralHeaderConstraintsRecordTargetPatientRole GeneralHeaderConstraintsDataEntererAssignedEntityCode GeneralHeaderConstraintsDataEntererAssignedEntity GeneralHeaderConstraintsAuthorAssignedAuthorCodeP GeneralHeaderConstraintsAuthorAssignedAuthorCode GeneralHeaderConstraintsAuthorAssignedAuthor GeneralHeaderConstraintsInformationRecipientIntendedRecipient USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsInformantAssignedEntityCode GeneralHeaderConstraintsInformantAssignedEntityAddr GeneralHeaderConstraintsInformantRelatedEntityAddr GeneralHeaderConstraintsInformantRelatedEntityPerson GeneralHeaderConstraintsInformantHasAssignedEntityOrRelatedEntity USRealmHeader2GeneralHeaderConstraintsInformantAssignedEntity USRealmHeader2GeneralHeaderConstraintsInformantRelatedEntity GeneralHeaderConstraintsComponentOfEncompassingEncounter GeneralHeaderConstraintsParticipantSupportAssociatedEntityHasAssociatedPersonOrScopingOrganization GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntity GeneralHeaderConstraintsDocumentationOfServiceEvent' templateId.root='2.16.840.1.113883.10.20.22.1.1' templateId.extension='2015-08-01' constraints.validation.info='GeneralHeaderConstraintsDataEnterer GeneralHeaderConstraintsInformationRecipient GeneralHeaderConstraintsAuthenticator GeneralHeaderConstraintsInformant GeneralHeaderConstraintsInFulfillmentOf GeneralHeaderConstraintsComponentOf GeneralHeaderConstraintsSupportParticipant GeneralHeaderConstraintsDocumentationOf GeneralHeaderConstraintsAuthorization GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCodeFromPersonalRelationshipOrResponsibleParty USRealmHeader2RecordTargetPatientRolePatientTSBirthTimePreciseToMinute USRealmHeader2RecordTargetPatientRolePatientSDTCEthnicGroupCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardian GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplace GeneralHeaderConstraintsDataEntererAssignedEntityCodeP USRealmHeader2InformationRecipientIntendedRecipientId USRealmHeader2LegalAuthenticatorSDTCSignatureText USRealmHeader2AuthenticatorSDTCSignatureText GeneralHeaderConstraintsInformantAssignedEntityCodeP GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCodeP' constraints.validation.warning='GeneralHeaderConstraintsLegalAuthenticator GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTELUse GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCode GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTelecom GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationPreferenceInd GeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToDay GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunication USRealmHeader2AuthorAssignedAuthorIfAssignedPersonThenContainsCode USRealmHeader2AuthorAssignedAuthorCodeTerminology USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressState USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCodeP GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCode GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCode GeneralHeaderConstraintsDocumentationOfServiceEventPerformer' constraints.validation.query='GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTELUse GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCodeFromPersonalRelationshipOrResponsibleParty USRealmHeader2RecordTargetPatientRolePatientGuardianCodeTerminology GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCode GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTelecom GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCode GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationPreferenceInd GeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToYear GeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToDay USRealmHeader2RecordTargetPatientRolePatientTSBirthTimePreciseToMinute GeneralHeaderConstraintsRecordTargetPatientRolePatientTSValue GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlaceHasState GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlace GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCode GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCode GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCodeP GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthTime USRealmHeader2RecordTargetPatientRolePatientSDTCEthnicGroupCodeP USRealmHeader2RecordTargetPatientRolePatientSDTCEthnicGroupCode GeneralHeaderConstraintsRecordTargetPatientRolePatientGuardian GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunication GeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplace GeneralHeaderConstraintsRecordTargetPatientRolePatient GeneralHeaderConstraintsRecordTargetPatientRole GeneralHeaderConstraintsDataEntererAssignedEntityCodeP GeneralHeaderConstraintsDataEntererAssignedEntityCode GeneralHeaderConstraintsDataEntererAssignedEntity USRealmHeader2AuthorAssignedAuthorIfAssignedPersonThenContainsCode USRealmHeader2AuthorAssignedAuthorCodeTerminology GeneralHeaderConstraintsAuthorAssignedAuthorCodeP GeneralHeaderConstraintsAuthorAssignedAuthorCode GeneralHeaderConstraintsAuthorAssignedAuthor USRealmHeader2InformationRecipientIntendedRecipientId GeneralHeaderConstraintsInformationRecipientIntendedRecipient USRealmHeader2LegalAuthenticatorSDTCSignatureText USRealmHeader2AuthenticatorSDTCSignatureText USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressState USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode USRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine GeneralHeaderConstraintsInformantAssignedEntityCodeP GeneralHeaderConstraintsInformantAssignedEntityCode GeneralHeaderConstraintsInformantAssignedEntityAddr GeneralHeaderConstraintsInformantRelatedEntityAddr GeneralHeaderConstraintsInformantRelatedEntityPerson GeneralHeaderConstraintsInformantHasAssignedEntityOrRelatedEntity USRealmHeader2GeneralHeaderConstraintsInformantAssignedEntity USRealmHeader2GeneralHeaderConstraintsInformantRelatedEntity GeneralHeaderConstraintsComponentOfEncompassingEncounter GeneralHeaderConstraintsParticipantSupportAssociatedEntityHasAssociatedPersonOrScopingOrganization GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCodeP GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCode GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCodeP GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCode GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntity GeneralHeaderConstraintsDocumentationOfServiceEventPerformer GeneralHeaderConstraintsDocumentationOfServiceEvent' constraints.validation.dependOn.GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCode='GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCodeP' constraints.validation.dependOn.USRealmHeader2RecordTargetPatientRolePatientSDTCEthnicGroupCode='USRealmHeader2RecordTargetPatientRolePatientSDTCEthnicGroupCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsDataEntererAssignedEntityCode='GeneralHeaderConstraintsDataEntererAssignedEntityCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsAuthorAssignedAuthorCode='GeneralHeaderConstraintsAuthorAssignedAuthorCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsInformantAssignedEntityCode='GeneralHeaderConstraintsInformantAssignedEntityCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCode='GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCode='GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolUSRealmHeader2RecordTarget constraints.validation.error='GeneralHeaderConstraintsRecordTargetPatientRole'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolUSRealmHeader2RecordTargetPatientRole constraints.validation.error='GeneralHeaderConstraintsRecordTargetPatientRolePatient'</annotation>
@@ -47206,7 +47206,7 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolUSRealmHeader2DocumentationOfServiceEventPerformer1 functionCode.codeSystem='2.16.840.1.113883.5.88' functionCode.codeSystemName='ParticipationFunction' constraints.validation.warning='GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCode' constraints.validation.info='GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCode='GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCodeP' constraints.validation.error='GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolUSRealmHeader2DocumentationOfServiceEventPerformer1AssignedEntity code.codeSystem='2.16.840.1.113883.6.101' code.codeSystemName='NUCC Health Care Provider Taxonomy' constraints.validation.warning='GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCode GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCodeP' constraints.validation.dependOn.GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCode='GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_wKfTUl9xEey5t-mahoHmrg" base_Class="_2jWfwJ5wEeOr4eM3k36wAg">
+  <Ecore:EClass xmi:id="_HgKMAX3sEeyivuDeOiJBMg" base_Class="_2jWfwJ5wEeOr4eM3k36wAg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='USRealmHeader2TemplateId CarePlanDoesNotHavePlanOfTreatmentSectionV2 CarePlanCode CarePlanCodeP CarePlanDocumentationOf CarePlanHealthConcernsSection CarePlanGoalsSection CarePlanInformationRecipientIntendedRecipientInformationRecipientGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent CarePlanInformationRecipientIntendedRecipientInformationRecipientName CarePlanInformationRecipientIntendedRecipientReceivedOrganizationName CarePlanInformationRecipientIntendedRecipientReceivedOrganizationStandardIndustryClassCode CarePlanInformationRecipientIntendedRecipientId CarePlanInformationRecipientIntendedRecipient CarePlanAuthenticatorAssignedEntityId CarePlanAuthenticatorAssignedEntityCode CarePlanAuthenticatorAssignedEntityCodeP CarePlanAuthenticatorTime CarePlanAuthenticatorSignatureCode CarePlanAuthenticatorAssignedEntity CarePlanParticipantCarePlanReviewAssociatedEntityClassCode CarePlanParticipantCarePlanReviewAssociatedEntityId CarePlanParticipantCarePlanReviewTypeCode CarePlanParticipantCarePlanReviewFunctionCode CarePlanParticipantCarePlanReviewFunctionCodeP CarePlanParticipantCarePlanReviewTime CarePlanParticipantCarePlanReviewAssociatedEntity CarePlanParticipantCaregiverAssociatedEntityAssociatedPersonName CarePlanParticipantCaregiverAssociatedEntityClassCodeP CarePlanParticipantCaregiverAssociatedEntityClassCode CarePlanParticipantCaregiverAssociatedEntityAssociatedPerson CarePlanParticipantCaregiverTypeCode CarePlanParticipantCaregiverAssociatedEntity CarePlanDocumentationOfServiceEventIVLTSLow CarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent CarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonName CarePlanDocumentationOfServiceEventPerformerAssignedEntityId CarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPerson CarePlanDocumentationOfServiceEventPerformerAssignedEntity CarePlanDocumentationOfServiceEventClassCode CarePlanDocumentationOfServiceEventEffectiveTime CarePlanDocumentationOfServiceEventPerformer1 CarePlanDocumentationOfServiceEvent CarePlanRelatedDocumentParentDocumentId CarePlanRelatedDocumentParentDocumentSetId CarePlanRelatedDocumentParentDocumentVersionNumber CarePlanRelatedDocumentTypeCodeP CarePlanRelatedDocumentTypeCode CarePlanRelatedDocumentParentDocument CarePlanComponentOfEncompassingEncounterEffectiveTime CarePlanComponentOfEncompassingEncounter' templateId.root='2.16.840.1.113883.10.20.22.1.15' templateId.extension='2015-08-01' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.CarePlanCode='CarePlanCodeP' constraints.validation.warning='CarePlanSetId CarePlanVersionNumber CarePlanInformationRecipient CarePlanAuthenticator CarePlanParticipantCarePlanReview CarePlanParticipantCaregiver CarePlanComponentOf CarePlanHealthStatusEvaluationsOutcomesSection CarePlanInterventionsSection2 CarePlanInformationRecipientIntendedRecipientReceivedOrganizationId CarePlanInformationRecipientIntendedRecipientReceivedOrganizationStandardIndustryClassCodeP CarePlanInformationRecipientIntendedRecipientAddr CarePlanInformationRecipientIntendedRecipientTelecom CarePlanInformationRecipientIntendedRecipientInformationRecipient CarePlanInformationRecipientIntendedRecipientReceivedOrganization CarePlanParticipantCarePlanReviewAssociatedEntityCodeP CarePlanParticipantCarePlanReviewAssociatedEntityCode' constraints.validation.info='CarePlanRelatedDocument CarePlanAuthenticatorSDTCSignatureText CarePlanDocumentationOfServiceEventIVLTSHigh CarePlanDocumentationOfServiceEventPerformerAssignedEntityCode' constraints.validation.query='CarePlanInformationRecipientIntendedRecipientInformationRecipientGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent CarePlanInformationRecipientIntendedRecipientInformationRecipientName CarePlanInformationRecipientIntendedRecipientReceivedOrganizationId CarePlanInformationRecipientIntendedRecipientReceivedOrganizationName CarePlanInformationRecipientIntendedRecipientReceivedOrganizationStandardIndustryClassCodeP CarePlanInformationRecipientIntendedRecipientReceivedOrganizationStandardIndustryClassCode CarePlanInformationRecipientIntendedRecipientId CarePlanInformationRecipientIntendedRecipientAddr CarePlanInformationRecipientIntendedRecipientTelecom CarePlanInformationRecipientIntendedRecipientInformationRecipient CarePlanInformationRecipientIntendedRecipientReceivedOrganization CarePlanInformationRecipientIntendedRecipient CarePlanAuthenticatorAssignedEntityId CarePlanAuthenticatorAssignedEntityCode CarePlanAuthenticatorAssignedEntityCodeP CarePlanAuthenticatorTime CarePlanAuthenticatorSignatureCode CarePlanAuthenticatorSDTCSignatureText CarePlanAuthenticatorAssignedEntity CarePlanParticipantCarePlanReviewAssociatedEntityClassCode CarePlanParticipantCarePlanReviewAssociatedEntityId CarePlanParticipantCarePlanReviewAssociatedEntityCodeP CarePlanParticipantCarePlanReviewAssociatedEntityCode CarePlanParticipantCarePlanReviewTypeCode CarePlanParticipantCarePlanReviewFunctionCode CarePlanParticipantCarePlanReviewFunctionCodeP CarePlanParticipantCarePlanReviewTime CarePlanParticipantCarePlanReviewAssociatedEntity CarePlanParticipantCaregiverAssociatedEntityAssociatedPersonName CarePlanParticipantCaregiverAssociatedEntityClassCodeP CarePlanParticipantCaregiverAssociatedEntityClassCode CarePlanParticipantCaregiverAssociatedEntityAssociatedPerson CarePlanParticipantCaregiverTypeCode CarePlanParticipantCaregiverAssociatedEntity CarePlanDocumentationOfServiceEventIVLTSLow CarePlanDocumentationOfServiceEventIVLTSHigh CarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent CarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonName CarePlanDocumentationOfServiceEventPerformerAssignedEntityId CarePlanDocumentationOfServiceEventPerformerAssignedEntityCode CarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPerson CarePlanDocumentationOfServiceEventPerformerAssignedEntity CarePlanDocumentationOfServiceEventClassCode CarePlanDocumentationOfServiceEventEffectiveTime CarePlanDocumentationOfServiceEventPerformer1 CarePlanDocumentationOfServiceEvent CarePlanRelatedDocumentParentDocumentId CarePlanRelatedDocumentParentDocumentSetId CarePlanRelatedDocumentParentDocumentVersionNumber CarePlanRelatedDocumentTypeCodeP CarePlanRelatedDocumentTypeCode CarePlanRelatedDocumentParentDocument CarePlanComponentOfEncompassingEncounterEffectiveTime CarePlanComponentOfEncompassingEncounter' constraints.validation.dependOn.CarePlanInformationRecipientIntendedRecipientReceivedOrganizationStandardIndustryClassCode='CarePlanInformationRecipientIntendedRecipientReceivedOrganizationStandardIndustryClassCodeP' constraints.validation.dependOn.CarePlanParticipantCarePlanReviewAssociatedEntityCode='CarePlanParticipantCarePlanReviewAssociatedEntityCodeP' constraints.validation.dependOn.CarePlanParticipantCaregiverAssociatedEntityClassCode='CarePlanParticipantCaregiverAssociatedEntityClassCodeP' constraints.validation.dependOn.CarePlanRelatedDocumentTypeCode='CarePlanRelatedDocumentTypeCodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCarePlanInformationRecipient constraints.validation.error='CarePlanInformationRecipientIntendedRecipient'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCarePlanInformationRecipientIntendedRecipient constraints.validation.error='CarePlanInformationRecipientIntendedRecipientId' constraints.validation.warning='CarePlanInformationRecipientIntendedRecipientAddr CarePlanInformationRecipientIntendedRecipientTelecom CarePlanInformationRecipientIntendedRecipientInformationRecipient CarePlanInformationRecipientIntendedRecipientReceivedOrganization'</annotation>
@@ -47230,7 +47230,7 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCarePlanComponentOf constraints.validation.error='CarePlanComponentOfEncompassingEncounter'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCarePlanComponentOfEncompassingEncounter constraints.validation.error='CarePlanComponentOfEncompassingEncounterEffectiveTime'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_wZib8F9xEey5t-mahoHmrg" base_Class="_itRPkKAEEeOQs7VC4HptuQ">
+  <Ecore:EClass xmi:id="_HtTQIH3sEeyivuDeOiJBMg" base_Class="_itRPkKAEEeOQs7VC4HptuQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='USRealmHeader2TemplateId ReferralNoteHasAnAssementAndPlanSection2OrBothAssementSectionAndPlanOfTreatmentSection2 ReferralNoteDoesNotHaveAssementAndPlanSection2WhenAssementAndPlanOfTreatment2ArePresent ReferralNoteCode ReferralNoteCodeP ReferralNoteInformationRecipient ReferralNoteProblemSection2 ReferralNoteAllergiesSection2 ReferralNoteMedicationsSection2 ReferralNoteReasonForReferralSection2 ReferralNoteInformationRecipientIntendedRecipientPersonName ReferralNoteInformationRecipientIntendedRecipientInformationRecipient ReferralNoteInformationRecipientIntendedRecipient ReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent ReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonName ReferralNoteParticipantCaregiverAssociatedEntityClassCodeP ReferralNoteParticipantCaregiverAssociatedEntityClassCode ReferralNoteParticipantCaregiverAssociatedEntityAssociatedPerson ReferralNoteParticipantCaregiverTypeCode ReferralNoteParticipantCaregiverAssociatedEntity ReferralNoteParticipantCallbackContactAssociatedEntityAssociatedPersonName ReferralNoteParticipantCallbackContactAssociatedEntityId ReferralNoteParticipantCallbackContactAssociatedEntityTelecom ReferralNoteParticipantCallbackContactAssociatedEntityClassCode ReferralNoteParticipantCallbackContactAssociatedEntityAssociatedPerson ReferralNoteParticipantCallbackContactTypeCode ReferralNoteParticipantCallbackContactAssociatedEntity' templateId.root='2.16.840.1.113883.10.20.22.1.14' templateId.extension='2015-08-01' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.ReferralNoteCode='ReferralNoteCodeP' constraints.validation.warning='ReferralNoteParticipantCaregiver ReferralNoteParticipantCallbackContact ReferralNotePlanOfTreatmentSection2 ReferralNoteResultsSection2 ReferralNoteFunctionalStatusSection2 ReferralNoteNutritionSection ReferralNoteMentalStatusSection ReferralNoteInformationRecipientIntendedRecipientAddr ReferralNoteInformationRecipientIntendedRecipientTelecom ReferralNoteParticipantCallbackContactAssociatedEntityAddr' constraints.validation.info='ReferralNoteAdvanceDirectivesSectionEntriesOptional2 ReferralNoteHistoryOfPresentIllnessSection ReferralNoteImmunizationsSection2 ReferralNoteProceduresSectionEntriesOptional2 ReferralNoteReviewOfSystemsSection ReferralNoteSocialHistorySection2 ReferralNoteVitalSignsSection2 ReferralNotePhysicalExamSection2 ReferralNoteAdvanceDirectivesSectionEntriesOptional2b ReferralNoteMedicalEquipmentSection2 ReferralNoteAssessmentSection ReferralNoteAssessmentAndPlanSection2 ReferralNoteHistoryOfPastIllnessSection2 ReferralNoteGeneralStatusSection ReferralNoteFamilyHistorySection2 ReferralNoteParticipantCallbackContactAssociatedEntityScopingOrganization' constraints.validation.query='ReferralNoteInformationRecipientIntendedRecipientPersonName ReferralNoteInformationRecipientIntendedRecipientAddr ReferralNoteInformationRecipientIntendedRecipientTelecom ReferralNoteInformationRecipientIntendedRecipientInformationRecipient ReferralNoteInformationRecipientIntendedRecipient ReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent ReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonName ReferralNoteParticipantCaregiverAssociatedEntityClassCodeP ReferralNoteParticipantCaregiverAssociatedEntityClassCode ReferralNoteParticipantCaregiverAssociatedEntityAssociatedPerson ReferralNoteParticipantCaregiverTypeCode ReferralNoteParticipantCaregiverAssociatedEntity ReferralNoteParticipantCallbackContactAssociatedEntityAssociatedPersonName ReferralNoteParticipantCallbackContactAssociatedEntityId ReferralNoteParticipantCallbackContactAssociatedEntityAddr ReferralNoteParticipantCallbackContactAssociatedEntityTelecom ReferralNoteParticipantCallbackContactAssociatedEntityClassCode ReferralNoteParticipantCallbackContactAssociatedEntityAssociatedPerson ReferralNoteParticipantCallbackContactAssociatedEntityScopingOrganization ReferralNoteParticipantCallbackContactTypeCode ReferralNoteParticipantCallbackContactAssociatedEntity' constraints.validation.dependOn.ReferralNoteParticipantCaregiverAssociatedEntityClassCode='ReferralNoteParticipantCaregiverAssociatedEntityClassCodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolReferralNoteInformationRecipient constraints.validation.error='ReferralNoteInformationRecipientIntendedRecipient'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolReferralNoteInformationRecipientIntendedRecipient constraints.validation.warning='ReferralNoteInformationRecipientIntendedRecipientAddr ReferralNoteInformationRecipientIntendedRecipientTelecom' constraints.validation.error='ReferralNoteInformationRecipientIntendedRecipientInformationRecipient'</annotation>
@@ -47242,7 +47242,7 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolReferralNoteParticipantCallbackContactAssociatedEntity constraints.validation.error='ReferralNoteParticipantCallbackContactAssociatedEntityId ReferralNoteParticipantCallbackContactAssociatedEntityTelecom ReferralNoteParticipantCallbackContactAssociatedEntityClassCode ReferralNoteParticipantCallbackContactAssociatedEntityAssociatedPerson' constraints.validation.warning='ReferralNoteParticipantCallbackContactAssociatedEntityAddr' classCode='ASSIGNED' constraints.validation.info='ReferralNoteParticipantCallbackContactAssociatedEntityScopingOrganization'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolReferralNoteParticipantCallbackContactAssociatedEntityAssociatedPerson constraints.validation.error='ReferralNoteParticipantCallbackContactAssociatedEntityAssociatedPersonName'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_wgSkMF9xEey5t-mahoHmrg" base_Class="_mgnrsKDQEeOPqKnBFQcY_A">
+  <Ecore:EClass xmi:id="_HzMcwX3sEeyivuDeOiJBMg" base_Class="_mgnrsKDQEeOPqKnBFQcY_A">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='USRealmHeader2TemplateId TransferSummaryHasAnAssementAndPlanSection2OrBothAssementSectionAndPlanOfTreatmentSection2 TransferSummaryDoesNotHaveAssementAndPlanSection2WhenAssementAndPlanOfTreatment2ArePresent TransferSummaryCode TransferSummaryCodeP TransferSummaryTitle TransferSummaryDocumentationOf TransferSummaryAllergiesSection2 TransferSummaryMedicationsSection2 TransferSummaryProblemSection2 TransferSummaryResultsSection2 TransferSummaryVitalSignsSection2 TransferSummaryReasonForReferralSection2 TransferSummaryParticipantSupportAssociatedEntityAssociatedPersonName TransferSummaryParticipantSupportAssociatedEntityClassCodeP TransferSummaryParticipantSupportAssociatedEntityClassCode TransferSummaryParticipantSupportAssociatedEntityAssociatedPerson TransferSummaryParticipantSupportTypeCode TransferSummaryParticipantSupportAssociatedEntity TransferSummaryParticipantCallbackContactAssociatedEntityAssociatedPersonName TransferSummaryParticipantCallbackContactAssociatedEntityClassCode TransferSummaryParticipantCallbackContactAssociatedEntityId TransferSummaryParticipantCallbackContactAssociatedEntityTelecom TransferSummaryParticipantCallbackContactAssociatedEntityAssociatedPerson TransferSummaryParticipantCallbackContactTypeCode TransferSummaryParticipantCallbackContactAssociatedEntity TransferSummaryDocumentationOfServiceEventPerformerTypeCode TransferSummaryDocumentationOfServiceEventClassCode TransferSummaryDocumentationOfServiceEventPerformer1 TransferSummaryDocumentationOfServiceEvent' templateId.root='2.16.840.1.113883.10.20.22.1.13' templateId.extension='2015-08-01' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.TransferSummaryCode='TransferSummaryCodeP' constraints.validation.warning='TransferSummaryParticipantSupport TransferSummaryParticipantCallbackContact TransferSummaryAdvanceDirectivesSection2 TransferSummaryFunctionalStatusSection2 TransferSummaryProceduresSection2 TransferSummarySocialHistorySection2 TransferSummaryMentalStatusSection TransferSummaryNutritionSection TransferSummaryHistoryOfPresentIllnessSection TransferSummaryDischargeDiagnosisSection2 TransferSummaryParticipantCallbackContactAssociatedEntityAddr TransferSummaryDocumentationOfServiceEventPerformerFunctionCode' constraints.validation.info='TransferSummaryPhysicalExamSection2 TransferSummaryEncountersSection2 TransferSummaryFamilyHistorySection TransferSummaryImmunizationsSectionEntriesOptional2 TransferSummaryMedicalEquipmentSection2 TransferSummaryPayersSection2 TransferSummaryPlanOfTreatmentSection2 TransferSummaryGeneralStatusSection TransferSummaryReviewOfSystemsSection TransferSummaryHistoryOfPastIllnessSection2 TransferSummaryAssessmentAndPlanSection2 TransferSummaryAssessmentSection TransferSummaryAdmissionMedicationsSectionEntriesOptional2 TransferSummaryAdmissionDiagnosisSection2 TransferSummaryCourseOfCareSection TransferSummaryParticipantCallbackContactAssociatedEntityScopingOrganization TransferSummaryDocumentationOfServiceEventPerformerFunctionCodeP TransferSummaryDocumentationOfServiceEventCode' constraints.validation.query='TransferSummaryParticipantSupportAssociatedEntityAssociatedPersonName TransferSummaryParticipantSupportAssociatedEntityClassCodeP TransferSummaryParticipantSupportAssociatedEntityClassCode TransferSummaryParticipantSupportAssociatedEntityAssociatedPerson TransferSummaryParticipantSupportTypeCode TransferSummaryParticipantSupportAssociatedEntity TransferSummaryParticipantCallbackContactAssociatedEntityAssociatedPersonName TransferSummaryParticipantCallbackContactAssociatedEntityClassCode TransferSummaryParticipantCallbackContactAssociatedEntityId TransferSummaryParticipantCallbackContactAssociatedEntityAddr TransferSummaryParticipantCallbackContactAssociatedEntityTelecom TransferSummaryParticipantCallbackContactAssociatedEntityAssociatedPerson TransferSummaryParticipantCallbackContactAssociatedEntityScopingOrganization TransferSummaryParticipantCallbackContactTypeCode TransferSummaryParticipantCallbackContactAssociatedEntity TransferSummaryDocumentationOfServiceEventPerformerTypeCode TransferSummaryDocumentationOfServiceEventPerformerFunctionCodeP TransferSummaryDocumentationOfServiceEventPerformerFunctionCode TransferSummaryDocumentationOfServiceEventClassCode TransferSummaryDocumentationOfServiceEventCode TransferSummaryDocumentationOfServiceEventPerformer1 TransferSummaryDocumentationOfServiceEvent' constraints.validation.dependOn.TransferSummaryParticipantSupportAssociatedEntityClassCode='TransferSummaryParticipantSupportAssociatedEntityClassCodeP' constraints.validation.dependOn.TransferSummaryDocumentationOfServiceEventPerformerFunctionCode='TransferSummaryDocumentationOfServiceEventPerformerFunctionCodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolTransferSummaryParticipantSupport typeCode='IND' constraints.validation.error='TransferSummaryParticipantSupportTypeCode TransferSummaryParticipantSupportAssociatedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolTransferSummaryParticipantSupportAssociatedEntity constraints.validation.error='TransferSummaryParticipantSupportAssociatedEntityClassCode TransferSummaryParticipantSupportAssociatedEntityClassCodeP TransferSummaryParticipantSupportAssociatedEntityAssociatedPerson' constraints.validation.dependOn.TransferSummaryParticipantSupportAssociatedEntityClassCode='TransferSummaryParticipantSupportAssociatedEntityClassCodeP'</annotation>
@@ -47254,7 +47254,7 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolTransferSummaryDocumentationOfServiceEvent classCode='PCPR' constraints.validation.error='TransferSummaryDocumentationOfServiceEventClassCode TransferSummaryDocumentationOfServiceEventPerformer1 TransferSummaryDocumentationOfServiceEventPerformerTypeCode' constraints.validation.info='TransferSummaryDocumentationOfServiceEventCode TransferSummaryDocumentationOfServiceEventPerformerFunctionCodeP' constraints.validation.query='TransferSummaryDocumentationOfServiceEventPerformerTypeCode TransferSummaryDocumentationOfServiceEventPerformerFunctionCodeP TransferSummaryDocumentationOfServiceEventPerformerFunctionCode' constraints.validation.warning='TransferSummaryDocumentationOfServiceEventPerformerFunctionCode' constraints.validation.dependOn.TransferSummaryDocumentationOfServiceEventPerformerFunctionCode='TransferSummaryDocumentationOfServiceEventPerformerFunctionCodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolTransferSummaryDocumentationOfServiceEventPerformer typeCode='PRF' constraints.validation.error='TransferSummaryDocumentationOfServiceEventPerformerTypeCode' functionCode.codeSystem='2.16.840.1.113883.6.101' functionCode.codeSystemName='NUCC Health Care Provider Taxonomy' constraints.validation.warning='TransferSummaryDocumentationOfServiceEventPerformerFunctionCode' constraints.validation.info='TransferSummaryDocumentationOfServiceEventPerformerFunctionCodeP' constraints.validation.dependOn.TransferSummaryDocumentationOfServiceEventPerformerFunctionCode='TransferSummaryDocumentationOfServiceEventPerformerFunctionCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_woe24l9xEey5t-mahoHmrg" base_Class="_OA1xkKi8EeOTwZftO6CV5g">
+  <Ecore:EClass xmi:id="_H6WNoH3sEeyivuDeOiJBMg" base_Class="_OA1xkKi8EeOTwZftO6CV5g">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='USRealmHeader2TemplateId USRealmHeaderPatientGeneratedDocumentRecordTarget USRealmHeaderPatientGeneratedDocumentAuthor USRealmHeaderPatientGeneratedDocumentCustodian USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardianCode USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientIfMoreThanOneLangComm USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRoleId USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatient USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRole USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthorCECode USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthorId USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthor USRealmHeaderPatientGeneratedDocumentDataEntererAssignedEntity USRealmHeaderPatientGeneratedDocumentInformantHasRelatedEntityOrAssignedEntity USRealmHeaderPatientGeneratedDocumentCustodianAssignedCustodianRepresentedCustodianOrganizationId USRealmHeaderPatientGeneratedDocumentCustodianAssignedCustodianRepresentedCustodianOrganization USRealmHeaderPatientGeneratedDocumentCustodianAssignedCustodian USRealmHeaderPatientGeneratedDocumentInformationRecipientIntendedRecipient USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntityId USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntity USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntityId USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntity USRealmHeaderPatientGeneratedDocumentParticipantTypeCode USRealmHeaderPatientGeneratedDocumentParticipantAssociatedEntity USRealmHeaderPatientGeneratedDocumentInFulfillmentOfOrderId USRealmHeaderPatientGeneratedDocumentInFulfillmentOfOrder USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityId USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerFunctionCode USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntity USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEvent' templateId.root='2.16.840.1.113883.10.20.29.1' templateId.extension='2015-08-01' constraints.validation.info='USRealmHeaderPatientGeneratedDocumentDataEnterer USRealmHeaderPatientGeneratedDocumentInformant USRealmHeaderPatientGeneratedDocumentInformationRecipient USRealmHeaderPatientGeneratedDocumentLegalAuthenticator USRealmHeaderPatientGeneratedDocumentAuthenticator USRealmHeaderPatientGeneratedDocumentParticipant USRealmHeaderPatientGeneratedDocumentInFulfillmentOf USRealmHeaderPatientGeneratedDocumentDocumentationOf USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientLanguageCommunicationPreferenceInd USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardian USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRoleProviderOrganization USRealmHeaderPatientGeneratedDocumentDataEntererAssignedEntityCodeP USRealmHeaderPatientGeneratedDocumentInformantRelatedEntityCodeP USRealmHeaderPatientGeneratedDocumentInformantRelatedEntity USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntityCECode USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntityCode USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityCodeP USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerFunctionCodeP' constraints.validation.warning='USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardianId USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardianCodeP USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientLanguageCommunication USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthorCECodeSystemAndTerminology USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthorCode USRealmHeaderPatientGeneratedDocumentDataEntererAssignedEntityCode USRealmHeaderPatientGeneratedDocumentInformantRelatedEntityCode USRealmHeaderPatientGeneratedDocumentInformationRecipientIntendedRecipientIIRoot USRealmHeaderPatientGeneratedDocumentInformationRecipientIntendedRecipientId USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntityCECodeSystemAndTerminology USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntityCodeP USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntityCode USRealmHeaderPatientGeneratedDocumentParticipantAssociatedEntityCodeP USRealmHeaderPatientGeneratedDocumentParticipantAssociatedEntityCode USRealmHeaderPatientGeneratedDocumentParticipantIfTypeCodeINDThenAEClassCodeFromINDRoleclassCodes USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityCode USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventCode USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformer' constraints.validation.query='USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardianId USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardianCodeP USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardianCode USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientLanguageCommunicationPreferenceInd USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientIfMoreThanOneLangComm USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardian USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientLanguageCommunication USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRoleId USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatient USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRoleProviderOrganization USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRole USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthorCECodeSystemAndTerminology USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthorCECode USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthorId USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthorCode USRealmHeaderPatientGeneratedDocumentAuthorAssignedAuthor USRealmHeaderPatientGeneratedDocumentDataEntererAssignedEntityCodeP USRealmHeaderPatientGeneratedDocumentDataEntererAssignedEntityCode USRealmHeaderPatientGeneratedDocumentDataEntererAssignedEntity USRealmHeaderPatientGeneratedDocumentInformantRelatedEntityCodeP USRealmHeaderPatientGeneratedDocumentInformantRelatedEntityCode USRealmHeaderPatientGeneratedDocumentInformantHasRelatedEntityOrAssignedEntity USRealmHeaderPatientGeneratedDocumentInformantRelatedEntity USRealmHeaderPatientGeneratedDocumentCustodianAssignedCustodianRepresentedCustodianOrganizationId USRealmHeaderPatientGeneratedDocumentCustodianAssignedCustodianRepresentedCustodianOrganization USRealmHeaderPatientGeneratedDocumentCustodianAssignedCustodian USRealmHeaderPatientGeneratedDocumentInformationRecipientIntendedRecipientIIRoot USRealmHeaderPatientGeneratedDocumentInformationRecipientIntendedRecipientId USRealmHeaderPatientGeneratedDocumentInformationRecipientIntendedRecipient USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntityCECodeSystemAndTerminology USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntityCECode USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntityId USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntityCode USRealmHeaderPatientGeneratedDocumentLegalAuthenticatorAssignedEntity USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntityId USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntityCodeP USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntityCode USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntity USRealmHeaderPatientGeneratedDocumentParticipantAssociatedEntityCodeP USRealmHeaderPatientGeneratedDocumentParticipantAssociatedEntityCode USRealmHeaderPatientGeneratedDocumentParticipantIfTypeCodeINDThenAEClassCodeFromINDRoleclassCodes USRealmHeaderPatientGeneratedDocumentParticipantTypeCode USRealmHeaderPatientGeneratedDocumentParticipantAssociatedEntity USRealmHeaderPatientGeneratedDocumentInFulfillmentOfOrderId USRealmHeaderPatientGeneratedDocumentInFulfillmentOfOrder USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityId USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityCodeP USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityCode USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerFunctionCodeP USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerFunctionCode USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntity USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventCode USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformer USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEvent' constraints.validation.dependOn.USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardianCode='USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardianCodeP' constraints.validation.dependOn.USRealmHeaderPatientGeneratedDocumentDataEntererAssignedEntityCode='USRealmHeaderPatientGeneratedDocumentDataEntererAssignedEntityCodeP' constraints.validation.dependOn.USRealmHeaderPatientGeneratedDocumentInformantRelatedEntityCode='USRealmHeaderPatientGeneratedDocumentInformantRelatedEntityCodeP' constraints.validation.dependOn.USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntityCode='USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntityCodeP' constraints.validation.dependOn.USRealmHeaderPatientGeneratedDocumentParticipantAssociatedEntityCode='USRealmHeaderPatientGeneratedDocumentParticipantAssociatedEntityCodeP' constraints.validation.dependOn.USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityCode='USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityCodeP' constraints.validation.dependOn.USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerFunctionCode='USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerFunctionCodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolUSRealmHeaderPatientGeneratedDocumentRecordTarget constraints.validation.error='USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRole'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolUSRealmHeaderPatientGeneratedDocumentRecordTargetPatientRole constraints.validation.error='USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRoleId USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatient' constraints.validation.info='USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRoleProviderOrganization'</annotation>
@@ -47288,16 +47288,16 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolUSRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformer functionCode.codeSystem='2.16.840.1.113883.5.90' functionCode.codeSystemName='HL7ParticipationType' constraints.validation.error='USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerFunctionCode USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntity' constraints.validation.info='USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerFunctionCodeP' constraints.validation.dependOn.USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerFunctionCode='USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerFunctionCodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolUSRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntity constraints.validation.error='USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityId' code.codeSystem='2.16.840.1.113883.5.111' code.codeSystemName='RoleCode' constraints.validation.warning='USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityCode' constraints.validation.info='USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityCodeP' constraints.validation.dependOn.USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityCode='USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_w-XnUl9xEey5t-mahoHmrg" base_Class="_7jqj4KrlEeOxqJAXCMXUYg">
+  <Ecore:EClass xmi:id="_INRJon3sEeyivuDeOiJBMg" base_Class="_7jqj4KrlEeOxqJAXCMXUYg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AuthorParticipationTemplateId AuthorParticipationTime AuthorParticipationAssignedAuthor AuthorParticipationAssignedAuthorId' templateId.root='2.16.840.1.113883.10.20.22.4.119' constraints.validation.info='AuthorParticipationAssignedAuthorAssignedPersonName AuthorParticipationAssignedAuthorRepresentedOrganizationId AuthorParticipationAssignedAuthorRepresentedOrganizationName AuthorParticipationAssignedAuthorRepresentedOrganizationTelecom AuthorParticipationAssignedAuthorRepresentedOrganizationAddr AuthorParticipationAssignedAuthorAssignedPerson AuthorParticipationAssignedAuthorRepresentedOrganization' constraints.validation.query='AuthorParticipationAssignedAuthorAssignedPersonName AuthorParticipationAssignedAuthorRepresentedOrganizationId AuthorParticipationAssignedAuthorRepresentedOrganizationName AuthorParticipationAssignedAuthorRepresentedOrganizationTelecom AuthorParticipationAssignedAuthorRepresentedOrganizationAddr AuthorParticipationAssignedAuthorCodeTerminology AuthorParticipationAssignedAuthorId AuthorParticipationAssignedAuthorCode AuthorParticipationAssignedAuthorAssignedPerson AuthorParticipationAssignedAuthorRepresentedOrganization' constraints.validation.warning='AuthorParticipationAssignedAuthorCodeTerminology AuthorParticipationAssignedAuthorCode'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAuthorParticipationAssignedAuthor constraints.validation.warning='AuthorParticipationAssignedAuthorCodeTerminology AuthorParticipationAssignedAuthorCode' constraints.validation.error='AuthorParticipationAssignedAuthorId' constraints.validation.info='AuthorParticipationAssignedAuthorAssignedPerson AuthorParticipationAssignedAuthorRepresentedOrganization'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAuthorParticipationAssignedAuthorAssignedPerson constraints.validation.info='AuthorParticipationAssignedAuthorAssignedPersonName'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAuthorParticipationAssignedAuthorRepresentedOrganization constraints.validation.info='AuthorParticipationAssignedAuthorRepresentedOrganizationId AuthorParticipationAssignedAuthorRepresentedOrganizationName AuthorParticipationAssignedAuthorRepresentedOrganizationTelecom AuthorParticipationAssignedAuthorRepresentedOrganizationAddr'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xKND4F9xEey5t-mahoHmrg" base_Class="_ZQpEwK-1EeO8duI_7f6kZw">
+  <Ecore:EClass xmi:id="_IXfcon3sEeyivuDeOiJBMg" base_Class="_ZQpEwK-1EeO8duI_7f6kZw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AdmissionMedication2TemplateId AdmissionMedicationCode AdmissionMedicationCodeP AdmissionMedicationMedicationActivity' templateId.root='2.16.840.1.113883.10.20.22.4.36' templateId.extension='2014-06-09' constraints.validation.dependOn.AdmissionMedicationCode='AdmissionMedicationCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xKQuQF9xEey5t-mahoHmrg" base_Class="_GnllUK-9EeO8duI_7f6kZw">
+  <Ecore:EClass xmi:id="_IXjuEH3sEeyivuDeOiJBMg" base_Class="_GnllUK-9EeO8duI_7f6kZw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AdvanceDirectiveObservation2TemplateId AdvanceDirectiveObservationHasEndingTime AdvanceDirectiveObservationCodeP AdvanceDirectiveObservationEffectiveTime AdvanceDirectiveObservation2Value AdvanceDirectiveObservation2CDTranslation AdvanceDirectiveObservation2CDTranslationP AdvanceDirectiveObservation2IVLTSLow AdvanceDirectiveObservation2IVLTSHigh AdvanceDirectiveObservation2VerifierTemplateId AdvanceDirectiveObservationVerifierParticipantRole AdvanceDirectiveObservationCustodianCustodianRoleCustodianEntityName AdvanceDirectiveObservationCustodianCustodianRolePlayingEntity AdvanceDirectiveObservationCustodianAdvanceDirectiveObservationCustodianRole AdvanceDirectiveObservationReferenceExternalDocumentId AdvanceDirectiveObservationReferenceTypeCode AdvanceDirectiveObservation2AdvanceDirectiveObservationReferenceExternalDocument' templateId.root='2.16.840.1.113883.10.20.22.4.48' templateId.extension='2015-08-01' constraints.validation.info='AdvanceDirectiveObservationHasStartingTime AdvanceDirectiveObservation2VerifierParticipantRolePlayingEntityName AdvanceDirectiveObservation2VerifierParticipantRoleAddr AdvanceDirectiveObservation2VerifierParticipantRolePlayingEntity AdvanceDirectiveObservation2ReferenceAdvanceDirectiveObservationReferenceExternalDocumentTextMediaType AdvanceDirectiveObservation2ReferenceAdvanceDirectiveObservationReferenceExternalDocumentTextReference AdvanceDirectiveObservationReferenceExternalDocumentText' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' constraints.validation.warning='AdvanceDirectiveObservationCode AdvanceDirectiveObservationVerifier AdvanceDirectiveObservationCustodian AdvanceDirectiveObservationReference AdvanceDirectiveObservation2AuthorParticipation AdvanceDirectiveObservation2VerifierParticipantRoleCodeP AdvanceDirectiveObservation2VerifierParticipantRoleCode AdvanceDirectiveObservationVerifierTime AdvanceDirectiveObservation2CustodianCustodianRoleCustodianEntityCodeP AdvanceDirectiveObservation2CustodianCustodianRoleCustodianEntityCode AdvanceDirectiveObservation2CustodianCustodianRoleCodeP AdvanceDirectiveObservation2CustodianCustodianRoleCode AdvanceDirectiveObservationCustodianCustodianRoleAddr AdvanceDirectiveObservationCustodianCustodianRoleTelecom' constraints.validation.dependOn.AdvanceDirectiveObservationCode='AdvanceDirectiveObservationCodeP' constraints.validation.query='AdvanceDirectiveObservation2CDTranslation AdvanceDirectiveObservation2CDTranslationP AdvanceDirectiveObservation2IVLTSLow AdvanceDirectiveObservation2IVLTSHigh AdvanceDirectiveObservation2VerifierParticipantRolePlayingEntityName AdvanceDirectiveObservation2VerifierParticipantRoleCodeP AdvanceDirectiveObservation2VerifierParticipantRoleCode AdvanceDirectiveObservation2VerifierParticipantRoleAddr AdvanceDirectiveObservation2VerifierParticipantRolePlayingEntity AdvanceDirectiveObservation2VerifierTemplateId AdvanceDirectiveObservationVerifierTime AdvanceDirectiveObservationVerifierParticipantRole AdvanceDirectiveObservation2CustodianCustodianRoleCustodianEntityCodeP AdvanceDirectiveObservation2CustodianCustodianRoleCustodianEntityCode AdvanceDirectiveObservationCustodianCustodianRoleCustodianEntityName AdvanceDirectiveObservation2CustodianCustodianRoleCodeP AdvanceDirectiveObservation2CustodianCustodianRoleCode AdvanceDirectiveObservationCustodianCustodianRoleAddr AdvanceDirectiveObservationCustodianCustodianRoleTelecom AdvanceDirectiveObservationCustodianCustodianRolePlayingEntity AdvanceDirectiveObservationCustodianAdvanceDirectiveObservationCustodianRole AdvanceDirectiveObservation2ReferenceAdvanceDirectiveObservationReferenceExternalDocumentTextMediaType AdvanceDirectiveObservation2ReferenceAdvanceDirectiveObservationReferenceExternalDocumentTextReference AdvanceDirectiveObservationReferenceExternalDocumentId AdvanceDirectiveObservationReferenceExternalDocumentText AdvanceDirectiveObservationReferenceTypeCode AdvanceDirectiveObservation2AdvanceDirectiveObservationReferenceExternalDocument' constraints.validation.dependOn.AdvanceDirectiveObservation2VerifierParticipantRoleCode='AdvanceDirectiveObservation2VerifierParticipantRoleCodeP' constraints.validation.dependOn.AdvanceDirectiveObservation2CustodianCustodianRoleCustodianEntityCode='AdvanceDirectiveObservation2CustodianCustodianRoleCustodianEntityCodeP' constraints.validation.dependOn.AdvanceDirectiveObservation2CustodianCustodianRoleCode='AdvanceDirectiveObservation2CustodianCustodianRoleCodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAdvanceDirectiveObservation2IVLTS constraints.validation.error='AdvanceDirectiveObservation2IVLTSLow AdvanceDirectiveObservation2IVLTSHigh'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAdvanceDirectiveObservation2Custodian constraints.validation.error='AdvanceDirectiveObservationCustodianAdvanceDirectiveObservationCustodianRole'</annotation>
@@ -47308,11 +47308,11 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAdvanceDirectiveObservation2VerifierParticipantRolePlayingEntity constraints.validation.info='AdvanceDirectiveObservation2VerifierParticipantRolePlayingEntityName'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAdvanceDirectiveObservation2CD translation.code='75320-2' translation.codeSystem='2.16.840.1.113883.6.1' translation.codeSystemName='LOINC' translation.displayName='Advance directive' constraints.validation.error='AdvanceDirectiveObservation2CDTranslation AdvanceDirectiveObservation2CDTranslationP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xR5nUF9xEey5t-mahoHmrg" base_Class="_uCiIYLNwEeOtlapy2HWYww">
+  <Ecore:EClass xmi:id="_IeT2UH3sEeyivuDeOiJBMg" base_Class="_uCiIYLNwEeOtlapy2HWYww">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AllergyConcernAct2TemplateId AllergyProblemActCode AllergyProblemActAllergyObservation AllergyProblemActCDCodeAndCodeSystemValues AllergyProblemActCDCode AllergyProblemActCDCodeSystem' templateId.root='2.16.840.1.113883.10.20.22.4.30' templateId.extension='2015-08-01' constraints.validation.warning='AllergyConcernAct2AuthorParticipation' constraints.validation.query='AllergyProblemActCDCodeAndCodeSystemValues AllergyProblemActCDCode AllergyProblemActCDCodeSystem'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAllergyConcernAct2CD constraints.validation.error='AllergyProblemActCDCodeAndCodeSystemValues AllergyProblemActCDCode AllergyProblemActCDCodeSystem'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xSePEF9xEey5t-mahoHmrg" base_Class="_uVJogLj5EeODDJAC5t5vpw">
+  <Ecore:EClass xmi:id="_Ie0Mon3sEeyivuDeOiJBMg" base_Class="_uVJogLj5EeODDJAC5t5vpw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AllergyObservation2TemplateId SubstanceOrDeviceAllergyObservationReactionInversionIndicator AllergyObservationCode AllergyObservationCodeP AllergyObservationValue AllergyObservationValueP AllergyObservationStatusCode AllergyObservationStatusCodeP AllergyObservationEffectiveTime AllergyObservationAllergyStatusObservation AllergyObservationParticipant AllergyObservation2IVLTSLow AllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText AllergyObservationParticipantParticipantRolePlayingEntityCETranslation AllergyObservationParticipantParticipantRolePlayingEntityCode AllergyObservationParticipantParticipantRolePlayingEntity AllergyObservationParticipantParticipantRole' templateId.root='2.16.840.1.113883.10.20.22.4.7' templateId.extension='2014-06-09' constraints.validation.info='AllergyObservationValueOriginalText AllergyObservationOriginalTextReference AllergyObservationOriginalTextReferenceValue AllergyObservationReferenceValue SubstanceOrDeviceAllergyObservationAllergyStatusInversionIndicator AllergyObservation2NegationInd AllergyObservation2IVLTSHigh AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue AllergyObservationParticipantParticipantRolePlayingEntityAllergySpecificMedication AllergyObservationParticipantParticipantRolePlayingEntityAllergyClassMedication AllergyObservationParticipantParticipantRolePlayingEntityAllergyFoodOtherSubstance AllergyObservationParticipantParticipantRolePlayingEntityReferenceValue AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference' constraints.validation.warning='SubstanceOrDeviceAllergyObservationSeverityInversionIndicator AllergyObservation2CriticalityInversionIndicator AllergyObservation2AuthorParticipation AllergyObservationReactionObservation AllergyObservationSeverityObservation AllergyObservation2CriticalityObservation' constraints.validation.dependOn.AllergyObservationCode='AllergyObservationCodeP' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.dependOn.AllergyObservationValue='AllergyObservationValueP' constraints.validation.dependOn.AllergyObservationStatusCode='AllergyObservationStatusCodeP' constraints.validation.query='AllergyObservation2IVLTSLow AllergyObservation2IVLTSHigh AllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText AllergyObservationParticipantParticipantRolePlayingEntityCETranslation AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue AllergyObservationParticipantParticipantRolePlayingEntityAllergySpecificMedication AllergyObservationParticipantParticipantRolePlayingEntityAllergyClassMedication AllergyObservationParticipantParticipantRolePlayingEntityAllergyFoodOtherSubstance AllergyObservationParticipantParticipantRolePlayingEntityReferenceValue AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference AllergyObservationParticipantParticipantRolePlayingEntityCode AllergyObservationParticipantParticipantRolePlayingEntity AllergyObservationParticipantParticipantRole'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAllergyObservation2IVLTS constraints.validation.error='AllergyObservation2IVLTSLow' constraints.validation.info='AllergyObservation2IVLTSHigh'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAllergyObservation2Participant constraints.validation.error='AllergyObservationParticipantParticipantRole'</annotation>
@@ -47320,118 +47320,118 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAllergyObservation2ParticipantParticipantRolePlayingEntity constraints.validation.info='AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue AllergyObservationParticipantParticipantRolePlayingEntityAllergySpecificMedication AllergyObservationParticipantParticipantRolePlayingEntityAllergyClassMedication AllergyObservationParticipantParticipantRolePlayingEntityAllergyFoodOtherSubstance AllergyObservationParticipantParticipantRolePlayingEntityReferenceValue AllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference' constraints.validation.error='AllergyObservationParticipantParticipantRolePlayingEntityCode AllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText AllergyObservationParticipantParticipantRolePlayingEntityCETranslation' constraints.validation.query='AllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText AllergyObservationParticipantParticipantRolePlayingEntityCETranslation'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAllergyObservation2ParticipantParticipantRolePlayingEntityCE constraints.validation.error='AllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText AllergyObservationParticipantParticipantRolePlayingEntityCETranslation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xU20sV9xEey5t-mahoHmrg" base_Class="_6LYrULkoEeODDJAC5t5vpw">
+  <Ecore:EClass xmi:id="_IhBMEH3sEeyivuDeOiJBMg" base_Class="_6LYrULkoEeODDJAC5t5vpw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MentalStatusOrganizer2TemplateId MentalStatusOrganizer2HasCodeOrEffectiveTime ResultOrganizerCode ResultOrganizerResultObservation MentalStatusOrganizer2CDCode' templateId.root='2.16.840.1.113883.10.20.22.4.75' templateId.extension='2015-08-01' constraints.validation.warning='CognitiveStatusResultOrganizerCodeCodeSystem MentalStatusOrganizer2EffectiveTime' constraints.validation.query='MentalStatusOrganizer2CDCode'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMentalStatusOrganizer2CD constraints.validation.error='MentalStatusOrganizer2CDCode'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xU87UF9xEey5t-mahoHmrg" base_Class="_aJr6ULkxEeODDJAC5t5vpw">
+  <Ecore:EClass xmi:id="_IhGron3sEeyivuDeOiJBMg" base_Class="_aJr6ULkxEeODDJAC5t5vpw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='CoverageActivity2TemplateId CoverageActivityCode CoverageActivityCodeP CoverageActivityPolicyActivity CoverageActivity2EntryRelationship CoverageActivity2EntryRelationshipINTValue CoverageActivity2EntryRelationshipTypeCode CoverageActivity2EntryRelationshipPolicyActivity2' templateId.root='2.16.840.1.113883.10.20.22.4.60' templateId.extension='2015-08-01' constraints.validation.info='CoverageActivityCoverageActivityRelationshipSequenceNumber CoverageActivity2EntryRelationshipSequenceNumber' constraints.validation.dependOn.CoverageActivityCode='CoverageActivityCodeP' constraints.validation.query='CoverageActivity2EntryRelationshipINTValue CoverageActivity2EntryRelationshipTypeCode CoverageActivity2EntryRelationshipSequenceNumber CoverageActivity2EntryRelationshipPolicyActivity2'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCoverageActivity2EntryRelationship typeCode='COMP' constraints.validation.error='CoverageActivity2EntryRelationshipTypeCode CoverageActivity2EntryRelationshipPolicyActivity2 CoverageActivity2EntryRelationshipINTValue' constraints.validation.info='CoverageActivity2EntryRelationshipSequenceNumber' constraints.validation.query='CoverageActivity2EntryRelationshipINTValue'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCoverageActivity2EntryRelationshipINT constraints.validation.error='CoverageActivity2EntryRelationshipINTValue'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xVEQEV9xEey5t-mahoHmrg" base_Class="_Hl3ScLk0EeODDJAC5t5vpw">
+  <Ecore:EClass xmi:id="_IhNZUn3sEeyivuDeOiJBMg" base_Class="_Hl3ScLk0EeODDJAC5t5vpw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SmokingStatusMeaningfulUse2TemplateId SmokingStatusMeaningfulUse2Id SmokingStatusObservationCode SmokingStatusObservationCodeP SmokingStatusObservationValue SmokingStatusObservationValueP SmokingStatusObservationEffectiveTime SmokingStatusObservationIVLTSCenter SmokingStatusObservationIVLTSHigh SmokingStatusObservationIVLTSLow SmokingStatusObservationIVLTSWidth' templateId.root='2.16.840.1.113883.10.20.22.4.78' templateId.extension='2014-06-09' code.code='72166-2' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Tobacco smoking status NHIS' constraints.validation.dependOn.SmokingStatusObservationCode='SmokingStatusObservationCodeP' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.dependOn.SmokingStatusObservationValue='SmokingStatusObservationValueP' constraints.validation.warning='SmokingStatusMeaningfulUse2AuthorParticipation' constraints.validation.info='SmokingStatusMeaningfulUse2CDCodeTermAssertionOrLoinc' constraints.validation.query='SmokingStatusMeaningfulUse2CDCodeTermAssertionOrLoinc SmokingStatusObservationIVLTSCenter SmokingStatusObservationIVLTSHigh SmokingStatusObservationIVLTSLow SmokingStatusObservationIVLTSWidth'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolSmokingStatusMeaningfulUse2IVLTS constraints.validation.error='SmokingStatusObservationIVLTSCenter SmokingStatusObservationIVLTSHigh SmokingStatusObservationIVLTSLow SmokingStatusObservationIVLTSWidth'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolSmokingStatusMeaningfulUse2CD constraints.validation.info='SmokingStatusMeaningfulUse2CDCodeTermAssertionOrLoinc'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xW6qMF9xEey5t-mahoHmrg" base_Class="_4iF6IL86EeOS5KuvmCHHew">
+  <Ecore:EClass xmi:id="_Iio8sH3sEeyivuDeOiJBMg" base_Class="_4iF6IL86EeOS5KuvmCHHew">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='DeceasedObservation2TemplateId DeceasedObservationCode DeceasedObservationCodeP' templateId.root='2.16.840.1.113883.10.20.22.4.79' templateId.extension='2015-08-01' constraints.validation.dependOn.DeceasedObservationCode='DeceasedObservationCodeP' constraints.validation.warning='DeceasedObservationProblemObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xW-UkF9xEey5t-mahoHmrg" base_Class="_EIeu8MyjEeO93sHu8pHB2g">
+  <Ecore:EClass xmi:id="_IisnEH3sEeyivuDeOiJBMg" base_Class="_EIeu8MyjEeO93sHu8pHB2g">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='DischargeMedication2TemplateId DischargeMedicationCode DischargeMedicationCodeP DischargeMedication2StatusCode DischargeMedication2StatusCodeP DischargeMedicationMedicationActivity DischargeMedication2CDTranslation DischargeMedication2CDTranslationP' templateId.root='2.16.840.1.113883.10.20.22.4.35' templateId.extension='2016-03-01' constraints.validation.dependOn.DischargeMedicationCode='DischargeMedicationCodeP' statusCode.code='completed' constraints.validation.query='DischargeMedication2CDTranslation DischargeMedication2CDTranslationP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDischargeMedication2CD translation.code='75311-1' translation.codeSystem='2.16.840.1.113883.6.1' translation.codeSystemName='LOINC' translation.displayName='Discharge medication' constraints.validation.error='DischargeMedication2CDTranslation DischargeMedication2CDTranslationP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xXG3cF9xEey5t-mahoHmrg" base_Class="_RGU34MzDEeO93sHu8pHB2g">
+  <Ecore:EClass xmi:id="_Iiz70H3sEeyivuDeOiJBMg" base_Class="_RGU34MzDEeO93sHu8pHB2g">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='EncounterActivity2TemplateId EncounterActivitiesCodeP EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntity' templateId.root='2.16.840.1.113883.10.20.22.4.49' templateId.extension='2015-08-01' constraints.validation.warning='EncounterActivitiesSdtcDDCFromNUBCOrDD EncounterActivitiesCode EncounterActivitiesServiceDeliveryLocation EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCode' code.codeSystem='2.16.840.1.113883.6.12' code.codeSystemName='CPT-4' constraints.validation.info='EncounterActivitiesSDTCDischargeDispositionCode EncounterActivitiesIndication EncounterActivitiesEncounterDiagnosis EncounterActivitiesEncounterPerformer EncounterActivity2CDTranslation EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCodeP' constraints.validation.query='EncounterActivity2CDTranslation EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCodeP EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCode EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntity' constraints.validation.dependOn.EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCode='EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolEncounterActivity2EncounterPerformer constraints.validation.error='EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolEncounterActivity2EncounterPerformerEncounterPerformerAssignedEntity code.codeSystem='2.16.840.1.113883.6.101' code.codeSystemName='NUCC Health Care Provider Taxonomy' constraints.validation.warning='EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCode' constraints.validation.info='EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCodeP' constraints.validation.dependOn.EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCode='EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolEncounterActivity2CD constraints.validation.info='EncounterActivity2CDTranslation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xZNwQF9xEey5t-mahoHmrg" base_Class="_jH6CcMzNEeO93sHu8pHB2g">
+  <Ecore:EClass xmi:id="_IksLIX3sEeyivuDeOiJBMg" base_Class="_jH6CcMzNEeO93sHu8pHB2g">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='EncounterDiagnosis2TemplateId EncounterDiagnosisCode EncounterDiagnosisCodeP EncounterDiagnosisProblemObservation' templateId.root='2.16.840.1.113883.10.20.22.4.80' templateId.extension='2015-08-01' constraints.validation.dependOn.EncounterDiagnosisCode='EncounterDiagnosisCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xZRaoF9xEey5t-mahoHmrg" base_Class="_3WqogMzSEeO93sHu8pHB2g">
+  <Ecore:EClass xmi:id="_Ikv1gH3sEeyivuDeOiJBMg" base_Class="_3WqogMzSEeO93sHu8pHB2g">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='FunctionalStatusObservation2TemplateId ResultObservationCode ResultObservationCodeP ResultObservationText ResultObservationInterpretationCode ResultObservationMethodCode ResultObservationTargetSiteCode FunctionalStatusResultObservationAuthor FunctionalStatusResultObservationReferenceRangeObservationRange' templateId.root='2.16.840.1.113883.10.20.22.4.67' templateId.extension='2014-06-09' constraints.validation.info='ResultObservationTextReference ResultObservationTextReferenceValue FunctionalStatusResultObservationReferenceRange FunctionalStatusResultObservationNonMedicinalSupplyActivity FunctionalStatusResultObservationReferenceRangeObservationRangeNoCode' code.code='54522-8' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Functional status' constraints.validation.dependOn.ResultObservationCode='ResultObservationCodeP' constraints.validation.warning='FunctionalStatusObservation2AuthorParticipation' constraints.validation.query='FunctionalStatusResultObservationReferenceRangeObservationRangeNoCode FunctionalStatusResultObservationReferenceRangeObservationRange'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolFunctionalStatusObservation2ReferenceRange constraints.validation.error='FunctionalStatusResultObservationReferenceRangeObservationRange'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolFunctionalStatusObservation2ReferenceRangeObservationRange constraints.validation.info='FunctionalStatusResultObservationReferenceRangeObservationRangeNoCode'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xbb90F9xEey5t-mahoHmrg" base_Class="_mgny4NF8EeOHUokOVP95oQ">
+  <Ecore:EClass xmi:id="_ImtkYH3sEeyivuDeOiJBMg" base_Class="_mgny4NF8EeOHUokOVP95oQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SubstanceOrDeviceAllergyObservationTemplateId SubstanceOrDeviceAllergyObservationAllergyStatusInversionIndicator SubstanceOrDeviceAllergyObservationReactionInversionIndicator SubstanceOrDeviceAllergyObservationSeverityInversionIndicator SubstanceOrDeviceAllergyObservationClassCode SubstanceOrDeviceAllergyObservationMoodCode SubstanceOrDeviceAllergyObservationId SubstanceOrDeviceAllergyObservationCode SubstanceOrDeviceAllergyObservationCodeP SubstanceOrDeviceAllergyObservationStatusCode SubstanceOrDeviceAllergyObservationStatusCodeP SubstanceOrDeviceAllergyObservationEffectiveTime SubstanceOrDeviceAllergyObservationValue SubstanceOrDeviceAllergyObservationValueP SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityClassCode SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCode SubstanceOrDeviceAllergyObservationParticipantParticipantRoleClassCode SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntity SubstanceOrDeviceAllergyObservationParticipantTypeCode SubstanceOrDeviceAllergyObservationParticipantParticipantRole' templateId.root='2.16.840.1.113883.10.20.24.3.90' classCode='OBS' moodCode='EVN' code.code='ASSERTION' code.codeSystem='2.16.840.1.113883.5.4' code.codeSystemName='HL7ActCode' code.displayName='Assertion' constraints.validation.dependOn.SubstanceOrDeviceAllergyObservationCode='SubstanceOrDeviceAllergyObservationCodeP' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.info='SubstanceOrDeviceAllergyObservationAllergyStatusObservation SubstanceOrDeviceAllergyObservationSeverityObservation SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCETranslation SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCodeTerminologyValueSetGroupSRFI' constraints.validation.warning='SubstanceOrDeviceAllergyObservationReactionObservation SubstanceOrDeviceAllergyObservationParticipant SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityReferenceValue SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference' constraints.validation.query='SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCETranslation SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityReferenceValue SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCodeTerminologyValueSetGroupSRFI SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityClassCode SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCode SubstanceOrDeviceAllergyObservationParticipantParticipantRoleClassCode SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntity SubstanceOrDeviceAllergyObservationParticipantTypeCode SubstanceOrDeviceAllergyObservationParticipantParticipantRole'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolSubstanceOrDeviceAllergyObservationParticipant typeCode='CSM' constraints.validation.error='SubstanceOrDeviceAllergyObservationParticipantTypeCode SubstanceOrDeviceAllergyObservationParticipantParticipantRole'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolSubstanceOrDeviceAllergyObservationParticipantParticipantRole classCode='MANU' constraints.validation.error='SubstanceOrDeviceAllergyObservationParticipantParticipantRoleClassCode SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolSubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntity constraints.validation.error='SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityClassCode SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCode' constraints.validation.warning='SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityReferenceValue SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference PlayingEntitySubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText' constraints.validation.info='SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCodeTerminologyValueSetGroupSRFI PlayingEntitySubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCETranslation' classCode='MMAT' constraints.validation.query='PlayingEntitySubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText PlayingEntitySubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCETranslation'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolSubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCE constraints.validation.warning='SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText' constraints.validation.info='SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCETranslation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xfhMkl9xEey5t-mahoHmrg" base_Class="_yU2tgOD0EeOmBMTtnrPqww">
+  <Ecore:EClass xmi:id="_IqiUcH3sEeyivuDeOiJBMg" base_Class="_yU2tgOD0EeOmBMTtnrPqww">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='FunctionalStatusOrganizer2TemplateId ResultOrganizerCode ResultOrganizerStatusCode ResultOrganizerStatusCodeP FunctionalStatusResultOrganizerFunctionalStatusResultObservation FunctionalStatusOrganizer2SelfCareActivities' templateId.root='2.16.840.1.113883.10.20.22.4.66' templateId.extension='2014-06-09' constraints.validation.warning='ResultOrganizerCodeValue FunctionalStatusOrganizer2AuthorParticipation' constraints.validation.dependOn.ResultOrganizerStatusCode='ResultOrganizerStatusCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xhCPgF9xEey5t-mahoHmrg" base_Class="_DMvdYOEFEeOmBMTtnrPqww">
+  <Ecore:EClass xmi:id="_Ir6NcH3sEeyivuDeOiJBMg" base_Class="_DMvdYOEFEeOmBMTtnrPqww">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HealthStatusObservation2TemplateId HealthStatusObservation2Id HealthStatusObservationCode HealthStatusObservationCodeP HealthStatusObservationText HealthStatusObservationStatusCode HealthStatusObservationStatusCodeP' templateId.root='2.16.840.1.113883.10.20.22.4.5' templateId.extension='2014-06-09' constraints.validation.info='HealthStatusObservationHasTextReference HealthStatusObservationTextReferenceValue HealthStatusObservationHasTextReferenceValue' constraints.validation.dependOn.HealthStatusObservationCode='HealthStatusObservationCodeP' constraints.validation.dependOn.HealthStatusObservationStatusCode='HealthStatusObservationStatusCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xhMnkF9xEey5t-mahoHmrg" base_Class="_GM6icOEIEeOmBMTtnrPqww">
+  <Ecore:EClass xmi:id="_IsCwUn3sEeyivuDeOiJBMg" base_Class="_GM6icOEIEeOmBMTtnrPqww">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HospitalAdmissionDiagnosis2TemplateId HospitalAdmissionDiagnosisCode HospitalAdmissionDiagnosisCodeP HospitalAdmissionDiagnosisProblemObservation' templateId.root='2.16.840.1.113883.10.20.22.4.34' templateId.extension='2015-08-01' constraints.validation.dependOn.HospitalAdmissionDiagnosisCode='HospitalAdmissionDiagnosisCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xhQR8F9xEey5t-mahoHmrg" base_Class="_Trd1cOEMEeOmBMTtnrPqww">
+  <Ecore:EClass xmi:id="_IsFzoX3sEeyivuDeOiJBMg" base_Class="_Trd1cOEMEeOmBMTtnrPqww">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HospitalDischargeDiagnosis2TemplateId HospitalDischargeDiagnosisCode HospitalDischargeDiagnosisCodeP HospitalDischargeDiagnosisProblemObservation' templateId.root='2.16.840.1.113883.10.20.22.4.33' templateId.extension='2015-08-01' constraints.validation.dependOn.HospitalDischargeDiagnosisCode='HospitalDischargeDiagnosisCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xhT8UF9xEey5t-mahoHmrg" base_Class="_zI6vcOE7EeOTq9XEMvvkWw">
+  <Ecore:EClass xmi:id="_IsI28H3sEeyivuDeOiJBMg" base_Class="_zI6vcOE7EeOTq9XEMvvkWw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ImmunizationActivity2TemplateId ImmunizationActivityInstructionInversion ImmunizationActivityStatusCode ImmunizationActivityStatusCodeP ImmunizationActivityAdministrationUnitCode ImmunizationActivityText ImmunizationActivityRouteCode ImmunizationActivityConsumable ImmunizationActivityConsumableImmunizationMedicationInformation ImmunizationActivityPreconditionTypeCode ImmunizationActivityPreconditionPreconditionForSubstanceAdministration ImmunizationActivity2CETranslation' templateId.root='2.16.840.1.113883.10.20.22.4.52' templateId.extension='2015-08-01' constraints.validation.info='ImmunizationActivityTextReference ImmunizationActivityReferenceValue ImmunizationActivityTextReferenceValue ImmunizationActivityCode ImmunizationActivityRepeatNumber ImmunizationActivityAdministrationUnitCodeP ImmunizationActivityRouteCodeP ImmunizationActivityDrugVehicle ImmunizationActivityIndication ImmunizationActivityMedicationSupplyOrder ImmunizationActivityMedicationDispense ImmunizationActivityReactionObservation ImmunizationActivityInstructions ImmunizationActivityPrecondition ImmunizationActivity2EntryRelationshipSequenceNumber' constraints.validation.dependOn.ImmunizationActivityStatusCode='ImmunizationActivityStatusCodeP' administrationUnitCode.codeSystem='2.16.840.1.113883.5.85' administrationUnitCode.codeSystemName='orderableDrugForm' constraints.validation.dependOn.ImmunizationActivityAdministrationUnitCode='ImmunizationActivityAdministrationUnitCodeP' routeCode.codeSystem='2.16.840.1.113883.3.26.1.1' routeCode.codeSystemName='NCI Thesaurus' constraints.validation.dependOn.ImmunizationActivityRouteCode='ImmunizationActivityRouteCodeP' constraints.validation.warning='ImmunizationActivity2AuthorParticipation ImmunizationActivity2EntryRelationshipForSubAdminAct ImmunizationActivity2EntryRelationshipTypeCode ImmunizationActivity2EntryRelationshipInversionInd ImmunizationActivity2EntryRelationshipSubstanceAdministeredAct ImmunizationActivity2CETranslationP' constraints.validation.query='ImmunizationActivity2EntryRelationshipTypeCode ImmunizationActivity2EntryRelationshipInversionInd ImmunizationActivity2EntryRelationshipSequenceNumber ImmunizationActivity2EntryRelationshipSubstanceAdministeredAct ImmunizationActivityConsumableImmunizationMedicationInformation ImmunizationActivityPreconditionTypeCode ImmunizationActivityPreconditionPreconditionForSubstanceAdministration ImmunizationActivity2CETranslationP ImmunizationActivity2CETranslation' constraints.validation.dependOn.ImmunizationActivity2CETranslation='ImmunizationActivity2CETranslationP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolImmunizationActivity2Consumable constraints.validation.error='ImmunizationActivityConsumableImmunizationMedicationInformation'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolImmunizationActivity2Precondition typeCode='PRCN' constraints.validation.error='ImmunizationActivityPreconditionTypeCode ImmunizationActivityPreconditionPreconditionForSubstanceAdministration'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolImmunizationActivity2EntryRelationship typeCode='COMP' constraints.validation.warning='ImmunizationActivity2EntryRelationshipTypeCode ImmunizationActivity2EntryRelationshipInversionInd ImmunizationActivity2EntryRelationshipSubstanceAdministeredAct' inversionInd='true' constraints.validation.info='ImmunizationActivity2EntryRelationshipSequenceNumber'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolImmunizationActivity2CE translation.codeSystem='2.16.840.1.113883.6.96' translation.codeSystemName='SNOMEDCT' constraints.validation.error='ImmunizationActivity2CETranslation' constraints.validation.warning='ImmunizationActivity2CETranslationP' constraints.validation.dependOn.ImmunizationActivity2CETranslation='ImmunizationActivity2CETranslationP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xmYCgF9xEey5t-mahoHmrg" base_Class="_Rx8LIOHUEeO04sHNODkHmQ">
+  <Ecore:EClass xmi:id="_Iwsm0H3sEeyivuDeOiJBMg" base_Class="_Rx8LIOHUEeO04sHNODkHmQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ImmunizationMedicationInformation2TemplateId ImmunizationMedicationInformationManufacturedMaterial ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeP ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCode' templateId.root='2.16.840.1.113883.10.20.22.4.54' templateId.extension='2014-06-09' constraints.validation.info='ImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslationP ImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslation ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeOriginalText ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialOriginalTextReference ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialTextReferenceValue ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialOriginalTextReferenceValue ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeTranslation' constraints.validation.query='ImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslationP ImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslation ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeOriginalText ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialOriginalTextReference ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialTextReferenceValue ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialOriginalTextReferenceValue ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeTranslation ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeP ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCode ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialLotNumberText' constraints.validation.dependOn.ImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslation='ImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslationP' constraints.validation.dependOn.ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCode='ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeP' constraints.validation.warning='ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialLotNumberText'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterial constraints.validation.info='ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeOriginalText ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialOriginalTextReference ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialTextReferenceValue ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialOriginalTextReferenceValue ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeTranslation ImmunizationMedicationInformationManufacturedMaterialImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslationP ImmunizationMedicationInformationManufacturedMaterialImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslation' code.codeSystem='2.16.840.1.113883.12.292' code.codeSystemName='Vaccines administered (CVX)' constraints.validation.error='ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCode ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeP' constraints.validation.dependOn.ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCode='ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeP' constraints.validation.warning='ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialLotNumberText' constraints.validation.query='ImmunizationMedicationInformationManufacturedMaterialImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslationP ImmunizationMedicationInformationManufacturedMaterialImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslation' constraints.validation.dependOn.ImmunizationMedicationInformationManufacturedMaterialImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslation='ImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslationP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCE constraints.validation.info='ImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslation ImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslationP' constraints.validation.dependOn.ImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslation='ImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslationP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xoHu8F9xEey5t-mahoHmrg" base_Class="_PrEOIOHoEeO04sHNODkHmQ">
+  <Ecore:EClass xmi:id="_IyL0kH3sEeyivuDeOiJBMg" base_Class="_PrEOIOHoEeO04sHNODkHmQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='Indication2TemplateId IndicationId IndicationCodeP' templateId.root='2.16.840.1.113883.10.20.22.4.19' templateId.extension='2014-06-09' constraints.validation.info='IndicationProblemIndication IndicationCodeNullFlavor IndicationCodeNullFlavorValue IndicationCode IndicationValueP' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.IndicationCode='IndicationCodeP' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.warning='IndicationValue' constraints.validation.dependOn.IndicationValue='IndicationValueP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xqLkcl9xEey5t-mahoHmrg" base_Class="_D62NwOH7EeO04sHNODkHmQ">
+  <Ecore:EClass xmi:id="_I0COsH3sEeyivuDeOiJBMg" base_Class="_D62NwOH7EeO04sHNODkHmQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='Instruction2TemplateId InstructionsText' templateId.root='2.16.840.1.113883.10.20.22.4.20' templateId.extension='2014-06-09'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xqOnwF9xEey5t-mahoHmrg" base_Class="_WnSCMOLAEeOc7-TVP7Wi6w">
+  <Ecore:EClass xmi:id="_I0Eq8H3sEeyivuDeOiJBMg" base_Class="_WnSCMOLAEeOc7-TVP7Wi6w">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicationActivity2TemplateId MedicationActivityInstructionsInversionInd MedicationActivity2SubstanceAdministeredActInversionInd MedicationActivityEffectiveTimeIVLTSorTS MedicationActivity2EffectiveTimeIVLTSLowXorValue MedicationActivityStatusCode MedicationActivityStatusCodeP MedicationActivityRouteCode MedicationActivityDoseQuantity MedicationActivityAdministrationUnitCode MedicationActivityText MedicationActivityConsumable MedicationActivity2CETranslation MedicationActivityPreconditionTypeCode MedicationActivityPreconditionPreconditionForSubstanceAdministration MedicationActivityConsumableMedicationInformation' templateId.root='2.16.840.1.113883.10.20.22.4.16' templateId.extension='2014-06-09' constraints.validation.info='MedicationActivityTextReference MedicationActivityReferenceValue MedicationActivityTextReferenceValue MedicationActivity2SubstanceAdministeredActSequenceNumber MedicationActivityEffectiveTimeIVLTSHigh MedicationActivityCode MedicationActivityRepeatNumber MedicationActivityAdministrationUnitCodeP MedicationActivity2DrugMonitoringAct MedicationActivityInstructions MedicationActivity2SubstanceAdministeredAct MedicationActivityIndication MedicationActivityMedicationSupplyOrder MedicationActivityMedicationDispense MedicationActivityReactionObservation MedicationActivityPrecondition MedicationActivity2MedicationFreeTextSig' constraints.validation.warning='MedicationActivityDoseQuantityorrateQuantity MedicationActivityEffectiveTimeIVLTSLow MedicationActivityEffectiveTimePIVLTS MedicationActivityRouteCodeP MedicationActivity2AuthorParticipation MedicationActivity2CETranslationP' constraints.validation.dependOn.MedicationActivityStatusCode='MedicationActivityStatusCodeP' routeCode.codeSystem='2.16.840.1.113883.3.26.1.1' routeCode.codeSystemName='NCI Thesaurus' constraints.validation.dependOn.MedicationActivityRouteCode='MedicationActivityRouteCodeP' administrationUnitCode.codeSystem='2.16.840.1.113883.3.26.1.1' administrationUnitCode.codeSystemName='FDA RouteOfAdministration' constraints.validation.dependOn.MedicationActivityAdministrationUnitCode='MedicationActivityAdministrationUnitCodeP' constraints.validation.query='MedicationActivity2CETranslationP MedicationActivity2CETranslation MedicationActivityPreconditionTypeCode MedicationActivityPreconditionPreconditionForSubstanceAdministration MedicationActivityConsumableMedicationInformation' constraints.validation.dependOn.MedicationActivity2CETranslation='MedicationActivity2CETranslationP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMedicationActivity2Consumable constraints.validation.error='MedicationActivityConsumableMedicationInformation'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMedicationActivity2Precondition typeCode='PRCN' constraints.validation.error='MedicationActivityPreconditionTypeCode MedicationActivityPreconditionPreconditionForSubstanceAdministration'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMedicationActivity2CE translation.codeSystem='2.16.840.1.113883.6.96' translation.codeSystemName='SNOMEDCT' constraints.validation.error='MedicationActivity2CETranslation' constraints.validation.warning='MedicationActivity2CETranslationP' constraints.validation.dependOn.MedicationActivity2CETranslation='MedicationActivity2CETranslationP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xxDogF9xEey5t-mahoHmrg" base_Class="_qH-ckOXfEeOkFcFJ9uzEEw">
+  <Ecore:EClass xmi:id="_I560QX3sEeyivuDeOiJBMg" base_Class="_qH-ckOXfEeOkFcFJ9uzEEw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicationDispense2TemplateId MedicationDispenseContainsMedicationOrImmunization MedicationDispenseStatusCode MedicationDispenseStatusCodeP' templateId.root='2.16.840.1.113883.10.20.22.4.18' templateId.extension='2014-06-09' constraints.validation.info='MedicationDispense2ContainsMedicationInformation2 MedicationDispense2ContainsImmunizationMedicationInformation2 MedicationDispenseMedicationSupplyOrder' constraints.validation.dependOn.MedicationDispenseStatusCode='MedicationDispenseStatusCodeP' constraints.validation.warning='MedicationDispenseRepeatNumber'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xyGKUF9xEey5t-mahoHmrg" base_Class="_Hz__kOXrEeOkFcFJ9uzEEw">
+  <Ecore:EClass xmi:id="_I62BUH3sEeyivuDeOiJBMg" base_Class="_Hz__kOXrEeOkFcFJ9uzEEw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicationInformation2TemplateId MedicationInformationManufacturedMaterial MedicationInformationMedicationInformationManufacturedMaterialCodeP MedicationInformationMedicationInformationManufacturedMaterialCode' templateId.root='2.16.840.1.113883.10.20.22.4.23' templateId.extension='2014-06-09' constraints.validation.info='MedicationInformation2MedicationInformationManufacturedMaterialCETranslation MedicationInformationMedicationInformationManufacturedMaterialCodeOriginalText MedicationInformationMedicationInformationManufacturedMaterialCodeTranslation MedicationInformationMedicationInformationManufacturedMaterialReference MedicationInformationMedicationInformationManufacturedMaterialOriginalTextReferenceValue MedicationInformationMedicationInformationManufacturedMaterialReferenceValue' constraints.validation.query='MedicationInformation2MedicationInformationManufacturedMaterialCETranslation MedicationInformationMedicationInformationManufacturedMaterialCodeOriginalText MedicationInformationMedicationInformationManufacturedMaterialCodeTranslation MedicationInformationMedicationInformationManufacturedMaterialReference MedicationInformationMedicationInformationManufacturedMaterialOriginalTextReferenceValue MedicationInformationMedicationInformationManufacturedMaterialReferenceValue MedicationInformationMedicationInformationManufacturedMaterialCodeP MedicationInformationMedicationInformationManufacturedMaterialCode' constraints.validation.dependOn.MedicationInformationMedicationInformationManufacturedMaterialCode='MedicationInformationMedicationInformationManufacturedMaterialCodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMedicationInformation2MedicationInformationManufacturedMaterial constraints.validation.info='MedicationInformationMedicationInformationManufacturedMaterialCodeOriginalText MedicationInformationMedicationInformationManufacturedMaterialCodeTranslation MedicationInformationMedicationInformationManufacturedMaterialReference MedicationInformationMedicationInformationManufacturedMaterialOriginalTextReferenceValue MedicationInformationMedicationInformationManufacturedMaterialReferenceValue MedicationInformationManufacturedMaterialMedicationInformation2MedicationInformationManufacturedMaterialCETranslation' code.codeSystem='2.16.840.1.113883.6.88' code.codeSystemName='RxNorm' constraints.validation.error='MedicationInformationMedicationInformationManufacturedMaterialCode MedicationInformationMedicationInformationManufacturedMaterialCodeP' constraints.validation.dependOn.MedicationInformationMedicationInformationManufacturedMaterialCode='MedicationInformationMedicationInformationManufacturedMaterialCodeP' constraints.validation.query='MedicationInformationManufacturedMaterialMedicationInformation2MedicationInformationManufacturedMaterialCETranslation'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMedicationInformation2MedicationInformationManufacturedMaterialCE constraints.validation.info='MedicationInformation2MedicationInformationManufacturedMaterialCETranslation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_xzsFwl9xEey5t-mahoHmrg" base_Class="_InVpIOZ8EeOmzetP5oaH3A">
+  <Ecore:EClass xmi:id="_I8Pvgn3sEeyivuDeOiJBMg" base_Class="_InVpIOZ8EeOmzetP5oaH3A">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicationSupplyOrder2TemplateId MedicationSupplyOrderContainsMedicationOrImmunization MedicationSupplyOrderInstructionInversionInd MedicationSupplyOrderStatusCode MedicationSupplyOrderStatusCodeP' templateId.root='2.16.840.1.113883.10.20.22.4.17' templateId.extension='2014-06-09' constraints.validation.info='MedicationSupplyOrder2ContainsMedicationInformation2 MedicationSupplyOrder2ContainsImmunizationMedicationInformation2 MedicationSupplyOrderInstructions' constraints.validation.dependOn.MedicationSupplyOrderStatusCode='MedicationSupplyOrderStatusCodeP' constraints.validation.warning='MedicationSupplyOrderRepeatNumber'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_x1SBMl9xEey5t-mahoHmrg" base_Class="_k_C20OaCEeOmzetP5oaH3A">
+  <Ecore:EClass xmi:id="_I9u9QH3sEeyivuDeOiJBMg" base_Class="_k_C20OaCEeOmzetP5oaH3A">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='NonMedicinalSupplyActivity2TemplateId NonMedicinalSupplyActivity2Instruction2InversionInd NonMedicinalSupplyActivityStatusCode NonMedicinalSupplyActivityStatusCodeP' templateId.root='2.16.840.1.113883.10.20.22.4.50' templateId.extension='2014-06-09' constraints.validation.dependOn.NonMedicinalSupplyActivityStatusCode='NonMedicinalSupplyActivityStatusCodeP' constraints.validation.info='NonMedicinalSupplyActivity2Instruction2 NonMedicinalSupplyActivityProductInstance'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_x21gYF9xEey5t-mahoHmrg" base_Class="_Ao2HkOaHEeOmzetP5oaH3A">
+  <Ecore:EClass xmi:id="_I_EaAX3sEeyivuDeOiJBMg" base_Class="_Ao2HkOaHEeOmzetP5oaH3A">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PhysicianofRecordParticipant2TemplateId PhysicianofRecordParticipantAssignedEntity PhysicianofRecordParticipant2AssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent PhysicianofRecordParticipantAssignedEntityAssignedPersonName' templateId.root='2.16.840.1.113883.10.20.6.2.2' templateId.extension='2014-06-09' constraints.validation.query='PhysicianofRecordParticipant2AssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent PhysicianofRecordParticipantAssignedEntityAssignedPersonName PhysicianofRecordParticipant2AssignedEntityRepresentedOrganizationName PhysicianofRecordParticipantAssignedEntityHasNationalProviderId PhysicianofRecordParticipantAssignedEntityAssignedPerson PhysicianofRecordParticipant2AssignedEntityRepresentedOrganization' constraints.validation.warning='PhysicianofRecordParticipant2AssignedEntityRepresentedOrganizationName PhysicianofRecordParticipantAssignedEntityHasNationalProviderId PhysicianofRecordParticipantAssignedEntityAssignedPerson' constraints.validation.info='PhysicianofRecordParticipant2AssignedEntityRepresentedOrganization'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPhysicianofRecordParticipant2AssignedEntity constraints.validation.warning='PhysicianofRecordParticipantAssignedEntityHasNationalProviderId PhysicianofRecordParticipantAssignedEntityAssignedPerson' constraints.validation.info='PhysicianofRecordParticipant2AssignedEntityRepresentedOrganization'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPhysicianofRecordParticipant2AssignedEntityAssignedPerson constraints.validation.error='PhysicianofRecordParticipantAssignedEntityAssignedPersonName AssignedPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent' constraints.validation.query='AssignedPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPhysicianofRecordParticipant2AssignedEntityRepresentedOrganization constraints.validation.warning='PhysicianofRecordParticipant2AssignedEntityRepresentedOrganizationName'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_x4nCAF9xEey5t-mahoHmrg" base_Class="_lLnRMOaYEeOmzetP5oaH3A">
+  <Ecore:EClass xmi:id="_JAeIMn3sEeyivuDeOiJBMg" base_Class="_lLnRMOaYEeOmzetP5oaH3A">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlannedAct2TemplateId PlanOfCareActivityActMoodCode PlannedAct2Code PlannedAct2StatusCode PlannedAct2StatusCodeP' templateId.root='2.16.840.1.113883.10.20.22.4.39' templateId.extension='2014-06-09' constraints.validation.warning='PlannedAct2CodeFromLoincOrSnomed PlannedAct2EffectiveTime PlannedAct2AuthorParticipation' statusCode.code='active' constraints.validation.info='PlannedAct2Indication2 PlannedAct2Instruction2 PlannedAct2Performer PlannedAct2PriorityPreference'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_x7PfQF9xEey5t-mahoHmrg" base_Class="_bDPFMOdXEeOqBOMhgDlycQ">
+  <Ecore:EClass xmi:id="_JC378H3sEeyivuDeOiJBMg" base_Class="_bDPFMOdXEeOqBOMhgDlycQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlannedEncounter2TemplateId PlannedEncounter2ParticipantServiceDeliveryLocationTypeCode PlanOfCareActivityEncounterMoodCode PlannedEncounter2StatusCode PlannedEncounter2StatusCodeP PlannedEncounter2PerformerAssignedEntity' templateId.root='2.16.840.1.113883.10.20.22.4.40' templateId.extension='2014-06-09' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' constraints.validation.warning='PlannedEncounter2Code PlannedEncounter2CodeP PlannedEncounter2EffectiveTime PlannedEncounter2AuthorParticipation' constraints.validation.dependOn.PlannedEncounter2Code='PlannedEncounter2CodeP' statusCode.code='active' constraints.validation.info='PlannedEncounter2Performer PlannedEncounter2ServiceDeliveryLocation PlannedEncounter2PriorityPreference PlannedEncounter2Indication2' constraints.validation.query='PlannedEncounter2PerformerAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPlannedEncounter2Performer constraints.validation.error='PlannedEncounter2PerformerAssignedEntity'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_x_RDoF9xEey5t-mahoHmrg" base_Class="_jKZssOdvEeOqBOMhgDlycQ">
+  <Ecore:EClass xmi:id="_JGi7AH3sEeyivuDeOiJBMg" base_Class="_jKZssOdvEeOqBOMhgDlycQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlannedObservation2TemplateId PlanOfCareActivityObservationMoodCode PlannedObservation2CodeP PlannedObservation2StatusCode PlannedObservation2StatusCodeP PlannedObservation2TargetSiteCode' templateId.root='2.16.840.1.113883.10.20.22.4.44' templateId.extension='2014-06-09' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.warning='PlannedObservation2Code PlannedObservation2EffectiveTime PlannedObservation2TargetSiteCodeP PlannedObservation2AuthorParticipation' constraints.validation.dependOn.PlannedObservation2Code='PlannedObservation2CodeP' statusCode.code='active' constraints.validation.info='PlannedObservation2Value PlannedObservation2MethodCode PlannedObservation2Performer PlannedObservation2PriorityPreference PlannedObservation2Indication2 PlannedObservation2Instruction2 PlannedObservation2PlannedCoverage' targetSiteCode.codeSystem='2.16.840.1.113883.6.96' targetSiteCode.codeSystemName='SNOMEDCT' constraints.validation.dependOn.PlannedObservation2TargetSiteCode='PlannedObservation2TargetSiteCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_yD1akl9xEey5t-mahoHmrg" base_Class="_cs0YsOeEEeOqBOMhgDlycQ">
+  <Ecore:EClass xmi:id="_JKltgH3sEeyivuDeOiJBMg" base_Class="_cs0YsOeEEeOqBOMhgDlycQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlannedProcedure2TemplateId PlannedProcedure2Instruction2InversionInd PlanOfCareActivityProcedureMoodCode PlannedProcedure2Code PlannedProcedure2StatusCode PlannedProcedure2StatusCodeP PlannedProcedure2TargetSiteCode' templateId.root='2.16.840.1.113883.10.20.22.4.41' templateId.extension='2014-06-09' constraints.validation.warning='PlannedProcedure2CodeFromLoincOrSnomed PlannedProcedure2EffectiveTime PlannedProcedure2AuthorParticipation' constraints.validation.info='PlannedProcedure2CodeFromCptOrIcd PlannedProcedure2MethodCode PlannedProcedure2TargetSiteCodeP PlannedProcedure2Performer PlannedProcedure2PriorityPreference PlannedProcedure2Indication2 PlannedProcedure2Instruction2 PlannedProcedure2PlannedCoverage' statusCode.code='active' targetSiteCode.codeSystem='2.16.840.1.113883.6.96' targetSiteCode.codeSystemName='SNOMEDCT' constraints.validation.dependOn.PlannedProcedure2TargetSiteCode='PlannedProcedure2TargetSiteCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_yInz8l9xEey5t-mahoHmrg" base_Class="_Yj45YOgREeO-iJTuAv7BKQ">
+  <Ecore:EClass xmi:id="_JOrjUH3sEeyivuDeOiJBMg" base_Class="_Yj45YOgREeO-iJTuAv7BKQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlannedMedicationActivity2TemplateId PlannedMedicationActivity2EffectiveTimeIVLTSorTS PlannedMedicationActivity2EffectiveTimeIVLTSLowXorValue PlanOfCareActivitySubstanceAdministrationMoodCode PlannedMedicationActivity2StatusCode PlannedMedicationActivity2StatusCodeP PlannedMedicationActivity2RouteCode PlannedMedicationActivity2ApproachSiteCode PlannedMedicationActivity2AdministrationUnitCode PlannedMedicationActivity2Consumable PlannedMedicationActivity2CETranslation PlannedMedicationActivity2ConsumableMedicationInformation2 PlannedMedicationActivity2PreconditionTypeCode PlannedMedicationActivity2PreconditionPreconditionForSubstanceAdministration2' templateId.root='2.16.840.1.113883.10.20.22.4.42' templateId.extension='2014-06-09' constraints.validation.warning='PlannedMedicationActivity2EffectiveTimeIVLTSLow PlannedMedicationActivity2EffectiveTimePIVLTS PlannedMedicationActivity2AuthorParticipation PlannedMedicationActivity2CETranslationP PlannedMedicationActivity2IVLPQdoseQuantityUnit PlannedMedicationActivity2IVLPQrateQuantityUnit' constraints.validation.info='PlannedMedicationActivity2EffectiveTimeIVLTSHigh PlannedMedicationActivity2RepeatNumber PlannedMedicationActivity2RouteCodeP PlannedMedicationActivity2ApproachSiteCodeP PlannedMedicationActivity2DoseQuantity PlannedMedicationActivity2RateQuantity PlannedMedicationActivity2MaxDoseQuantity PlannedMedicationActivity2AdministrationUnitCodeP PlannedMedicationActivity2Performer PlannedMedicationActivity2PriorityPreference PlannedMedicationActivity2Indication2 PlannedMedicationActivity2Instruction2 PlannedMedicationActivity2Precondition' statusCode.code='active' routeCode.codeSystem='2.16.840.1.113883.3.26.1.1' routeCode.codeSystemName='NCI Thesaurus' constraints.validation.dependOn.PlannedMedicationActivity2RouteCode='PlannedMedicationActivity2RouteCodeP' approachSiteCode.codeSystem='2.16.840.1.113883.6.96' approachSiteCode.codeSystemName='SNOMEDCT' constraints.validation.dependOn.PlannedMedicationActivity2ApproachSiteCode='PlannedMedicationActivity2ApproachSiteCodeP' administrationUnitCode.codeSystem='2.16.840.1.113883.5.85' administrationUnitCode.codeSystemName='orderableDrugForm' constraints.validation.dependOn.PlannedMedicationActivity2AdministrationUnitCode='PlannedMedicationActivity2AdministrationUnitCodeP' constraints.validation.query='PlannedMedicationActivity2CETranslationP PlannedMedicationActivity2CETranslation PlannedMedicationActivity2IVLPQdoseQuantityUnit PlannedMedicationActivity2IVLPQrateQuantityUnit PlannedMedicationActivity2ConsumableMedicationInformation2 PlannedMedicationActivity2PreconditionTypeCode PlannedMedicationActivity2PreconditionPreconditionForSubstanceAdministration2' constraints.validation.dependOn.PlannedMedicationActivity2CETranslation='PlannedMedicationActivity2CETranslationP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPlannedMedicationActivity2IVLPQdoseQuantity unit='1' constraints.validation.warning='PlannedMedicationActivity2IVLPQdoseQuantityUnit'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPlannedMedicationActivity2IVLPQrateQuantity unit='1' constraints.validation.warning='PlannedMedicationActivity2IVLPQrateQuantityUnit'</annotation>
@@ -47439,12 +47439,12 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPlannedMedicationActivity2Precondition typeCode='PRCN' constraints.validation.error='PlannedMedicationActivity2PreconditionTypeCode PlannedMedicationActivity2PreconditionPreconditionForSubstanceAdministration2'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPlannedMedicationActivity2CE translation.codeSystem='2.16.840.1.113883.6.96' translation.codeSystemName='SNOMEDCT' constraints.validation.error='PlannedMedicationActivity2CETranslation' constraints.validation.warning='PlannedMedicationActivity2CETranslationP' constraints.validation.dependOn.PlannedMedicationActivity2CETranslation='PlannedMedicationActivity2CETranslationP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_yQKmYl9xEey5t-mahoHmrg" base_Class="_vEd1cOg0EeO-iJTuAv7BKQ">
+  <Ecore:EClass xmi:id="_JVR6kH3sEeyivuDeOiJBMg" base_Class="_vEd1cOg0EeO-iJTuAv7BKQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlannedSupply2TemplateId PlannedSupply2MedInfoXorImmunXorProductInstance PlanOfCareActivitySupplyMoodCode PlannedSupply2StatusCode PlannedSupply2StatusCodeP PlannedSupply2ProductManufacturedProductMedInfo2XorImmunMedInfo2' templateId.root='2.16.840.1.113883.10.20.22.4.43' templateId.extension='2014-06-09' statusCode.code='active' constraints.validation.warning='PlannedSupply2EffectiveTime PlannedSupply2AuthorParticipation PlannedSupply2ProductRecommended' constraints.validation.info='PlannedSupply2RepeatNumber PlannedSupply2Quantity PlannedSupply2Product PlannedSupply2Performer PlannedSupply2ProductInstance PlannedSupply2PriorityPreference PlannedSupply2Indication2 PlannedSupply2Instruction2 PlannedSupply2PlannedCoverage PlannedSupply2ProductManufacturedProduct' constraints.validation.query='PlannedSupply2ProductManufacturedProductMedInfo2XorImmunMedInfo2 PlannedSupply2ProductManufacturedProduct'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPlannedSupply2Product constraints.validation.info='PlannedSupply2ProductManufacturedProduct'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPlannedSupply2ProductManufacturedProduct constraints.validation.error='PlannedSupply2ProductManufacturedProductMedInfo2XorImmunMedInfo2'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_yVJNAF9xEey5t-mahoHmrg" base_Class="_Q0ODkOwlEeOqa975IP2wug">
+  <Ecore:EClass xmi:id="_JZxZAn3sEeyivuDeOiJBMg" base_Class="_Q0ODkOwlEeOqa975IP2wug">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PolicyActivity2TemplateId PolicyActivityCodeP PolicyActivityStatusCode PolicyActivityStatusCodeP PolicyActivityPayer PolicyActivityCoverage PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine PolicyActivityPayerTemplateId PolicyActivityPayerPayerAssignedEntity PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine PolicyActivityGuarantorGuarantorAssignedEntityCodeP PolicyActivityGuarantorGuarantorAssignedEntityCode PolicyActivityGuarantorTemplateId PolicyActivityGuarantorTypeCode PolicyActivityGuarantorGuarantorAssignedEntity PolicyActivityCoverageCoverageRoleCoveragePlayingEntityName PolicyActivity2CoverageCoverageRoleCoveragePlayingEntitySDTCBirthTime PolicyActivityCoverageCoverageRoleId PolicyActivityCoverageTemplateId PolicyActivityCoverageCoverageRole PolicyActivity2CDTranslationP' templateId.root='2.16.840.1.113883.10.20.22.4.61' templateId.extension='2015-08-01' code.codeSystemName='' constraints.validation.warning='PolicyActivityCode PolicyActivityGuarantor PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressState PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressState PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode PolicyActivityGuarantorGuarantorAssignedEntityAddr PolicyActivityGuarantorGuarantorAssignedEntityTelecom PolicyActivityCoverageCoverageRoleCoveragePlayingEntity PolicyActivity2CDTranslation' constraints.validation.dependOn.PolicyActivityCode='PolicyActivityCodeP' constraints.validation.dependOn.PolicyActivityStatusCode='PolicyActivityStatusCodeP' constraints.validation.query='PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressState PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode PolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine PolicyActivityPayerPayerAssignedEntityAddr PolicyActivityPayerPayerAssignedEntityTelecom PolicyActivityPayerTemplateId PolicyActivityPayerPayerAssignedEntity PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressState PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode PolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine PolicyActivityGuarantorGuarantorAssignedEntityCodeP PolicyActivityGuarantorGuarantorAssignedEntityCode PolicyActivityGuarantorGuarantorAssignedEntityAddr PolicyActivityGuarantorGuarantorAssignedEntityTelecom PolicyActivityGuarantorTemplateId PolicyActivityGuarantorTypeCode PolicyActivityGuarantorGuarantorAssignedEntity PolicyActivityCoverageCoverageRoleCoveragePlayingEntityDateOfBirthInSDTCbirthTime PolicyActivityCoverageCoverageRoleCoveragePlayingEntityName PolicyActivity2CoverageCoverageRoleCoveragePlayingEntitySDTCBirthTime PolicyActivityCoverageCoverageRoleId PolicyActivityCoverageCoverageRoleCoveragePlayingEntity PolicyActivityCoverageTemplateId PolicyActivityCoverageCoverageRole PolicyActivity2CDTranslation PolicyActivity2CDTranslationP' constraints.validation.info='PolicyActivityPayerPayerAssignedEntityAddr PolicyActivityPayerPayerAssignedEntityTelecom PolicyActivityCoverageCoverageRoleCoveragePlayingEntityDateOfBirthInSDTCbirthTime' constraints.validation.dependOn.PolicyActivityGuarantorGuarantorAssignedEntityCode='PolicyActivityGuarantorGuarantorAssignedEntityCodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPolicyActivity2Payer constraints.validation.error='PolicyActivityPayerTemplateId PolicyActivityPayerPayerAssignedEntity' templateId.root='2.16.840.1.113883.10.20.22.4.87'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPolicyActivity2PayerPayerAssignedEntity constraints.validation.info='PolicyActivityPayerPayerAssignedEntityAddr PolicyActivityPayerPayerAssignedEntityTelecom' constraints.validation.error='PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine' constraints.validation.query='PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressState PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine' constraints.validation.warning='PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressState PayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode'</annotation>
@@ -47455,57 +47455,57 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPolicyActivity2CoverageCoverageRoleCoveragePlayingEntity constraints.validation.info='PolicyActivityCoverageCoverageRoleCoveragePlayingEntityDateOfBirthInSDTCbirthTime' constraints.validation.error='PolicyActivityCoverageCoverageRoleCoveragePlayingEntityName PolicyActivity2CoverageCoverageRoleCoveragePlayingEntitySDTCBirthTime'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPolicyActivity2CD translation.codeSystem='2.16.840.1.113883.3.221.5' translation.codeSystemName='Source of Payment Typology (PHDSC)' constraints.validation.warning='PolicyActivity2CDTranslation' constraints.validation.error='PolicyActivity2CDTranslationP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_ybGEAF9xEey5t-mahoHmrg" base_Class="__SgUwOwuEeOqa975IP2wug">
+  <Ecore:EClass xmi:id="_JexNwH3sEeyivuDeOiJBMg" base_Class="__SgUwOwuEeOqa975IP2wug">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PostprocedureDiagnosis2TemplateId PostprocedureDiagnosisCode PostprocedureDiagnosisCodeP PostprocedureDiagnosisProblemObservation' templateId.root='2.16.840.1.113883.10.20.22.4.51' templateId.extension='2015-08-01' constraints.validation.dependOn.PostprocedureDiagnosisCode='PostprocedureDiagnosisCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_ybJHUl9xEey5t-mahoHmrg" base_Class="_5l3g0OzYEeOnE-G4kptBiw">
+  <Ecore:EClass xmi:id="_Je0REH3sEeyivuDeOiJBMg" base_Class="_5l3g0OzYEeOnE-G4kptBiw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PreoperativeDiagnosis2TemplateId PreoperativeDiagnosisCode PreoperativeDiagnosisCodeP PreoperativeDiagnosisProblemObservation' templateId.root='2.16.840.1.113883.10.20.22.4.65' templateId.extension='2015-08-01' constraints.validation.dependOn.PreoperativeDiagnosisCode='PreoperativeDiagnosisCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_ybMKol9xEey5t-mahoHmrg" base_Class="_y5C8IOzbEeOnE-G4kptBiw">
+  <Ecore:EClass xmi:id="_Je2tUn3sEeyivuDeOiJBMg" base_Class="_y5C8IOzbEeOnE-G4kptBiw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProblemConcernAct2TemplateId ProblemConcernActEffectiveTimeLow ProblemConcernActStatusCode ProblemConcernActStatusCodeP ProblemConcernActEffectiveTime ProblemConcernActCode ProblemConcernActCodeP ProblemConcernActProblemObservation' templateId.root='2.16.840.1.113883.10.20.22.4.3' templateId.extension='2015-08-01' constraints.validation.info='ProblemConcernActEffectiveTimeHigh ProblemConcernAct2PriorityPreference' constraints.validation.dependOn.ProblemConcernActStatusCode='ProblemConcernActStatusCodeP' constraints.validation.dependOn.ProblemConcernActCode='ProblemConcernActCodeP' constraints.validation.warning='ProblemConcernAct2AuthorParticipation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_yeadwV9xEey5t-mahoHmrg" base_Class="_prDAkPDCEeOKPKE9au0oug">
+  <Ecore:EClass xmi:id="_JhiN4n3sEeyivuDeOiJBMg" base_Class="_prDAkPDCEeOKPKE9au0oug">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProblemObservation2TemplateId ProblemObservationHasOnsetDate ProblemObservation2IfSnomedRequireTranslation ProblemObservationEffectiveTime ProblemObservationValueP ProblemObservationCodeP ProblemObservationText ProblemObservationStatusCode ProblemObservationStatusCodeP ProblemObservationHealthStatusObservation' templateId.root='2.16.840.1.113883.10.20.22.4.4' templateId.extension='2015-08-01' constraints.validation.info='ProblemObservationHasTextReference ProblemObservationTextReferenceValue ProblemObservationHasTextReferenceValue ProblemObservationHasResolutionDate ProblemObservationValueNullFlavor ProblemObservationValueNullFlavorUnknown ProblemObservationNegationInd ProblemObservation2PrognosisObservation ProblemObservation2PriorityPreference ProblemObservationProblemStatus ProblemObservation2CDQualifier ProblemObservation2CDCode ProblemObservation2CDCodeTranslation ProblemObservation2CDCodeTranslationP' constraints.validation.warning='ProblemObservation2IfSnomedRequireTranslationFromLoinc ProblemObservationValue ProblemObservationCode ProblemObservation2AuthorParticipation' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.dependOn.ProblemObservationValue='ProblemObservationValueP' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' constraints.validation.dependOn.ProblemObservationCode='ProblemObservationCodeP' constraints.validation.dependOn.ProblemObservationStatusCode='ProblemObservationStatusCodeP' constraints.validation.query='ProblemObservation2CDQualifier ProblemObservation2CDCode ProblemObservation2CDCodeTranslation ProblemObservation2CDCodeTranslationP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProblemObservation2CD constraints.validation.info='ProblemObservation2CDQualifier ProblemObservation2CDCode'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProblemObservation2CDCode constraints.validation.info='ProblemObservation2CDCodeTranslation ProblemObservation2CDCodeTranslationP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_yjnG0F9xEey5t-mahoHmrg" base_Class="_CFMuYPDbEeOKPKE9au0oug">
+  <Ecore:EClass xmi:id="_JmJBEH3sEeyivuDeOiJBMg" base_Class="_CFMuYPDbEeOKPKE9au0oug">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProcedureActivityAct2TemplateId ProcedureActivityActInstructionsInversion ProcedureActivityActMoodCode ProcedureActivityActStatusCode ProcedureActivityActStatusCodeP ProcedureActivityActEffectiveTime ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationTelecom ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationAddr ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityTelecom ProcedureActivityActProcedureActPerformerAssignedEntity' templateId.root='2.16.840.1.113883.10.20.22.4.12' templateId.extension='2014-06-09' constraints.validation.info='ProcedureActivityAct2CodeSuggestedCodeSystems ProcedureActivityActInstructions ProcedureActivityActIndication ProcedureActivityActMedicationActivity' moodCode='EVN' constraints.validation.dependOn.ProcedureActivityActStatusCode='ProcedureActivityActStatusCodeP' constraints.validation.warning='ProcedureActivityActPerformer ProcedureActivityAct2AuthorParticipation ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityRepresentedOrganization' constraints.validation.query='ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationTelecom ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationAddr ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityTelecom ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityRepresentedOrganization ProcedureActivityActProcedureActPerformerAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityAct2ProcedureActPerformer constraints.validation.error='ProcedureActivityActProcedureActPerformerAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityAct2ProcedureActPerformerProcedureActAssignedEntity constraints.validation.error='ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityTelecom' constraints.validation.warning='ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityRepresentedOrganization'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityAct2ProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganization constraints.validation.error='ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationTelecom ProcedureActivityActProcedureActPerformerProcedureActAssignedEntityProcedureActRepresentedOrganizationAddr'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_ymYG8F9xEey5t-mahoHmrg" base_Class="_QoLWAPDjEeOKPKE9au0oug">
+  <Ecore:EClass xmi:id="_Jofxgn3sEeyivuDeOiJBMg" base_Class="_QoLWAPDjEeOKPKE9au0oug">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProcedureActivityObservation2TemplateId ProcedureActivityObservationInstructionsInversion ProcedureActivityObservationTargetSiteCode ProcedureActivityObservationMoodCode ProcedureActivityObservationStatusCode ProcedureActivityObservationStatusCodeP ProcedureActivityObservationValue ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityAddr ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityTelecom ProcedureActivityObservationProcedureObservationPerformerAssignedEntity' templateId.root='2.16.840.1.113883.10.20.22.4.13' templateId.extension='2014-06-09' constraints.validation.warning='ProcedureActivityObservationCodeCodeSystems ProcedureActivityObservationTargetSiteCodeP ProcedureActivityObservationPerformer ProcedureActivityObservation2AuthorParticipation' constraints.validation.info='ProcedureActivityObservation2CodeSuggestedCodeSystems ProcedureActivityObservationIndication ProcedureActivityObservationMedicationActivity ProcedureActivityObservationInstructions ProcedureActivityObservation2ReactionObservation2 ProcedureActivityObservation2ANYNullFlavor' targetSiteCode.codeSystem='2.16.840.1.113883.6.96' targetSiteCode.codeSystemName='SNOMEDCT' constraints.validation.dependOn.ProcedureActivityObservationTargetSiteCode='ProcedureActivityObservationTargetSiteCodeP' moodCode='EVN' constraints.validation.dependOn.ProcedureActivityObservationStatusCode='ProcedureActivityObservationStatusCodeP' constraints.validation.query='ProcedureActivityObservation2ANYNullFlavor ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityAddr ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityTelecom ProcedureActivityObservationProcedureObservationPerformerAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityObservation2ANY constraints.validation.info='ProcedureActivityObservation2ANYNullFlavor'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityObservation2ProcedureObservationPerformer constraints.validation.error='ProcedureActivityObservationProcedureObservationPerformerAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityObservation2ProcedureObservationPerformerProcedureObservationAssignedEntity constraints.validation.error='ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityAddr ProcedureActivityObservationProcedureObservationPerformerProcedureObservationAssignedEntityTelecom'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_yqJzsV9xEey5t-mahoHmrg" base_Class="_fCVOQPDqEeOKPKE9au0oug">
+  <Ecore:EClass xmi:id="_JrsPcH3sEeyivuDeOiJBMg" base_Class="_fCVOQPDqEeOKPKE9au0oug">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProcedureActivityProcedure2TemplateId ProcedureActivityProcedureInstructionsInversion ProcedureActivityProcedureServiceDeliveryLocationTypeCode ProcedureActivityProcedureTargetSiteCode ProcedureActivityProcedureMoodCode ProcedureActivityProcedureStatusCode ProcedureActivityProcedureStatusCodeP ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityAddr ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityTelecom ProcedureActivityProcedureProcedureActivityPerformerAssignedEntity' templateId.root='2.16.840.1.113883.10.20.22.4.14' templateId.extension='2014-06-09' constraints.validation.warning='ProcedureActivityProcedureCodeCodeSystems ProcedureActivityProcedureTargetSiteCodeP ProcedureActivityProcedurePerformer ProcedureActivityProcedure2AuthorParticipation' constraints.validation.info='ProcedureActivityProcedure2CodeSuggestedCodeSystems ProcedureActivityProcedureIndication ProcedureActivityProcedureMedicationActivity ProcedureActivityProcedurePatientInstruction ProcedureActivityProcedureSpecimen ProcedureActivityProcedure2ReactionObservation2' targetSiteCode.codeSystem='2.16.840.1.113883.6.96' targetSiteCode.codeSystemName='SNOMEDCT' constraints.validation.dependOn.ProcedureActivityProcedureTargetSiteCode='ProcedureActivityProcedureTargetSiteCodeP' moodCode='EVN' constraints.validation.dependOn.ProcedureActivityProcedureStatusCode='ProcedureActivityProcedureStatusCodeP' constraints.validation.query='ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityAddr ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityTelecom ProcedureActivityProcedureProcedureActivityPerformerAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityProcedure2ProcedureActivityPerformer constraints.validation.error='ProcedureActivityProcedureProcedureActivityPerformerAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureActivityProcedure2ProcedureActivityPerformerProcedureActivityAssignedEntity constraints.validation.error='ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityAddr ProcedureActivityProcedureProcedureActivityPerformerProcedureActivityAssignedEntityTelecom'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_yuSs0F9xEey5t-mahoHmrg" base_Class="_U3yosPDxEeOKPKE9au0oug">
+  <Ecore:EClass xmi:id="_JvULMH3sEeyivuDeOiJBMg" base_Class="_U3yosPDxEeOKPKE9au0oug">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ReactionObservation2TemplateId ReactionObservationProcedureActivityProcedureInversionInd ReactionObservationMedicationActivityInversionInd ReactionObservationSeverityObservationInversionInd ReactionObservationCode ReactionObservationCodeP ReactionObservationId ReactionObservationText ReactionObservationStatusCode ReactionObservationStatusCodeP ReactionObservationValue ReactionObservationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.9' templateId.extension='2014-06-09' constraints.validation.info='ReactionObservationCodeValueSet ReactionObservationTextReference ReactionObservationTextReferenceValue ReactionObservationReferenceValue ReactionObservationProcedureActivityProcedure ReactionObservationMedicationActivity ReactionObservationSeverityObservation' code.code='ASSERTION' code.codeSystem='2.16.840.1.113883.5.4' code.codeSystemName='HL7ActCode' constraints.validation.dependOn.ReactionObservationCode='ReactionObservationCodeP' constraints.validation.dependOn.ReactionObservationStatusCode='ReactionObservationStatusCodeP' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.dependOn.ReactionObservationValue='ReactionObservationValueP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_ywfFMV9xEey5t-mahoHmrg" base_Class="_H85E0PF7EeOmsLWmq5fnqQ">
+  <Ecore:EClass xmi:id="_JxR6EH3sEeyivuDeOiJBMg" base_Class="_H85E0PF7EeOmsLWmq5fnqQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ResultObservation2TemplateId ResultObservationEffectiveTime ResultObservationText ResultObservationCodeP ResultObservationValue ResultObservationInterpretationCode ResultObservation2ReferenceRangeObservationRangeValue ResultObservation2ReferenceRangeObservationRangeCode ResultObservation2ReferenceRangeObservationRange' templateId.root='2.16.840.1.113883.10.20.22.4.2' templateId.extension='2015-08-01' constraints.validation.info='ResultObservationAuthorMultiplicity ResultObservationCodeValue ResultObservationTextReference ResultObservationReferenceValue ResultObservationTextReferenceValue ResultObservationNoObservationRangeCode' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.warning='ResultObservationCode ResultObservationInterpretationCodeP ResultObservation2AuthorParticipation ResultObservation2ReferenceRange' constraints.validation.dependOn.ResultObservationCode='ResultObservationCodeP' interpretationCode.codeSystem='2.16.840.1.113883.5.83' interpretationCode.codeSystemName='ObservationInterpretation' constraints.validation.dependOn.ResultObservationInterpretationCode='ResultObservationInterpretationCodeP' constraints.validation.query='ResultObservation2ReferenceRangeObservationRangeValue ResultObservation2ReferenceRangeObservationRangeCode ResultObservation2ReferenceRangeObservationRange'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolResultObservation2ReferenceRange constraints.validation.error='ResultObservation2ReferenceRangeObservationRange'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolResultObservation2ReferenceRangeObservationRange constraints.validation.error='ResultObservation2ReferenceRangeObservationRangeValue ResultObservation2ReferenceRangeObservationRangeCode'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_yyNjgF9xEey5t-mahoHmrg" base_Class="_gU40UPGEEeOmsLWmq5fnqQ">
+  <Ecore:EClass xmi:id="_Jy3Ocn3sEeyivuDeOiJBMg" base_Class="_gU40UPGEEeOmsLWmq5fnqQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ResultOrganizer2TemplateId ResultOrganizerResultObservation ResultOrganizer2IVLTSLow ResultOrganizer2IVLTSHigh' templateId.root='2.16.840.1.113883.10.20.22.4.1' templateId.extension='2015-08-01' constraints.validation.warning='ResultOrganizerCodeValue ResultOrganizer2AuthorParticipation' constraints.validation.info='ResultOrganizerClassCodeValue ResultOrganizer2EffectiveTime' constraints.validation.query='ResultOrganizer2IVLTSLow ResultOrganizer2IVLTSHigh'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolResultOrganizer2IVLTS constraints.validation.error='ResultOrganizer2IVLTSLow ResultOrganizer2IVLTSHigh'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_yzTvsl9xEey5t-mahoHmrg" base_Class="_B0oKYPJdEeO2NaSiicarcg">
+  <Ecore:EClass xmi:id="_Jz5JMH3sEeyivuDeOiJBMg" base_Class="_B0oKYPJdEeO2NaSiicarcg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SeverityObservation2TemplateId SeverityObservationCode SeverityObservationCodeP SeverityObservationText SeverityObservationStatusCode SeverityObservationStatusCodeP SeverityObservationValue SeverityObservationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.8' templateId.extension='2014-06-09' constraints.validation.info='SeverityObservationTextReference SeverityObservationTextReferenceValue SeverityObservationReferenceValue' constraints.validation.dependOn.SeverityObservationCode='SeverityObservationCodeP' constraints.validation.dependOn.SeverityObservationStatusCode='SeverityObservationStatusCodeP' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.dependOn.SeverityObservationValue='SeverityObservationValueP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_y0fbcF9xEey5t-mahoHmrg" base_Class="_b_iGIPJfEeO2NaSiicarcg">
+  <Ecore:EClass xmi:id="_J09gMH3sEeyivuDeOiJBMg" base_Class="_b_iGIPJfEeO2NaSiicarcg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SocialHistoryObservation2TemplateId SocialHistoryObservation2IfNotLoincRequireTranslation SocialHistoryObservationCodeP SocialHistoryObservationStatusCode SocialHistoryObservationStatusCodeP SocialHistoryObservation2EffectiveTime' templateId.root='2.16.840.1.113883.10.20.22.4.38' templateId.extension='2015-08-01' constraints.validation.warning='SocialHistoryObservation2ReferenceAttribute SocialHistoryObservation2IfNotLoincRequireTranslationFromLoinc SocialHistoryObservationCode SocialHistoryObservationValue SocialHistoryObservation2AuthorParticipation' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' constraints.validation.dependOn.SocialHistoryObservationStatusCode='SocialHistoryObservationStatusCodeP' constraints.validation.info='SocialHistoryObservation2CDTranslation SocialHistoryObservation2CDTranslationP' constraints.validation.query='SocialHistoryObservation2CDTranslation SocialHistoryObservation2CDTranslationP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolSocialHistoryObservation2CD constraints.validation.info='SocialHistoryObservation2CDTranslation SocialHistoryObservation2CDTranslationP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_y2N5wl9xEey5t-mahoHmrg" base_Class="_K3M6IPKJEeOn7bMsPcStOw">
+  <Ecore:EClass xmi:id="_J2g_Yn3sEeyivuDeOiJBMg" base_Class="_K3M6IPKJEeOn7bMsPcStOw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SubstanceOrDeviceAllergyObservation2TemplateId SubstanceOrDeviceAllergyObservationReactionInversionIndicator SubstanceOrDeviceAllergyObservationAllergyStatusInversionIndicator SubstanceOrDeviceAllergyObservationEffectiveTime SubstanceOrDeviceAllergyObservationValue SubstanceOrDeviceAllergyObservationValueP SubstanceOrDeviceAllergyObservationCode SubstanceOrDeviceAllergyObservationCodeP SubstanceOrDeviceAllergyObservation2IVLTSLow SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCETranslation SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCode SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntity SubstanceOrDeviceAllergyObservationParticipantParticipantRole' templateId.root='2.16.840.1.113883.10.20.24.3.90' templateId.extension='2014-06-09' constraints.validation.warning='SubstanceOrDeviceAllergyObservationSeverityInversionIndicator SubstanceOrDeviceAllergyObservation2CriticalityInversionIndicator SubstanceOrDeviceAllergyObservationParticipant SubstanceOrDeviceAllergyObservationReactionObservation SubstanceOrDeviceAllergyObservationSeverityObservation SubstanceOrDeviceAllergyObservation2AuthorParticipation SubstanceOrDeviceAllergyObservation2CriticalityObservation' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.dependOn.SubstanceOrDeviceAllergyObservationValue='SubstanceOrDeviceAllergyObservationValueP' constraints.validation.dependOn.SubstanceOrDeviceAllergyObservationCode='SubstanceOrDeviceAllergyObservationCodeP' constraints.validation.info='SubstanceOrDeviceAllergyObservationAllergyStatusObservation SubstanceOrDeviceAllergyObservation2IVLTSHigh SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityAllergySpecificMedication SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityReferenceValue SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityAllergyClassMedication SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityAllergyFoodOtherSubstance' constraints.validation.query='SubstanceOrDeviceAllergyObservation2IVLTSLow SubstanceOrDeviceAllergyObservation2IVLTSHigh SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCETranslation SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityAllergySpecificMedication SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityReferenceValue SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityAllergyClassMedication SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityAllergyFoodOtherSubstance SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCode SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntity SubstanceOrDeviceAllergyObservationParticipantParticipantRole'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolSubstanceOrDeviceAllergyObservation2IVLTS constraints.validation.error='SubstanceOrDeviceAllergyObservation2IVLTSLow' constraints.validation.info='SubstanceOrDeviceAllergyObservation2IVLTSHigh'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolSubstanceOrDeviceAllergyObservation2Participant constraints.validation.error='SubstanceOrDeviceAllergyObservationParticipantParticipantRole'</annotation>
@@ -47513,159 +47513,159 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolSubstanceOrDeviceAllergyObservation2ParticipantParticipantRolePlayingEntity constraints.validation.info='SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityAllergySpecificMedication SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReference SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityReferenceValue SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityOriginalTextReferenceValue SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityAllergyClassMedication SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityAllergyFoodOtherSubstance' constraints.validation.error='SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCode SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCETranslation' constraints.validation.query='SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCETranslation'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolSubstanceOrDeviceAllergyObservation2ParticipantParticipantRolePlayingEntityCE constraints.validation.error='SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCEOriginalText SubstanceOrDeviceAllergyObservationParticipantParticipantRolePlayingEntityCETranslation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_y5iTgF9xEey5t-mahoHmrg" base_Class="_qHUXwPMxEeOUvapeh9bVvQ">
+  <Ecore:EClass xmi:id="_J5ez0H3sEeyivuDeOiJBMg" base_Class="_qHUXwPMxEeOUvapeh9bVvQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='TobaccoUse2TemplateId TobaccoUse2Id TobaccoUseCode TobaccoUseCodeP TobaccoUseEffectiveTime' templateId.root='2.16.840.1.113883.10.20.22.4.85' templateId.extension='2014-06-09' code.code='11367-0' code.codeSystemName='' code.displayName='History of tobacco use' constraints.validation.dependOn.TobaccoUseCode='TobaccoUseCodeP' constraints.validation.warning='TobaccoUse2AuthorParticipation' constraints.validation.info='TobaccoUse2CDCodeTermAssertionOrLoinc TobaccoUse2IVLTSHigh' constraints.validation.query='TobaccoUse2CDCodeTermAssertionOrLoinc TobaccoUse2IVLTSHigh'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolTobaccoUse2IVLTS constraints.validation.info='TobaccoUse2IVLTSHigh'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolTobaccoUse2CD constraints.validation.info='TobaccoUse2CDCodeTermAssertionOrLoinc'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_y6IwcF9xEey5t-mahoHmrg" base_Class="__zeTcPM3EeOUvapeh9bVvQ">
+  <Ecore:EClass xmi:id="_J6C0gn3sEeyivuDeOiJBMg" base_Class="__zeTcPM3EeOUvapeh9bVvQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='VitalSignObservation2TemplateId VitalSignObservationEffectiveTime VitalSignObservationValue VitalSignObservationText VitalSignObservationInterpretationCode VitalSignObservationAuthor' templateId.root='2.16.840.1.113883.10.20.22.4.27' templateId.extension='2014-06-09' constraints.validation.info='VitalSignObservationTextReference VitalSignObservationReferenceValue VitalSignObservationTextReferenceValue VitalSignObservationInterpretationCodeP' interpretationCode.codeSystem='2.16.840.1.113883.5.83' interpretationCode.codeSystemName='ObservationInterpretation' constraints.validation.dependOn.VitalSignObservationInterpretationCode='VitalSignObservationInterpretationCodeP' constraints.validation.warning='VitalSignObservation2AuthorParticipation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_y8drsl9xEey5t-mahoHmrg" base_Class="_dDupoPV2EeONioZkBKP8eQ">
+  <Ecore:EClass xmi:id="_J8E00n3sEeyivuDeOiJBMg" base_Class="_dDupoPV2EeONioZkBKP8eQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='VitalSignsOrganizer2TemplateId VitalSignsOrganizerCode VitalSignsOrganizerCodeP VitalSignsOrganizerEffectiveTime VitalSignsOrganizerVitalSignObservation VitalSignsOrganizer2CDTranslation VitalSignsOrganizer2CDTranslationP' templateId.root='2.16.840.1.113883.10.20.22.4.26' templateId.extension='2015-08-01' constraints.validation.dependOn.VitalSignsOrganizerCode='VitalSignsOrganizerCodeP' constraints.validation.warning='VitalSignsOrganizer2AuthorParticipation' constraints.validation.query='VitalSignsOrganizer2CDTranslation VitalSignsOrganizer2CDTranslationP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolVitalSignsOrganizer2CD translation.code='74728-7' translation.codeSystem='2.16.840.1.113883.6.1' translation.codeSystemName='LOINC' translation.displayName='Vital signs, weight, height, head circumference, oximetry, BMI, and BSA panel - HL7.CCDAr1.1' constraints.validation.error='VitalSignsOrganizer2CDTranslation VitalSignsOrganizer2CDTranslationP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zMrR8V9xEey5t-mahoHmrg" base_Class="_ze150PitEeOXlK95I8tUew">
+  <Ecore:EClass xmi:id="_KJovsn3sEeyivuDeOiJBMg" base_Class="_ze150PitEeOXlK95I8tUew">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MentalStatusObservation2TemplateId ResultObservationClassCode ResultObservationMoodCode ResultObservationId ResultObservationCode ResultObservationCodeP ResultObservationStatusCode ResultObservationStatusCodeP ResultObservationEffectiveTime ResultObservationValue ResultObservationText ResultObservationInterpretationCode ResultObservationMethodCode ResultObservationTargetSiteCode CognitiveStatusResultObservationAuthor CognitiveStatusResultObservationNonMedicinalSupplyActivity CognitiveStatusResultObservationCaregiverCharacteristics MentalStatusObservation2CDTranslation MentalStatusObservation2CDTranslationP CognitiveStatusResultObservationReferenceRangeObservationRange' templateId.root='2.16.840.1.113883.10.20.22.4.74' templateId.extension='2015-08-01' constraints.validation.warning='CognitiveStatusResultObservationValueDatatype MentalStatusObservation2AuthorParticipation' constraints.validation.info='ResultObservationTextReference ResultObservationTextReferenceValue ResultObservationReferenceValue ResultObservationCodeValue ResultObservationNoObservationRangeCode ResultObservationAuthorMultiplicity CognitiveStatusResultObservationAssessmentScaleObservation CognitiveStatusResultObservationReferenceRange CognitiveStatusResultObservationReferenceRangeObservationRangeNoCode' classCode='OBS' moodCode='EVN' constraints.validation.dependOn.ResultObservationCode='ResultObservationCodeP' constraints.validation.dependOn.ResultObservationStatusCode='ResultObservationStatusCodeP' constraints.validation.query='MentalStatusObservation2CDTranslation MentalStatusObservation2CDTranslationP CognitiveStatusResultObservationReferenceRangeObservationRangeNoCode CognitiveStatusResultObservationReferenceRangeObservationRange'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMentalStatusObservation2CD translation.code='75275-8' translation.codeSystem='2.16.840.1.113883.6.1' translation.codeSystemName='LOINC' translation.displayName='Cognitive Function' constraints.validation.error='MentalStatusObservation2CDTranslation MentalStatusObservation2CDTranslationP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMentalStatusObservation2ReferenceRange constraints.validation.error='CognitiveStatusResultObservationReferenceRangeObservationRange'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMentalStatusObservation2ReferenceRangeObservationRange constraints.validation.info='CognitiveStatusResultObservationReferenceRangeObservationRangeNoCode'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zRCNgV9xEey5t-mahoHmrg" base_Class="_aetyEPu_EeOyiMEKhdqMGA">
+  <Ecore:EClass xmi:id="_KNYAMX3sEeyivuDeOiJBMg" base_Class="_aetyEPu_EeOyiMEKhdqMGA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AnesthesiaSection2TemplateId AnesthesiaSectionCode AnesthesiaSectionCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.25' templateId.extension='2014-06-09' constraints.validation.dependOn.AnesthesiaSectionCode='AnesthesiaSectionCodeP' constraints.validation.info='AnesthesiaSectionProcedureActivityProcedure AnesthesiaSectionMedicationActivity'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zSGkgl9xEey5t-mahoHmrg" base_Class="_q_8twPvVEeOvZJBdQKQrqQ">
+  <Ecore:EClass xmi:id="_KOQJ8H3sEeyivuDeOiJBMg" base_Class="_q_8twPvVEeOvZJBdQKQrqQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AssessmentAndPlanSection2TemplateId AssessmentAndPlanSectionCode AssessmentAndPlanSectionCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.9' templateId.extension='2014-06-09' constraints.validation.dependOn.AssessmentAndPlanSectionCode='AssessmentAndPlanSectionCodeP' constraints.validation.info='AssessmentAndPlanSectionPlanOfCareActivityAct'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zSp-IV9xEey5t-mahoHmrg" base_Class="_6M-msPvXEeOes-3T-2HryA">
+  <Ecore:EClass xmi:id="_KOuEAn3sEeyivuDeOiJBMg" base_Class="_6M-msPvXEeOes-3T-2HryA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ComplicationsSection2TemplateId ComplicationsSectionCode ComplicationsSectionCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.37' templateId.extension='2015-08-01' constraints.validation.info='ComplicationsSectionExplicitComplications ComplicationsSectionProblemObservation' constraints.validation.dependOn.ComplicationsSectionCode='ComplicationsSectionCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zTOl4l9xEey5t-mahoHmrg" base_Class="_kgM0YPvbEeOJwYDYIUCQDg">
+  <Ecore:EClass xmi:id="_KPNMNX3sEeyivuDeOiJBMg" base_Class="_kgM0YPvbEeOJwYDYIUCQDg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='EncountersSectionEntriesOptionalTemplateId EncountersSectionEntriesOptionalCode EncountersSectionEntriesOptionalCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.22' templateId.extension='2015-08-01' constraints.validation.dependOn.EncountersSectionEntriesOptionalCode='EncountersSectionEntriesOptionalCodeP' constraints.validation.warning='EncountersSectionEntriesOptionalEncounterActivities'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zTzNoV9xEey5t-mahoHmrg" base_Class="_8rMFkPyHEeOozpLKXSm5NA">
+  <Ecore:EClass xmi:id="_KPzCE33sEeyivuDeOiJBMg" base_Class="_8rMFkPyHEeOozpLKXSm5NA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='FunctionalStatusSection2TemplateId FunctionalStatusSectionCode FunctionalStatusSectionCodeP FunctionalStatusSectionCognitiveStatusResultOrganizer FunctionalStatusSectionCognitiveStatusResultObservation FunctionalStatusSectionNumberOfPressureUlcersObservation FunctionalStatusSectionHighestPressureUlcerStage' templateId.root='2.16.840.1.113883.10.20.22.2.14' templateId.extension='2014-06-09' constraints.validation.dependOn.FunctionalStatusSectionCode='FunctionalStatusSectionCodeP' constraints.validation.info='FunctionalStatusSectionFunctionalStatusResultOrganizer FunctionalStatusSectionFunctionalStatusResultObservation FunctionalStatusSectionNonMedicinalSupplyActivity FunctionalStatusSection2SelfCareActivities FunctionalStatusSection2SensoryAndSpeechStatus'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zYVvYF9xEey5t-mahoHmrg" base_Class="_sZlggPyhEeOC19UEcu7MOw">
+  <Ecore:EClass xmi:id="_KT3Csn3sEeyivuDeOiJBMg" base_Class="_sZlggPyhEeOC19UEcu7MOw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HistoryOfPastIllnessSection2TemplateId HistoryOfPastIllnessSectionCode HistoryOfPastIllnessSectionCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.20' templateId.extension='2015-08-01' constraints.validation.dependOn.HistoryOfPastIllnessSectionCode='HistoryOfPastIllnessSectionCodeP' constraints.validation.info='HistoryOfPastIllnessSectionProblemObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zY6XIF9xEey5t-mahoHmrg" base_Class="_ctJgAPylEeOc0tW1-DpN-Q">
+  <Ecore:EClass xmi:id="_KUWK4H3sEeyivuDeOiJBMg" base_Class="_ctJgAPylEeOc0tW1-DpN-Q">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AdmissionDiagnosisSection2TemplateId HospitalAdmissionDiagnosisSectionCode HospitalAdmissionDiagnosisSectionCodeP AdmissionDiagnosisSection2CETranslation AdmissionDiagnosisSection2CETranslationP' templateId.root='2.16.840.1.113883.10.20.22.2.43' templateId.extension='2015-08-01' constraints.validation.dependOn.HospitalAdmissionDiagnosisSectionCode='HospitalAdmissionDiagnosisSectionCodeP' constraints.validation.warning='HospitalAdmissionDiagnosisSectionHospitalAdmissionDiagnosis' constraints.validation.query='AdmissionDiagnosisSection2CETranslation AdmissionDiagnosisSection2CETranslationP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAdmissionDiagnosisSection2CE translation.code='42347-5' translation.codeSystem='2.16.840.1.113883.6.1' translation.codeSystemName='LOINC' translation.displayName='Admission Diagnosis' constraints.validation.error='AdmissionDiagnosisSection2CETranslation AdmissionDiagnosisSection2CETranslationP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zZg0EF9xEey5t-mahoHmrg" base_Class="_ZLY3MPyqEeOlg_Cnc5bODw">
+  <Ecore:EClass xmi:id="_KU5kgH3sEeyivuDeOiJBMg" base_Class="_ZLY3MPyqEeOlg_Cnc5bODw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HospitalAdmissionMedicationsSectionEntriesOptionalTemplateId HospitalAdmissionMedicationsSectionEntriesOptionalCode HospitalAdmissionMedicationsSectionEntriesOptionalCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.44' templateId.extension='2015-08-01' constraints.validation.dependOn.HospitalAdmissionMedicationsSectionEntriesOptionalCode='HospitalAdmissionMedicationsSectionEntriesOptionalCodeP' constraints.validation.warning='HospitalAdmissionMedicationsSectionEntriesOptionalAdmissionMedication'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zaFb0V9xEey5t-mahoHmrg" base_Class="_jfuGYPytEeOmn53IDV99zw">
+  <Ecore:EClass xmi:id="_KVZTwn3sEeyivuDeOiJBMg" base_Class="_jfuGYPytEeOmn53IDV99zw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='DischargeDiagnosisSection2TemplateId HospitalDischargeDiagnosisSectionCode HospitalDischargeDiagnosisSectionCodeP DischargeDiagnosisSection2CETranslation DischargeDiagnosisSection2CETranslationP' templateId.root='2.16.840.1.113883.10.20.22.2.24' templateId.extension='2015-08-01' constraints.validation.dependOn.HospitalDischargeDiagnosisSectionCode='HospitalDischargeDiagnosisSectionCodeP' constraints.validation.warning='HospitalDischargeDiagnosisSectionHospitalDischargeDiagnosis' constraints.validation.query='DischargeDiagnosisSection2CETranslation DischargeDiagnosisSection2CETranslationP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDischargeDiagnosisSection2CE translation.code='78375-3' translation.codeSystem='2.16.840.1.113883.6.1' translation.codeSystemName='LOINC' translation.displayName='Discharge Diagnosis' constraints.validation.error='DischargeDiagnosisSection2CETranslation DischargeDiagnosisSection2CETranslationP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zasf0l9xEey5t-mahoHmrg" base_Class="_HlfBYPyzEeOfAK77IvEBUw">
+  <Ecore:EClass xmi:id="_KV5DAH3sEeyivuDeOiJBMg" base_Class="_HlfBYPyzEeOfAK77IvEBUw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HospitalDischargeMedicationsSectionEntriesOptionalTemplateId HospitalDischargeMedicationsSectionEntriesOptionalCode HospitalDischargeMedicationsSectionEntriesOptionalCodeP DischargeMedicationsSectionEntriesOptional2CETranslation DischargeMedicationsSectionEntriesOptional2CETranslationP' templateId.root='2.16.840.1.113883.10.20.22.2.11' templateId.extension='2015-08-01' constraints.validation.dependOn.HospitalDischargeMedicationsSectionEntriesOptionalCode='HospitalDischargeMedicationsSectionEntriesOptionalCodeP' constraints.validation.warning='HospitalDischargeMedicationsSectionEntriesOptionalDischargeMedication' constraints.validation.query='DischargeMedicationsSectionEntriesOptional2CETranslation DischargeMedicationsSectionEntriesOptional2CETranslationP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDischargeMedicationsSectionEntriesOptional2CE translation.code='75311-1' translation.codeSystem='2.16.840.1.113883.6.1' translation.codeSystemName='LOINC' translation.displayName='Discharge Medications' constraints.validation.error='DischargeMedicationsSectionEntriesOptional2CETranslation DischargeMedicationsSectionEntriesOptional2CETranslationP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zbTj0F9xEey5t-mahoHmrg" base_Class="_kdQhIPy3EeO1SvUcmWeLDQ">
+  <Ecore:EClass xmi:id="_KWdDsH3sEeyivuDeOiJBMg" base_Class="_kdQhIPy3EeO1SvUcmWeLDQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ImmunizationsSectionEntriesOptionalTemplateId ImmunizationsSectionEntriesOptionalCode ImmunizationsSectionEntriesOptionalCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.2' templateId.extension='2015-08-01' constraints.validation.dependOn.ImmunizationsSectionEntriesOptionalCode='ImmunizationsSectionEntriesOptionalCodeP' constraints.validation.warning='ImmunizationsSectionEntriesOptionalImmunizationActivity'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zb4LkF9xEey5t-mahoHmrg" base_Class="_k8L2YP1HEeOVx4YMwgfjlA">
+  <Ecore:EClass xmi:id="_KW-BEH3sEeyivuDeOiJBMg" base_Class="_k8L2YP1HEeOVx4YMwgfjlA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='InstructionsSection2TemplateId InstructionsSectionCode InstructionsSectionCodeP InstructionsSectionInstructions' templateId.root='2.16.840.1.113883.10.20.22.2.45' templateId.extension='2014-06-09' nullFlavor='NI' constraints.validation.info='InstructionsSection2NullFlavor' constraints.validation.dependOn.InstructionsSectionCode='InstructionsSectionCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zcmkUF9xEey5t-mahoHmrg" base_Class="_YCS1AP1WEeOW-qBXb0kbTA">
+  <Ecore:EClass xmi:id="_KXdwUn3sEeyivuDeOiJBMg" base_Class="_YCS1AP1WEeOW-qBXb0kbTA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='InterventionsSection2TemplateId InterventionsSectionCode InterventionsSectionCodeP' templateId.root='2.16.840.1.113883.10.20.21.2.3' templateId.extension='2015-08-01' constraints.validation.dependOn.InterventionsSectionCode='InterventionsSectionCodeP' constraints.validation.warning='InterventionsSection2InterventionAct InterventionsSection2PlannedInterventionAct' constraints.validation.info='InterventionsSection2HandoffCommunication'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zdLzIl9xEey5t-mahoHmrg" base_Class="_5OKxwP1bEeO5Hq-yrsJSmg">
+  <Ecore:EClass xmi:id="_KYBxAH3sEeyivuDeOiJBMg" base_Class="_5OKxwP1bEeO5Hq-yrsJSmg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicalEquipmentSection2TemplateId MedicalEquipmentSectionCode MedicalEquipmentSectionCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.23' templateId.extension='2014-06-09' constraints.validation.dependOn.MedicalEquipmentSectionCode='MedicalEquipmentSectionCodeP' constraints.validation.warning='MedicalEquipmentSectionNonMedicinalSupplyActivity MedicalEquipmentSection2ProcedureActivityProcedure2' constraints.validation.info='MedicalEquipmentSection2MedicalEquipmentOrganizer'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zey8sl9xEey5t-mahoHmrg" base_Class="_F37nMP4jEeOwFalSp0fRiw">
+  <Ecore:EClass xmi:id="_KZa4IH3sEeyivuDeOiJBMg" base_Class="_F37nMP4jEeOwFalSp0fRiw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicationsAdministeredSection2TemplateId MedicationsAdministeredSectionCode MedicationsAdministeredSectionCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.38' templateId.extension='2014-06-09' constraints.validation.dependOn.MedicationsAdministeredSectionCode='MedicationsAdministeredSectionCodeP' constraints.validation.info='MedicationsAdministeredSectionMedicationActivity'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zfYykF9xEey5t-mahoHmrg" base_Class="_twgM0P4lEeOzC5ykp-XCaA">
+  <Ecore:EClass xmi:id="_KZ3kEn3sEeyivuDeOiJBMg" base_Class="_twgM0P4lEeOzC5ykp-XCaA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PayersSection2TemplateId PayersSectionCode PayersSectionCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.18' templateId.extension='2015-08-01' constraints.validation.dependOn.PayersSectionCode='PayersSectionCodeP' constraints.validation.warning='PayersSectionCoverageActivity'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zf9aUF9xEey5t-mahoHmrg" base_Class="_-nZiYP4uEeObaveuCI77uA">
+  <Ecore:EClass xmi:id="_KaWFMn3sEeyivuDeOiJBMg" base_Class="_-nZiYP4uEeObaveuCI77uA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PhysicalExamSection2TemplateId PhysicalExamSectionCode PhysicalExamSectionCodeP PhysicalExamSectionPressureUlcerObservation PhysicalExamSectionHighestPressureUlcerStage PhysicalExamSectionNumberOfPressureUlcersObservation PhysicalExamSection2ComponentSectionCodeP PhysicalExamSection2ComponentSectionTitle PhysicalExamSection2ComponentSectionText PhysicalExamSection2ComponentSection' templateId.root='2.16.840.1.113883.10.20.2.10' templateId.extension='2015-08-01' constraints.validation.dependOn.PhysicalExamSectionCode='PhysicalExamSectionCodeP' constraints.validation.info='PhysicalExamSection2WoundObservation PhysicalExamSection2Component' constraints.validation.warning='PhysicalExamSection2ComponentSectionCode' constraints.validation.query='PhysicalExamSection2ComponentSectionCode PhysicalExamSection2ComponentSectionCodeP PhysicalExamSection2ComponentSectionTitle PhysicalExamSection2ComponentSectionText PhysicalExamSection2ComponentSection'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPhysicalExamSection2Component constraints.validation.error='PhysicalExamSection2ComponentSection'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPhysicalExamSection2ComponentSection code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.warning='PhysicalExamSection2ComponentSectionCode' constraints.validation.error='PhysicalExamSection2ComponentSectionCodeP PhysicalExamSection2ComponentSectionTitle PhysicalExamSection2ComponentSectionText'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zjHcAF9xEey5t-mahoHmrg" base_Class="_bwml0P4yEeO_Yb9cO8w3bA">
+  <Ecore:EClass xmi:id="_KdJhkH3sEeyivuDeOiJBMg" base_Class="_bwml0P4yEeO_Yb9cO8w3bA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlanOfTreatmentSection2TemplateId PlanOfCareSectionCode PlanOfCareSectionCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.10' templateId.extension='2014-06-09' constraints.validation.dependOn.PlanOfCareSectionCode='PlanOfCareSectionCodeP' constraints.validation.info='PlanOfCareSectionPlanOfCareActivityObservation PlanOfCareSectionPlanOfCareActivityEncounter PlanOfCareSectionPlanOfCareActivityAct PlanOfCareSectionPlanOfCareActivityProcedure PlanOfCareSectionPlanOfCareActivitySubstanceAdministration PlanOfCareSectionPlanOfCareActivitySupply PlanOfCareSectionInstructions PlanOfTreatmentSection2HandoffCommunication PlanOfTreatmentSection2NutritionRecommendation PlanOfTreatmentSection2PlannedImmunizationActivity PlanOfTreatmentSection2GoalObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_znm6cl9xEey5t-mahoHmrg" base_Class="_dz0ZwP49EeO_F_2qLv6FWQ">
+  <Ecore:EClass xmi:id="_KhG0gH3sEeyivuDeOiJBMg" base_Class="_dz0ZwP49EeO_F_2qLv6FWQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlannedProcedureSection2TemplateId PlannedProcedureSectionCode PlannedProcedureSectionCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.30' templateId.extension='2014-06-09' constraints.validation.dependOn.PlannedProcedureSectionCode='PlannedProcedureSectionCodeP' constraints.validation.info='PlannedProcedureSectionPlanOfCareActivityProcedure'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zoHQwF9xEey5t-mahoHmrg" base_Class="_MLNngP5BEeOmw9RN80Tpig">
+  <Ecore:EClass xmi:id="_KhjgcH3sEeyivuDeOiJBMg" base_Class="_MLNngP5BEeOmw9RN80Tpig">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PostprocedureDiagnosisSection2TemplateId PostprocedureDiagnosisSectionCode PostprocedureDiagnosisSectionCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.36' templateId.extension='2015-08-01' constraints.validation.dependOn.PostprocedureDiagnosisSectionCode='PostprocedureDiagnosisSectionCodeP' constraints.validation.warning='PostprocedureDiagnosisSectionPostprocedureDiagnosis'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zoqqYF9xEey5t-mahoHmrg" base_Class="_JFd3MP5EEeOBnLkJOVC8NQ">
+  <Ecore:EClass xmi:id="_KiAzcX3sEeyivuDeOiJBMg" base_Class="_JFd3MP5EEeOBnLkJOVC8NQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PreoperativeDiagnosisSection2TemplateId PreoperativeDiagnosisSectionCode PreoperativeDiagnosisSectionCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.34' templateId.extension='2015-08-01' constraints.validation.dependOn.PreoperativeDiagnosisSectionCode='PreoperativeDiagnosisSectionCodeP' constraints.validation.warning='PreoperativeDiagnosisSectionPreoperativeDiagnosis'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zpMO0F9xEey5t-mahoHmrg" base_Class="_lLOykP5FEeO_r7yO9mhwnA">
+  <Ecore:EClass xmi:id="_KietgH3sEeyivuDeOiJBMg" base_Class="_lLOykP5FEeO_r7yO9mhwnA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProcedureFindingsSection2TemplateId ProcedureFindingsSectionCode ProcedureFindingsSectionCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.28' templateId.extension='2015-08-01' constraints.validation.dependOn.ProcedureFindingsSectionCode='ProcedureFindingsSectionCodeP' constraints.validation.info='ProcedureFindingsSectionProblemObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zpxdoF9xEey5t-mahoHmrg" base_Class="_5_O94AByEeSjnfOPJpFg3A">
+  <Ecore:EClass xmi:id="_Ki9Oon3sEeyivuDeOiJBMg" base_Class="_5_O94AByEeSjnfOPJpFg3A">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProcedureIndicationsSection2TemplateId ProcedureIndicationsSectionCode ProcedureIndicationsSectionCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.29' templateId.extension='2014-06-09' constraints.validation.dependOn.ProcedureIndicationsSectionCode='ProcedureIndicationsSectionCodeP' constraints.validation.info='ProcedureIndicationsSectionIndication'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zqXTgF9xEey5t-mahoHmrg" base_Class="_80dMoAB0EeSLOb2O6vSPzg">
+  <Ecore:EClass xmi:id="_KjcW0n3sEeyivuDeOiJBMg" base_Class="_80dMoAB0EeSLOb2O6vSPzg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProceduresSectionEntriesOptionalTemplateId ProceduresSectionEntriesOptionalCode ProceduresSectionEntriesOptionalCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.7' templateId.extension='2014-06-09' constraints.validation.dependOn.ProceduresSectionEntriesOptionalCode='ProceduresSectionEntriesOptionalCodeP' constraints.validation.info='ProceduresSectionEntriesOptionalProcedureActivityProcedure ProceduresSectionEntriesOptionalProcedureActivityObservation ProceduresSectionEntriesOptionalProcedureActivityAct'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zr9O8l9xEey5t-mahoHmrg" base_Class="_Ya0H0AB5EeS20Pddu0dxVw">
+  <Ecore:EClass xmi:id="_Kk8LoH3sEeyivuDeOiJBMg" base_Class="_Ya0H0AB5EeS20Pddu0dxVw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ReasonForReferralSection2TemplateId ReasonForReferralSectionCode ReasonForReferralSectionCodeP' templateId.root='1.3.6.1.4.1.19376.1.5.3.1.3.1' templateId.extension='2014-06-09' constraints.validation.dependOn.ReasonForReferralSectionCode='ReasonForReferralSectionCodeP' constraints.validation.info='ReasonForReferralSection2PatientReferralAct'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zsidwF9xEey5t-mahoHmrg" base_Class="_yaJ3QAFAEeSaVZ5WxWd94w">
+  <Ecore:EClass xmi:id="_KlbT0H3sEeyivuDeOiJBMg" base_Class="_yaJ3QAFAEeSaVZ5WxWd94w">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ResultsSectionEntriesOptionalTemplateId ResultsSectionEntriesOptionalCode ResultsSectionEntriesOptionalCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.3' templateId.extension='2015-08-01' constraints.validation.dependOn.ResultsSectionEntriesOptionalCode='ResultsSectionEntriesOptionalCodeP' constraints.validation.warning='ResultsSectionEntriesOptionalResultOrganizer'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_ztFQUF9xEey5t-mahoHmrg" base_Class="_wLWZMAFHEeSG_MJH-zNFRw">
+  <Ecore:EClass xmi:id="_Kl8RMn3sEeyivuDeOiJBMg" base_Class="_wLWZMAFHEeSG_MJH-zNFRw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SocialHistorySection2TemplateId SocialHistorySectionCode SocialHistorySectionCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.17' templateId.extension='2015-08-01' constraints.validation.dependOn.SocialHistorySectionCode='SocialHistorySectionCodeP' constraints.validation.info='SocialHistorySectionSocialHistoryObservation SocialHistorySectionTobaccoUse SocialHistorySection2CaregiverCharacteristics SocialHistorySection2CulturalAndReligiousObservation SocialHistorySection2CharacteristicsOfHomeEnvironment SocialHistorySection2BirthSexObservation' constraints.validation.warning='SocialHistorySectionSmokingStatusObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zwdUcF9xEey5t-mahoHmrg" base_Class="_8LkzYAFTEeSmasYc71ZgMQ">
+  <Ecore:EClass xmi:id="_KoxixH3sEeyivuDeOiJBMg" base_Class="_8LkzYAFTEeSmasYc71ZgMQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='VitalSignsSectionEntriesOptionalTemplateId VitalSignsSectionEntriesOptionalCode VitalSignsSectionEntriesOptionalCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.4' templateId.extension='2015-08-01' constraints.validation.dependOn.VitalSignsSectionEntriesOptionalCode='VitalSignsSectionEntriesOptionalCodeP' constraints.validation.warning='VitalSignsSectionEntriesOptionalVitalSignsOrganizer'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zw_f9F9xEey5t-mahoHmrg" base_Class="_jsKhYAFXEeSLIY0bHb-fFQ">
+  <Ecore:EClass xmi:id="_KpQD4H3sEeyivuDeOiJBMg" base_Class="_jsKhYAFXEeSLIY0bHb-fFQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AdvanceDirectivesSectionEntriesOptionalTemplateId AdvanceDirectivesSectionEntriesOptionalCode AdvanceDirectivesSectionEntriesOptionalCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.21' templateId.extension='2015-08-01' constraints.validation.dependOn.AdvanceDirectivesSectionEntriesOptionalCode='AdvanceDirectivesSectionEntriesOptionalCodeP' constraints.validation.info='AdvanceDirectivesSectionEntriesOptional2AdvanceDirectiveOrganizer AdvanceDirectivesSectionEntriesOptionalAdvanceDirectiveObservation'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zxjgoF9xEey5t-mahoHmrg" base_Class="_JUvaUAFaEeS0nNJt6oyOyQ">
+  <Ecore:EClass xmi:id="_KpulAX3sEeyivuDeOiJBMg" base_Class="_JUvaUAFaEeS0nNJt6oyOyQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicationsSectionEntriesOptionalTemplateId MedicationsSectionEntriesOptionalCode MedicationsSectionEntriesOptionalCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.1' templateId.extension='2014-06-09' constraints.validation.info='MedicationsSectionEntriesOptionalAbsenceOfMedications' constraints.validation.dependOn.MedicationsSectionEntriesOptionalCode='MedicationsSectionEntriesOptionalCodeP' constraints.validation.warning='MedicationsSectionEntriesOptionalMedicationActivity'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zyFFEl9xEey5t-mahoHmrg" base_Class="_ZgLioAFkEeSJ2uHfynwxCw">
+  <Ecore:EClass xmi:id="_KqL4An3sEeyivuDeOiJBMg" base_Class="_ZgLioAFkEeSJ2uHfynwxCw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProblemSectionEntriesOptionalTemplateId ProblemSectionEntriesOptionalCode ProblemSectionEntriesOptionalCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.5' templateId.extension='2015-08-01' constraints.validation.dependOn.ProblemSectionEntriesOptionalCode='ProblemSectionEntriesOptionalCodeP' constraints.validation.warning='ProblemSectionEntriesOptionalProblemConcern' constraints.validation.info='ProblemSectionEntriesOptional2HealthStatusObservation2'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zzFxsl9xEey5t-mahoHmrg" base_Class="_ZFbCkAIPEeS-F85KYVlDyA">
+  <Ecore:EClass xmi:id="_KrEBwH3sEeyivuDeOiJBMg" base_Class="_ZFbCkAIPEeS-F85KYVlDyA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AdvanceDirectivesSectionEntriesOptionalTemplateId AdvanceDirectivesSection2HasAdvanceDirectiveObservation2XorAdvanceDirectiveOrganizer AdvanceDirectivesSectionEntriesOptionalCode AdvanceDirectivesSectionEntriesOptionalCodeP AdvanceDirectivesSection2Title AdvanceDirectivesSection2Text AdvanceDirectivesSectionEntriesOptional2AdvanceDirectiveOrganizer AdvanceDirectivesSectionEntriesOptionalAdvanceDirectiveObservation AdvanceDirectivesSection2Entry AdvanceDirectivesSection2EntryHasAdvanceDirectiveObservation2XorAdvanceDirectiveOrganizer' templateId.root='2.16.840.1.113883.10.20.22.2.21.1' templateId.extension='2015-08-01' constraints.validation.dependOn.AdvanceDirectivesSectionEntriesOptionalCode='AdvanceDirectivesSectionEntriesOptionalCodeP' constraints.validation.query='AdvanceDirectivesSection2EntryHasAdvanceDirectiveObservation2XorAdvanceDirectiveOrganizer AdvanceDirectivesSection2EntryAdvanceDirectiveOrganizer AdvanceDirectivesSection2EntryAdvanceDirectiveObservation2' constraints.validation.info='AdvanceDirectivesSection2EntryAdvanceDirectiveOrganizer AdvanceDirectivesSection2EntryAdvanceDirectiveObservation2'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolAdvanceDirectivesSection2Entry constraints.validation.error='AdvanceDirectivesSection2EntryHasAdvanceDirectiveObservation2XorAdvanceDirectiveOrganizer' constraints.validation.info='AdvanceDirectivesSection2EntryAdvanceDirectiveOrganizer AdvanceDirectivesSection2EntryAdvanceDirectiveObservation2'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_zzsOoF9xEey5t-mahoHmrg" base_Class="_nWAcMAIjEeSVzfoPSatgpg">
+  <Ecore:EClass xmi:id="_KrkYEH3sEeyivuDeOiJBMg" base_Class="_nWAcMAIjEeSVzfoPSatgpg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AllergiesSectionEntriesOptionalTemplateId AllergiesSectionEntriesOptionalCode AllergiesSectionEntriesOptionalCodeP' templateId.root='2.16.840.1.113883.10.20.22.2.6' templateId.extension='2015-08-01' constraints.validation.dependOn.AllergiesSectionEntriesOptionalCode='AllergiesSectionEntriesOptionalCodeP' constraints.validation.warning='AllergiesSectionEntriesOptionalAllergyProblemAct'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_z0PoQ19xEey5t-mahoHmrg" base_Class="_EONPMAInEeSr1aKUYorURA">
+  <Ecore:EClass xmi:id="_KsBrEH3sEeyivuDeOiJBMg" base_Class="_EONPMAInEeSr1aKUYorURA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AllergiesSectionEntriesOptionalTemplateId AllergiesSectionEntriesOptionalCode AllergiesSectionEntriesOptionalCodeP AllergiesSection2Title AllergiesSection2Text AllergiesSectionEntriesOptionalAllergyProblemAct' templateId.root='2.16.840.1.113883.10.20.22.2.6.1' templateId.extension='2015-08-01' nullFlavor='NI' constraints.validation.info='AllergiesSection2NullFlavor' constraints.validation.dependOn.AllergiesSectionEntriesOptionalCode='AllergiesSectionEntriesOptionalCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_z003EF9xEey5t-mahoHmrg" base_Class="_ogD-EAIvEeScubSeRE1upQ">
+  <Ecore:EClass xmi:id="_Ksng8H3sEeyivuDeOiJBMg" base_Class="_ogD-EAIvEeScubSeRE1upQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='EncountersSectionEntriesOptionalTemplateId EncountersSectionEntriesOptionalCode EncountersSectionEntriesOptionalCodeP EncountersSection2Text EncountersSection2Title EncountersSectionEntriesOptionalEncounterActivities' templateId.root='2.16.840.1.113883.10.20.22.2.22.1' templateId.extension='2015-08-01' nullFlavor='NI' constraints.validation.info='EncountersSection2NullFlavor' constraints.validation.dependOn.EncountersSectionEntriesOptionalCode='EncountersSectionEntriesOptionalCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_z1as8l9xEey5t-mahoHmrg" base_Class="_Jt0moAI0EeSRkrs1G7P_XQ">
+  <Ecore:EClass xmi:id="_KtJFYn3sEeyivuDeOiJBMg" base_Class="_Jt0moAI0EeSRkrs1G7P_XQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='HospitalDischargeMedicationsSectionEntriesOptionalTemplateId DischargeMedicationsSection2Code DischargeMedicationsSection2CodeP DischargeMedicationsSection2Title DischargeMedicationsSection2Text HospitalDischargeMedicationsSectionEntriesOptionalDischargeMedication DischargeMedicationsSection2CETranslation DischargeMedicationsSection2CETranslationP' templateId.root='2.16.840.1.113883.10.20.22.2.11.1' templateId.extension='2015-08-01' nullFlavor='NI' constraints.validation.info='DischargeMedicationsSection2NullFlavor' code.code='10183-2' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Hospital Discharge Medications' constraints.validation.dependOn.DischargeMedicationsSection2Code='DischargeMedicationsSection2CodeP' constraints.validation.query='DischargeMedicationsSection2CETranslation DischargeMedicationsSection2CETranslationP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDischargeMedicationsSection2CE translation.code='75311-1' translation.codeSystem='2.16.840.1.113883.6.1' translation.codeSystemName='LOINC' translation.displayName='Discharge Medications' constraints.validation.error='DischargeMedicationsSection2CETranslation DischargeMedicationsSection2CETranslationP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_z2E0QF9xEey5t-mahoHmrg" base_Class="_14bikALNEeSIPYXg7AgJzw">
+  <Ecore:EClass xmi:id="_KttGEH3sEeyivuDeOiJBMg" base_Class="_14bikALNEeSIPYXg7AgJzw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ImmunizationsSectionEntriesOptionalTemplateId ImmunizationsSectionEntriesOptionalCode ImmunizationsSectionEntriesOptionalCodeP ImmunizationsSection2Title ImmunizationsSection2Text ImmunizationsSectionEntriesOptionalImmunizationActivity' templateId.root='2.16.840.1.113883.10.20.22.2.2.1' templateId.extension='2015-08-01' nullFlavor='NI' constraints.validation.info='ImmunizationsSection2NullFlavor' constraints.validation.dependOn.ImmunizationsSectionEntriesOptionalCode='ImmunizationsSectionEntriesOptionalCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_z2o08F9xEey5t-mahoHmrg" base_Class="_P2mp4ALQEeS0YMHMf4rRtQ">
+  <Ecore:EClass xmi:id="_KuPRkH3sEeyivuDeOiJBMg" base_Class="_P2mp4ALQEeS0YMHMf4rRtQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicationsSectionEntriesOptionalTemplateId MedicationsSectionEntriesOptionalCode MedicationsSectionEntriesOptionalCodeP MedicationsSection2Title MedicationsSection2Text MedicationsSectionEntriesOptionalMedicationActivity' templateId.root='2.16.840.1.113883.10.20.22.2.1.1' templateId.extension='2014-06-09' nullFlavor='NI' constraints.validation.info='MedicationsSection2NullFlavor' constraints.validation.dependOn.MedicationsSectionEntriesOptionalCode='MedicationsSectionEntriesOptionalCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_z3ODwl9xEey5t-mahoHmrg" base_Class="_IXrA4ALVEeSyydFGYJajGA">
+  <Ecore:EClass xmi:id="_KuyrMH3sEeyivuDeOiJBMg" base_Class="_IXrA4ALVEeSyydFGYJajGA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProblemSectionEntriesOptionalTemplateId ProblemSectionEntriesOptionalCode ProblemSectionEntriesOptionalCodeP ProblemSection2Title ProblemSection2Text ProblemSectionEntriesOptionalProblemConcern' templateId.root='2.16.840.1.113883.10.20.22.2.5.1' templateId.extension='2015-08-01' nullFlavor='NI' constraints.validation.info='ProblemSection2NullFlavor ProblemSectionEntriesOptional2HealthStatusObservation2' constraints.validation.dependOn.ProblemSectionEntriesOptionalCode='ProblemSectionEntriesOptionalCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_z4To4l9xEey5t-mahoHmrg" base_Class="_N6wUUALoEeSBA9s7kRnaEg">
+  <Ecore:EClass xmi:id="_KvvGYH3sEeyivuDeOiJBMg" base_Class="_N6wUUALoEeSBA9s7kRnaEg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProceduresSectionEntriesOptionalTemplateId ProceduresSection2HasProcedureActivity ProceduresSectionEntriesOptionalCode ProceduresSectionEntriesOptionalCodeP ProceduresSection2Title ProceduresSection2Text ProceduresSectionEntriesOptionalProcedureActivityProcedure ProceduresSectionEntriesOptionalProcedureActivityObservation ProceduresSectionEntriesOptionalProcedureActivityAct ProceduresSection2Entry' templateId.root='2.16.840.1.113883.10.20.22.2.7.1' templateId.extension='2014-06-09' nullFlavor='NI' constraints.validation.info='ProceduresSection2NullFlavor ProceduresSection2EntryProcedureActivityAct2 ProceduresSection2EntryProcedureActivityObservation2 ProceduresSection2EntryProcedureActivityProcedure2' constraints.validation.dependOn.ProceduresSectionEntriesOptionalCode='ProceduresSectionEntriesOptionalCodeP' constraints.validation.query='ProceduresSection2EntryProcedureActivityAct2 ProceduresSection2EntryProcedureActivityObservation2 ProceduresSection2EntryProcedureActivityProcedure2'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProceduresSection2Entry constraints.validation.info='ProceduresSection2EntryProcedureActivityAct2 ProceduresSection2EntryProcedureActivityObservation2 ProceduresSection2EntryProcedureActivityProcedure2'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_z56LYl9xEey5t-mahoHmrg" base_Class="_bAAhEALtEeSueJWOLw5iaQ">
+  <Ecore:EClass xmi:id="_KxMe8H3sEeyivuDeOiJBMg" base_Class="_bAAhEALtEeSueJWOLw5iaQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ResultsSectionEntriesOptionalTemplateId ResultsSectionEntriesOptionalCode ResultsSectionEntriesOptionalCodeP ResultsSection2Title ResultsSection2Text ResultsSectionEntriesOptionalResultOrganizer' templateId.root='2.16.840.1.113883.10.20.22.2.3.1' templateId.extension='2015-08-01' nullFlavor='NI' constraints.validation.info='ResultsSection2NullFlavor' constraints.validation.dependOn.ResultsSectionEntriesOptionalCode='ResultsSectionEntriesOptionalCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_z6kSsF9xEey5t-mahoHmrg" base_Class="_D3010ALzEeSM0Jd2D1FgKw">
+  <Ecore:EClass xmi:id="_Kxuqcn3sEeyivuDeOiJBMg" base_Class="_D3010ALzEeSM0Jd2D1FgKw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='VitalSignsSectionEntriesOptionalTemplateId VitalSignsSectionEntriesOptionalCode VitalSignsSectionEntriesOptionalCodeP VitalSignsSection2Title VitalSignsSection2Text VitalSignsSectionEntriesOptionalVitalSignsOrganizer' templateId.root='2.16.840.1.113883.10.20.22.2.4.1' templateId.extension='2015-08-01' nullFlavor='NI' constraints.validation.info='VitalSignsSection2NullFlavor' constraints.validation.dependOn.VitalSignsSectionEntriesOptionalCode='VitalSignsSectionEntriesOptionalCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_0FGHsF9xEey5t-mahoHmrg" base_Class="_PkP3oCFmEeSt4IEYu7xgbw">
+  <Ecore:EClass xmi:id="_K650kH3sEeyivuDeOiJBMg" base_Class="_PkP3oCFmEeSt4IEYu7xgbw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='USRealmHeader2TemplateId ConsultationNote2DoesNotHaveAssementAndPlanSection2WhenAssementOrPlanOfTreatment2ArePresent ConsultationNote2DoesNotHaveChiefComplaintWithChiefComplaintOrReasonForVisitSection ConsultationNote2HasAnAssementAndPlanSectionOrIndividualAssementAndPlanSections ConsultationNote2Code ConsultationNote2CodeP ConsultationNote2InFulfillmentOf ConsultationNote2ComponentOf ConsultationNote2HistoryOfPresentIllnessSection ConsultationNote2AllergiesSection2 ConsultationNote2ProblemSection2 ConsultationNote2ParticipantAssociatedEntityAssociatedPersonName ConsultationNote2ParticipantAssociatedEntityClassCode ConsultationNote2ParticipantAssociatedEntityId ConsultationNote2ParticipantAssociatedEntityTelecom ConsultationNote2ParticipantAssociatedEntityAssociatedPerson ConsultationNote2ParticipantTypeCode ConsultationNote2ParticipantAssociatedEntity ConsultationNote2InFulfillmentOfOrderId ConsultationNote2InFulfillmentOfOrder ConsultationNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheDayIVLTS ConsultationNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasPersonOrganizationOrBoth ConsultationNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity ConsultationNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityHasPersonOrganizationOrBoth ConsultationNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntity ConsultationNote2ComponentOfEncompassingEncounterId ConsultationNote2ComponentOfEncompassingEncounterEffectiveTime ConsultationNote2ComponentOfEncompassingEncounter' templateId.root='2.16.840.1.113883.10.20.22.1.4' templateId.extension='2015-08-01' constraints.validation.info='ConsultationNote2HasAnAssementAndPlanSection2OrBothAssementSectionAndPlanOfTreatmentSection2 ConsultationNote2AssessmentSection ConsultationNote2AssessmentAndPlanSection2 ConsultationNote2PlanOfTreatmentSection2 ConsultationNote2ReasonForVisitSection ConsultationNote2ChiefComplaintSection ConsultationNote2ChiefComplaintAndReasonForVisitSection ConsultationNote2GeneralStatusSection ConsultationNote2HistoryOfPastIllnessSection2 ConsultationNote2ImmunizationsSectionEntriesOptional2 ConsultationNote2ProceduresSectionEntriesOptional2 ConsultationNote2SocialHistorySection2 ConsultationNote2VitalSignsSection2 ConsultationNote2AdvanceDirectivesSectionEntriesOptional2 ConsultationNote2FunctionalStatusSection2 ConsultationNote2ReviewOfSystemsSection ConsultationNote2MedicalEquipmentSection2 ConsultationNote2MentalStatusSection ConsultationNote2NutritionSection ConsultationNote2FamilyHistorySection2 ConsultationNote2ParticipantAssociatedEntityScopingOrganization ConsultationNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheSecondIVLTS ConsultationNote2ComponentOfEncompassingEncounterResponsibleParty ConsultationNote2ComponentOfEncompassingEncounterEncounterParticipant' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.ConsultationNote2Code='ConsultationNote2CodeP' constraints.validation.warning='ConsultationNote2Participant ConsultationNote2PhysicalExamSection2 ConsultationNote2MedicationsSection2 ConsultationNote2ResultsSection2 ConsultationNote2ParticipantAssociatedEntityAddr ConsultationNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheMinuteIVLTS ConsultationNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTIfMorePreciseThanDayIncludeTimeZoneOffsetIVLTS' constraints.validation.query='ConsultationNote2ParticipantAssociatedEntityAssociatedPersonName ConsultationNote2ParticipantAssociatedEntityClassCode ConsultationNote2ParticipantAssociatedEntityId ConsultationNote2ParticipantAssociatedEntityAddr ConsultationNote2ParticipantAssociatedEntityTelecom ConsultationNote2ParticipantAssociatedEntityAssociatedPerson ConsultationNote2ParticipantAssociatedEntityScopingOrganization ConsultationNote2ParticipantTypeCode ConsultationNote2ParticipantAssociatedEntity ConsultationNote2InFulfillmentOfOrderId ConsultationNote2InFulfillmentOfOrder ConsultationNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheDayIVLTS ConsultationNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheMinuteIVLTS ConsultationNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheSecondIVLTS ConsultationNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTIfMorePreciseThanDayIncludeTimeZoneOffsetIVLTS ConsultationNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasPersonOrganizationOrBoth ConsultationNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity ConsultationNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityHasPersonOrganizationOrBoth ConsultationNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntity ConsultationNote2ComponentOfEncompassingEncounterId ConsultationNote2ComponentOfEncompassingEncounterEffectiveTime ConsultationNote2ComponentOfEncompassingEncounterResponsibleParty ConsultationNote2ComponentOfEncompassingEncounterEncounterParticipant ConsultationNote2ComponentOfEncompassingEncounter'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolConsultationNote2Participant typeCode='CALLBCK' constraints.validation.error='ConsultationNote2ParticipantTypeCode ConsultationNote2ParticipantAssociatedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolConsultationNote2ParticipantAssociatedEntity classCode='ASSIGNED' constraints.validation.error='ConsultationNote2ParticipantAssociatedEntityClassCode ConsultationNote2ParticipantAssociatedEntityId ConsultationNote2ParticipantAssociatedEntityTelecom ConsultationNote2ParticipantAssociatedEntityAssociatedPerson' constraints.validation.warning='ConsultationNote2ParticipantAssociatedEntityAddr' constraints.validation.info='ConsultationNote2ParticipantAssociatedEntityScopingOrganization'</annotation>
@@ -47677,7 +47677,7 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolConsultationNote2ComponentOfEncompassingEncounterResponsibleParty constraints.validation.error='ConsultationNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasPersonOrganizationOrBoth ConsultationNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolConsultationNote2ComponentOfEncompassingEncounterEncounterParticipant constraints.validation.error='ConsultationNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityHasPersonOrganizationOrBoth ConsultationNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntity'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_0YGjQl9xEey5t-mahoHmrg" base_Class="_lPMNYCGjEeSt4IEYu7xgbw">
+  <Ecore:EClass xmi:id="_LLtQsH3sEeyivuDeOiJBMg" base_Class="_lPMNYCGjEeSt4IEYu7xgbw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='USRealmHeader2TemplateId ContinuityOfCareDocument2Code ContinuityOfCareDocument2CodeP ContinuityOfCareDocument2Author ContinuityOfCareDocument2DocumentationOf ContinuityOfCareDocument2AllergiesSection2 ContinuityOfCareDocument2MedicationsSection2 ContinuityOfCareDocument2ProblemSection2 ContinuityOfCareDocument2ResultsSection2 ContinuityOfCareDocument2SocialHistorySection2 ContinuityOfCareDocument2VitalSignsSection2 ContinuityOfCareDocument2AuthorAssignedAuthorHasAssignedPersonOrRepresentedOrganization ContinuityOfCareDocument2AuthorAssignedAuthorHasRepresentOrganization ContinuityOfCareDocument2AuthorAssignedAuthor ContinuityOfCareDocument2DocumentationOfServiceEventIVLTSLow ContinuityOfCareDocument2DocumentationOfServiceEventIVLTSHigh ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntityId ContinuityOfCareDocument2DocumentationOfServiceEventPerformerTypeCode ContinuityOfCareDocument2DocumentationOfServiceEventClassCode ContinuityOfCareDocument2DocumentationOfServiceEventEffectiveTime ContinuityOfCareDocument2DocumentationOfServiceEvent' templateId.root='2.16.840.1.113883.10.20.22.1.2' templateId.extension='2015-08-01' code.code='34133-9' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Summarization of Episode Note' constraints.validation.dependOn.ContinuityOfCareDocument2Code='ContinuityOfCareDocument2CodeP' constraints.validation.warning='ContinuityOfCareDocument2ProceduresSection2 ContinuityOfCareDocument2PlanOfTreatmentSection2 ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntityHasNationalProviderIdentifier ContinuityOfCareDocument2DocumentationOfServiceEventPerformer' constraints.validation.info='ContinuityOfCareDocument2AdvanceDirectivesSectionEntriesOptional2 ContinuityOfCareDocument2EncountersSectionEntriesOptional2 ContinuityOfCareDocument2FunctionalStatusSection2 ContinuityOfCareDocument2ImmunizationsSection2 ContinuityOfCareDocument2MedicalEquipmentSection2 ContinuityOfCareDocument2PayersSection2 ContinuityOfCareDocument2MentalStatusSection ContinuityOfCareDocument2NutritionSection ContinuityOfCareDocument2FamilyHistorySection2 ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntityAssignedPerson ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntity' constraints.validation.query='ContinuityOfCareDocument2AuthorAssignedAuthorHasAssignedPersonOrRepresentedOrganization ContinuityOfCareDocument2AuthorAssignedAuthorHasRepresentOrganization ContinuityOfCareDocument2AuthorAssignedAuthor ContinuityOfCareDocument2DocumentationOfServiceEventIVLTSLow ContinuityOfCareDocument2DocumentationOfServiceEventIVLTSHigh ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntityHasNationalProviderIdentifier ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntityId ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntityAssignedPerson ContinuityOfCareDocument2DocumentationOfServiceEventPerformerTypeCode ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntity ContinuityOfCareDocument2DocumentationOfServiceEventClassCode ContinuityOfCareDocument2DocumentationOfServiceEventEffectiveTime ContinuityOfCareDocument2DocumentationOfServiceEventPerformer ContinuityOfCareDocument2DocumentationOfServiceEvent'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolContinuityOfCareDocument2Author constraints.validation.error='ContinuityOfCareDocument2AuthorAssignedAuthor'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolContinuityOfCareDocument2AuthorAssignedAuthor constraints.validation.error='ContinuityOfCareDocument2AuthorAssignedAuthorHasAssignedPersonOrRepresentedOrganization ContinuityOfCareDocument2AuthorAssignedAuthorHasRepresentOrganization'</annotation>
@@ -47687,7 +47687,7 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolContinuityOfCareDocument2DocumentationOfServiceEventPerformer typeCode='PRF' constraints.validation.error='ContinuityOfCareDocument2DocumentationOfServiceEventPerformerTypeCode' constraints.validation.info='ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntity constraints.validation.warning='ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntityHasNationalProviderIdentifier' constraints.validation.error='ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntityId' constraints.validation.info='ContinuityOfCareDocument2DocumentationOfServiceEventPerformerAssignedEntityAssignedPerson'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_0jYmMV9xEey5t-mahoHmrg" base_Class="_4JRRsCJnEeSBLYc2hU6GfA">
+  <Ecore:EClass xmi:id="_LVxysn3sEeyivuDeOiJBMg" base_Class="_4JRRsCJnEeSBLYc2hU6GfA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='USRealmHeader2TemplateId DiagnosticImagingReport2Id DiagnosticImagingReport2CodeP DiagnosticImagingReport2DocumentationOf DiagnosticImagingReport2FindingsSection DiagnosticImagingReport2Component2 DiagnosticImagingReport2Informant DiagnosticImagingReport2IIRootOIDsMustBeNoMoreThan64Characters DiagnosticImagingReport2IIRoot DiagnosticImagingReport2ParticipantAssociatedEntityPersonName DiagnosticImagingReport2ParticipantAssociatedEntityAssociatedPerson DiagnosticImagingReport2ParticipantAssociatedEntity DiagnosticImagingReport2InFulfillmentOfOrderId DiagnosticImagingReport2InFulfillmentOfOrder DiagnosticImagingReport2DocumentationOfServiceEventClassCode DiagnosticImagingReport2DocumentationOfServiceEventCode DiagnosticImagingReport2DocumentationOfServiceEvent DiagnosticImagingReport2RelatedDocumentParentDocumentIIOidsLength DiagnosticImagingReport2RelatedDocumentParentDocumentId DiagnosticImagingReport2RelatedDocumentParentDocument DiagnosticImagingReport2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheDayIVLTS DiagnosticImagingReport2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity DiagnosticImagingReport2ComponentOfEncompassingEncounterId DiagnosticImagingReport2ComponentOfEncompassingEncounterEffectiveTime DiagnosticImagingReport2ComponentOfEncompassingEncounter DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSubjectFetusSubjectContext DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSectionsHaveText DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionCodeP DiagnosticImagingReport2ComponentStructuredBodyComponent3Section DiagnosticImagingReport2ComponentStructuredBody' templateId.root='2.16.840.1.113883.10.20.22.1.5' templateId.extension='2015-08-01' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.warning='DiagnosticImagingReport2Code DiagnosticImagingReport2DICOMObjectCatalogSection DiagnosticImagingReport2DocumentationOfServiceEventId DiagnosticImagingReport2DocumentationOfServiceEventPhysicianReadingStudyPerformer2 DiagnosticImagingReport2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheMinuteIVLTS DiagnosticImagingReport2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTIfMorePreciseThanDayIncludeTimeZoneOffsetIVLTS DiagnosticImagingReport2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasAssignPersonOrRepresentedOrganization DiagnosticImagingReport2ComponentOfEncompassingEncounterPhysicianofRecordParticipant2 DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionCode DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionTitle DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionText' constraints.validation.dependOn.DiagnosticImagingReport2Code='DiagnosticImagingReport2CodeP' constraints.validation.info='DiagnosticImagingReport2InformationRecipient DiagnosticImagingReport2Participant DiagnosticImagingReport2InFulfillmentOf DiagnosticImagingReport2RelatedDocument DiagnosticImagingReport2ComponentOf DiagnosticImagingReport2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheSecondIVLTS DiagnosticImagingReport2ComponentOfEncompassingEncounterResponsibleParty DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSubject DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionAuthor DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionProcedureContext DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionTextObservation DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionCodeObservations DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionQuantityMeasurementObservation DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSOPInstanceObservation DiagnosticImagingReport2ComponentStructuredBodyComponent3' constraints.validation.query='DiagnosticImagingReport2IIRootOIDsMustBeNoMoreThan64Characters DiagnosticImagingReport2IIRoot DiagnosticImagingReport2ParticipantAssociatedEntityPersonName DiagnosticImagingReport2ParticipantAssociatedEntityAssociatedPerson DiagnosticImagingReport2ParticipantAssociatedEntity DiagnosticImagingReport2InFulfillmentOfOrderId DiagnosticImagingReport2InFulfillmentOfOrder DiagnosticImagingReport2DocumentationOfServiceEventClassCode DiagnosticImagingReport2DocumentationOfServiceEventId DiagnosticImagingReport2DocumentationOfServiceEventCode DiagnosticImagingReport2DocumentationOfServiceEventPhysicianReadingStudyPerformer2 DiagnosticImagingReport2DocumentationOfServiceEvent DiagnosticImagingReport2RelatedDocumentParentDocumentIIOidsLength DiagnosticImagingReport2RelatedDocumentParentDocumentId DiagnosticImagingReport2RelatedDocumentParentDocument DiagnosticImagingReport2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheDayIVLTS DiagnosticImagingReport2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheMinuteIVLTS DiagnosticImagingReport2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheSecondIVLTS DiagnosticImagingReport2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTIfMorePreciseThanDayIncludeTimeZoneOffsetIVLTS DiagnosticImagingReport2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasAssignPersonOrRepresentedOrganization DiagnosticImagingReport2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity DiagnosticImagingReport2ComponentOfEncompassingEncounterId DiagnosticImagingReport2ComponentOfEncompassingEncounterEffectiveTime DiagnosticImagingReport2ComponentOfEncompassingEncounterResponsibleParty DiagnosticImagingReport2ComponentOfEncompassingEncounterPhysicianofRecordParticipant2 DiagnosticImagingReport2ComponentOfEncompassingEncounter DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSubjectFetusSubjectContext DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSectionsHaveText DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionCode DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionCodeP DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionTitle DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionText DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSubject DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionAuthor DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionProcedureContext DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionTextObservation DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionCodeObservations DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionQuantityMeasurementObservation DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSOPInstanceObservation DiagnosticImagingReport2ComponentStructuredBodyComponent3Section DiagnosticImagingReport2ComponentStructuredBodyComponent3 DiagnosticImagingReport2ComponentStructuredBody'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDiagnosticImagingReport2II constraints.validation.error='DiagnosticImagingReport2IIRootOIDsMustBeNoMoreThan64Characters DiagnosticImagingReport2IIRoot'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDiagnosticImagingReport2Participant constraints.validation.error='DiagnosticImagingReport2ParticipantAssociatedEntity'</annotation>
@@ -47710,7 +47710,7 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDiagnosticImagingReport2ComponentStructuredBodyComponent3Section constraints.validation.error='DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSectionsHaveText DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionCodeP' code.codeSystem='1.2.840.10008.2.16.4' code.codeSystemName='DCM' constraints.validation.warning='DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionCode DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionTitle DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionText' constraints.validation.info='DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSubject DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionAuthor DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionProcedureContext DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionTextObservation DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionCodeObservations DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionQuantityMeasurementObservation DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSOPInstanceObservation'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSubject constraints.validation.error='DiagnosticImagingReport2ComponentStructuredBodyComponent3SectionSubjectFetusSubjectContext'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_00Hw4l9xEey5t-mahoHmrg" base_Class="_89EzQCP5EeS4d9o7u1_H3A">
+  <Ecore:EClass xmi:id="_LkXoUH3sEeyivuDeOiJBMg" base_Class="_89EzQCP5EeS4d9o7u1_H3A">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='USRealmHeader2TemplateId DischargeSummary2DoesNotHaveChiefComplaintAndReasonForVisitWithChiefComplaintSectionOrReasonSection DischargeSummary2Code DischargeSummary2CodeP DischargeSummary2ComponentOf DischargeSummary2AllergiesSectionEntriesOptional2 DischargeSummary2HospitalCourseSection DischargeSummary2PlanOfTreatmentSection2 DischargeSummary2DischargeDiagnosisSection2 DischargeSummary2ParticipantIfParTypeCodeINDThenAEClassCodeIND DischargeSummary2ComponentOfEncompassingEncounterIVLTSLow DischargeSummary2ComponentOfEncompassingEncounterIVLTSHigh DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityHasPersonOrOrganization DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntity DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasPersonOrOrganization DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity DischargeSummary2ComponentOfEncompassingEncounterEffectiveTime DischargeSummary2ComponentOfEncompassingEncounterDischargeDispositionCodeP DischargeSummary2ComponentOfEncompassingEncounter' templateId.root='2.16.840.1.113883.10.20.22.1.8' templateId.extension='2015-08-01' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.DischargeSummary2Code='DischargeSummary2CodeP' constraints.validation.info='DischargeSummary2Participant DischargeSummary2ChiefComplaintSection DischargeSummary2ChiefComplaintAndReasonForVisitSection DischargeSummary2NutritionSection DischargeSummary2FunctionalStatusSection2 DischargeSummary2HistoryOfPastIllnessSection2 DischargeSummary2HistoryOfPresentIllnessSection DischargeSummary2HospitalConsultationsSection DischargeSummary2HospitalDischargeInstructionsSection DischargeSummary2HospitalDischargePhysicalSection DischargeSummary2HospitalDischargeStudiesSummarySection DischargeSummary2ImmunizationsSectionEntriesOptional2 DischargeSummary2ProblemSectionEntriesOptional2 DischargeSummary2ProceduresSectionEntriesOptional2 DischargeSummary2ReasonForVisitSection DischargeSummary2ReviewOfSystemsSection DischargeSummary2SocialHistorySection2 DischargeSummary2VitalSignsSectionEntriesOptional2 DischargeSummary2FamilyHistorySection2 DischargeSummary2AdmissionDiagnosisSection2 DischargeSummary2AdmissionMedicationsSectionEntriesOptional2 DischargeSummary2DischargeMedicationsSection2 DischargeSummary2DischargeDietSection DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipant DischargeSummary2ComponentOfEncompassingEncounterResponsibleParty' constraints.validation.warning='DischargeSummary2DischargeMedicationsSectionEntriesOptional2 DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityAssignedPerson DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityRepresentedOrganization DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityAssignedPerson DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityRepresentedOrganization DischargeSummary2ComponentOfEncompassingEncounterDischargeDispositionCode' constraints.validation.query='DischargeSummary2ParticipantIfParTypeCodeINDThenAEClassCodeIND DischargeSummary2ComponentOfEncompassingEncounterIVLTSLow DischargeSummary2ComponentOfEncompassingEncounterIVLTSHigh DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityAssignedPerson DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityRepresentedOrganization DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityHasPersonOrOrganization DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntity DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityAssignedPerson DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityRepresentedOrganization DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasPersonOrOrganization DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity DischargeSummary2ComponentOfEncompassingEncounterEffectiveTime DischargeSummary2ComponentOfEncompassingEncounterDischargeDispositionCode DischargeSummary2ComponentOfEncompassingEncounterDischargeDispositionCodeP DischargeSummary2ComponentOfEncompassingEncounterEncounterParticipant DischargeSummary2ComponentOfEncompassingEncounterResponsibleParty DischargeSummary2ComponentOfEncompassingEncounter'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDischargeSummary2Participant constraints.validation.error='DischargeSummary2ParticipantIfParTypeCodeINDThenAEClassCodeIND'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDischargeSummary2ComponentOf constraints.validation.error='DischargeSummary2ComponentOfEncompassingEncounter'</annotation>
@@ -47721,7 +47721,7 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDischargeSummary2ComponentOfEncompassingEncounterResponsibleParty constraints.validation.error='DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasPersonOrOrganization DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity constraints.validation.warning='DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityAssignedPerson DischargeSummary2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityRepresentedOrganization'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_1EQeol9xEey5t-mahoHmrg" base_Class="_4mLhsCluEeSoCqqrpX8LzQ">
+  <Ecore:EClass xmi:id="_Ly5MgH3sEeyivuDeOiJBMg" base_Class="_4mLhsCluEeSoCqqrpX8LzQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='USRealmHeader2TemplateId HistoryAndPhysicalNote2HasChiefComplaintAndReasonForVisitChiefComplaintOrReasonForVisit HistoryAndPhysicalNote2HasAnAssementAndPlanSection2OrBothAssementSectionAndPlanOfTreatmentSection2 HistoryAndPhysicalNote2DoesNotHaveAssementAndPlanSection2WhenAssementAndPlanOfTreatment2ArePresent HistoryAndPhysicalNote2DoesNotHaveChiefComplaintAndReasonForVisitWithChiefComplaintSectionOrReasonSection HistoryAndPhysicalNote2Code HistoryAndPhysicalNote2CodeP HistoryAndPhysicalNote2ComponentOf HistoryAndPhysicalNote2AllergiesSectionEntriesOptional2 HistoryAndPhysicalNote2GeneralStatusSection HistoryAndPhysicalNote2HistoryOfPastIllnessSection2 HistoryAndPhysicalNote2MedicationsSectionEntriesOptional2 HistoryAndPhysicalNote2PhysicalExamSection2 HistoryAndPhysicalNote2ResultsSectionEntriesOptional2 HistoryAndPhysicalNote2ReviewOfSystemsSection HistoryAndPhysicalNote2SocialHistorySection2 HistoryAndPhysicalNote2VitalSignsSectionEntriesOptional2 HistoryAndPhysicalNote2FamilyHistorySection2 HistoryAndPhysicalNote2InformationRecipientIntendedRecipient HistoryAndPhysicalNote2ParticipantIfParTypeCodeINDThenAEClassCodeIND HistoryAndPhysicalNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheDayIVLTS HistoryAndPhysicalNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasPersonOrOrganization HistoryAndPhysicalNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity HistoryAndPhysicalNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityHasPersonOrOrganization HistoryAndPhysicalNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntity HistoryAndPhysicalNote2ComponentOfEncompassingEncounterId HistoryAndPhysicalNote2ComponentOfEncompassingEncounterEffectiveTime HistoryAndPhysicalNote2ComponentOfEncompassingEncounter' templateId.root='2.16.840.1.113883.10.20.22.1.3' templateId.extension='2015-08-01' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.HistoryAndPhysicalNote2Code='HistoryAndPhysicalNote2CodeP' constraints.validation.info='HistoryAndPhysicalNote2InformationRecipient HistoryAndPhysicalNote2Participant HistoryAndPhysicalNote2InFulfillmentOf HistoryAndPhysicalNote2AssessmentSection HistoryAndPhysicalNote2PlanOfTreatmentSection2 HistoryAndPhysicalNote2AssessmentAndPlanSection2 HistoryAndPhysicalNote2ChiefComplaintSection HistoryAndPhysicalNote2ChiefComplaintAndReasonForVisitSection HistoryAndPhysicalNote2ImmunizationsSectionEntriesOptional2 HistoryAndPhysicalNote2InstructionsSection2 HistoryAndPhysicalNote2ProblemSectionEntriesOptional2 HistoryAndPhysicalNote2ProceduresSectionEntriesOptional2 HistoryAndPhysicalNote2ReasonForVisitSection HistoryAndPhysicalNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheSecondIVLTS HistoryAndPhysicalNote2ComponentOfEncompassingEncounterResponsibleParty HistoryAndPhysicalNote2ComponentOfEncompassingEncounterEncounterParticipant HistoryAndPhysicalNote2ComponentOfEncompassingEncounterLocation' constraints.validation.warning='HistoryAndPhysicalNote2HistoryOfPresentIllnessSection HistoryAndPhysicalNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheMinuteIVLTS HistoryAndPhysicalNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTIfMorePreciseThanDayIncludeTimeZoneOffsetIVLTS' constraints.validation.query='HistoryAndPhysicalNote2InformationRecipientIntendedRecipient HistoryAndPhysicalNote2ParticipantIfParTypeCodeINDThenAEClassCodeIND HistoryAndPhysicalNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheDayIVLTS HistoryAndPhysicalNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheMinuteIVLTS HistoryAndPhysicalNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTPreciseToTheSecondIVLTS HistoryAndPhysicalNote2ComponentOfEncompassingEncounterGeneralHeaderConstraintsUSRealmDateAndTimeDTIfMorePreciseThanDayIncludeTimeZoneOffsetIVLTS HistoryAndPhysicalNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasPersonOrOrganization HistoryAndPhysicalNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity HistoryAndPhysicalNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityHasPersonOrOrganization HistoryAndPhysicalNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntity HistoryAndPhysicalNote2ComponentOfEncompassingEncounterId HistoryAndPhysicalNote2ComponentOfEncompassingEncounterEffectiveTime HistoryAndPhysicalNote2ComponentOfEncompassingEncounterResponsibleParty HistoryAndPhysicalNote2ComponentOfEncompassingEncounterEncounterParticipant HistoryAndPhysicalNote2ComponentOfEncompassingEncounterLocation HistoryAndPhysicalNote2ComponentOfEncompassingEncounter'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolHistoryAndPhysicalNote2InformationRecipient constraints.validation.error='HistoryAndPhysicalNote2InformationRecipientIntendedRecipient'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolHistoryAndPhysicalNote2Participant constraints.validation.error='HistoryAndPhysicalNote2ParticipantIfParTypeCodeINDThenAEClassCodeIND'</annotation>
@@ -47730,7 +47730,7 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolHistoryAndPhysicalNote2ComponentOfEncompassingEncounterResponsibleParty constraints.validation.error='HistoryAndPhysicalNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntityHasPersonOrOrganization HistoryAndPhysicalNote2ComponentOfEncompassingEncounterResponsiblePartyAssignedEntity'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolHistoryAndPhysicalNote2ComponentOfEncompassingEncounterEncounterParticipant constraints.validation.error='HistoryAndPhysicalNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntityHasPersonOrOrganization HistoryAndPhysicalNote2ComponentOfEncompassingEncounterEncounterParticipantAssignedEntity'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_1Uw_0V9xEey5t-mahoHmrg" base_Class="_aH1CYC1fEeSoCqqrpX8LzQ">
+  <Ecore:EClass xmi:id="_MBqoUX3sEeyivuDeOiJBMg" base_Class="_aH1CYC1fEeSoCqqrpX8LzQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='USRealmHeader2TemplateId OperativeNote2Code OperativeNote2CodeP OperativeNote2DocumentationOf OperativeNote2AnesthesiaSection2 OperativeNote2ComplicationsSection2 OperativeNote2PreoperativeDiagnosisSection2 OperativeNote2ProcedureEstimatedBloodLossSection OperativeNote2ProcedureFindingsSection2 OperativeNote2ProcedureSpecimensTakenSection OperativeNote2ProcedureDescriptionSection OperativeNote2PostoperativeDiagnosisSection OperativeNote2DocumentationOfServiceEventUSRealmDateAndTimeDTLow OperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCode OperativeNote2DocumentationOfServiceEventPerformerTypeCode OperativeNote2DocumentationOfServiceEventPerformerAssignedEntity OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCode OperativeNote2DocumentationOfServiceEventPerformerAssistantsTypeCode OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntity OperativeNote2DocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth OperativeNote2DocumentationOfServiceEventEffectiveTimeNoHighIfWidth OperativeNote2DocumentationOfServiceEventProcedureCodes OperativeNote2DocumentationOfServiceEventEffectiveTime OperativeNote2DocumentationOfServiceEventCode OperativeNote2DocumentationOfServiceEventPerformer OperativeNote2DocumentationOfServiceEvent OperativeNote2AuthorizationConsentClassCode OperativeNote2AuthorizationConsentMoodCode OperativeNote2AuthorizationConsentStatusCode OperativeNote2AuthorizationTypeCode OperativeNote2AuthorizationConsent' templateId.root='2.16.840.1.113883.10.20.22.1.7' templateId.extension='2015-08-01' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.OperativeNote2Code='OperativeNote2CodeP' constraints.validation.info='OperativeNote2Authorization OperativeNote2ProcedureImplantsSection OperativeNote2OperativeNoteFluidSection OperativeNote2OperativeNoteSurgicalProcedureSection OperativeNote2PlanOfTreatmentSection2 OperativeNote2PlannedProcedureSection2 OperativeNote2ProcedureDispositionSection OperativeNote2ProcedureIndicationsSection2 OperativeNote2SurgicalDrainsSection OperativeNote2DocumentationOfServiceEventPerformerAssistants' constraints.validation.query='OperativeNote2DocumentationOfServiceEventUSRealmDateAndTimeDTLow OperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCodeP OperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCode OperativeNote2DocumentationOfServiceEventPerformerTypeCode OperativeNote2DocumentationOfServiceEventPerformerAssignedEntity OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCodeP OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCode OperativeNote2DocumentationOfServiceEventPerformerAssistantsTypeCode OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntity OperativeNote2DocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth OperativeNote2DocumentationOfServiceEventEffectiveTimeNoHighIfWidth OperativeNote2DocumentationOfServiceEventProcedureCodes OperativeNote2DocumentationOfServiceEventEffectiveTime OperativeNote2DocumentationOfServiceEventCode OperativeNote2DocumentationOfServiceEventPerformer OperativeNote2DocumentationOfServiceEventPerformerAssistants OperativeNote2DocumentationOfServiceEvent OperativeNote2AuthorizationConsentClassCode OperativeNote2AuthorizationConsentMoodCode OperativeNote2AuthorizationConsentStatusCode OperativeNote2AuthorizationTypeCode OperativeNote2AuthorizationConsent' constraints.validation.warning='OperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCodeP OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCodeP' constraints.validation.dependOn.OperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCode='OperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCodeP' constraints.validation.dependOn.OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCode='OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolOperativeNote2DocumentationOf constraints.validation.error='OperativeNote2DocumentationOfServiceEvent'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolOperativeNote2DocumentationOfServiceEvent constraints.validation.error='OperativeNote2DocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth OperativeNote2DocumentationOfServiceEventEffectiveTimeNoHighIfWidth OperativeNote2DocumentationOfServiceEventProcedureCodes OperativeNote2DocumentationOfServiceEventEffectiveTime OperativeNote2DocumentationOfServiceEventCode OperativeNote2DocumentationOfServiceEventPerformer ServiceEventOperativeNote2DocumentationOfServiceEventUSRealmDateAndTimeDTLow OperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCode OperativeNote2DocumentationOfServiceEventPerformerTypeCode ServiceEventOperativeNote2DocumentationOfServiceEventPerformerAssignedEntity OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCode OperativeNote2DocumentationOfServiceEventPerformerAssistantsTypeCode ServiceEventOperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntity' constraints.validation.info='OperativeNote2DocumentationOfServiceEventPerformerAssistants' constraints.validation.query='ServiceEventOperativeNote2DocumentationOfServiceEventUSRealmDateAndTimeDTLow OperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCodeP OperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCode OperativeNote2DocumentationOfServiceEventPerformerTypeCode ServiceEventOperativeNote2DocumentationOfServiceEventPerformerAssignedEntity OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCodeP OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCode OperativeNote2DocumentationOfServiceEventPerformerAssistantsTypeCode ServiceEventOperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntity' constraints.validation.warning='OperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCodeP OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCodeP' constraints.validation.dependOn.OperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCode='OperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCodeP' constraints.validation.dependOn.OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCode='OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCodeP'</annotation>
@@ -47742,7 +47742,7 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolOperativeNote2Authorization typeCode='AUTH' constraints.validation.error='OperativeNote2AuthorizationTypeCode OperativeNote2AuthorizationConsent'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolOperativeNote2AuthorizationConsent classCode='CONS' constraints.validation.error='OperativeNote2AuthorizationConsentClassCode OperativeNote2AuthorizationConsentMoodCode OperativeNote2AuthorizationConsentStatusCode' moodCode='EVN'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_1i5icF9xEey5t-mahoHmrg" base_Class="_JD8b0C4pEeSoCqqrpX8LzQ">
+  <Ecore:EClass xmi:id="_MOMBYH3sEeyivuDeOiJBMg" base_Class="_JD8b0C4pEeSoCqqrpX8LzQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='USRealmHeader2TemplateId ProcedureNote2HasAnAssementAndPlanSection2OrBothAssementSectionAndPlanOfTreatmentSection2 ProcedureNote2DoesNotHaveAssementAndPlanSection2WhenAssementOrPlanOfTreatment2ArePresent ProcedureNote2DoesNotHaveChiefComplaintWithChiefComplaintOrReasonForVisitSection ProcedureNote2Code ProcedureNote2CodeP ProcedureNote2DocumentationOf ProcedureNote2ComplicationsSection2 ProcedureNote2ProcedureDescriptionSection ProcedureNote2ProcedureIndicationsSection2 ProcedureNote2PostprocedureDiagnosisSection2 ProcedureNote2ParticipantAssociatedEntityClassCode ProcedureNote2ParticipantAssociatedEntityAssociatedPerson ProcedureNote2ParticipantTypeCode ProcedureNote2ParticipantFunctionCode ProcedureNote2ParticipantFunctionCodeP ProcedureNote2ParticipantAssociatedEntity ProcedureNote2DocumentationOfServiceEventUSRealmDateAndTimeDTLow ProcedureNote2DocumentationOfServiceEventPerformerAssignedEntityCode ProcedureNote2DocumentationOfServiceEventPerformerTypeCode ProcedureNote2DocumentationOfServiceEventPerformerAssignedEntity ProcedureNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCode ProcedureNote2DocumentationOfServiceEventPerformerAssistantsTypeCode ProcedureNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntity ProcedureNote2DocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth ProcedureNote2DocumentationOfServiceEventEffectiveTimeNoHighIfWidth ProcedureNote2DocumentationOfServiceEventProcedureCodes ProcedureNote2DocumentationOfServiceEventEffectiveTime ProcedureNote2DocumentationOfServiceEventCode ProcedureNote2DocumentationOfServiceEventPerformer ProcedureNote2DocumentationOfServiceEvent ProcedureNote2AuthorizationConsentClassCode ProcedureNote2AuthorizationConsentMoodCode ProcedureNote2AuthorizationConsentStatusCode ProcedureNote2AuthorizationTypeCode ProcedureNote2AuthorizationConsent ProcedureNote2ComponentOfEncompassingEncounterEncounterParticipantTypeCode ProcedureNote2ComponentOfEncompassingEncounterLocationHealthCareFacilityId ProcedureNote2ComponentOfEncompassingEncounterLocationHealthCareFacility ProcedureNote2ComponentOfEncompassingEncounterCode ProcedureNote2ComponentOfEncompassingEncounterLocation ProcedureNote2ComponentOfEncompassingEncounter' templateId.root='2.16.840.1.113883.10.20.22.1.6' templateId.extension='2015-08-01' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.ProcedureNote2Code='ProcedureNote2CodeP' constraints.validation.info='ProcedureNote2Participant ProcedureNote2Authorization ProcedureNote2AssessmentSection ProcedureNote2AssessmentAndPlanSection2 ProcedureNote2PlanOfTreatmentSection2 ProcedureNote2AllergiesSectionEntriesOptional2 ProcedureNote2AnesthesiaSection2 ProcedureNote2ChiefComplaintSection ProcedureNote2ChiefComplaintAndReasonForVisitSection ProcedureNote2FamilyHistorySection2 ProcedureNote2HistoryOfPastIllnessSection2 ProcedureNote2HistoryOfPresentIllnessSection ProcedureNote2MedicalHistorySection ProcedureNote2MedicationsSectionEntriesOptional2 ProcedureNote2MedicationsAdministeredSection2 ProcedureNote2PhysicalExamSection2 ProcedureNote2PlannedProcedureSection2 ProcedureNote2ProcedureDispositionSection ProcedureNote2ProcedureEstimatedBloodLossSection ProcedureNote2ProcedureFindingsSection2 ProcedureNote2ProcedureImplantsSection ProcedureNote2ProcedureSpecimensTakenSection ProcedureNote2ProceduresSectionEntriesOptional2 ProcedureNote2ReasonForVisitSection ProcedureNote2ReviewOfSystemsSection ProcedureNote2SocialHistorySection2 ProcedureNote2DocumentationOfServiceEventPerformerAssistants ProcedureNote2ComponentOfEncompassingEncounterEncounterParticipant' constraints.validation.warning='ProcedureNote2ComponentOf ProcedureNote2DocumentationOfServiceEventPerformerAssignedEntityCodeP ProcedureNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCodeP ProcedureNote2ComponentOfEncompassingEncounterId' constraints.validation.query='ProcedureNote2ParticipantAssociatedEntityClassCode ProcedureNote2ParticipantAssociatedEntityAssociatedPerson ProcedureNote2ParticipantTypeCode ProcedureNote2ParticipantFunctionCode ProcedureNote2ParticipantFunctionCodeP ProcedureNote2ParticipantAssociatedEntity ProcedureNote2DocumentationOfServiceEventUSRealmDateAndTimeDTLow ProcedureNote2DocumentationOfServiceEventPerformerAssignedEntityCodeP ProcedureNote2DocumentationOfServiceEventPerformerAssignedEntityCode ProcedureNote2DocumentationOfServiceEventPerformerTypeCode ProcedureNote2DocumentationOfServiceEventPerformerAssignedEntity ProcedureNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCodeP ProcedureNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCode ProcedureNote2DocumentationOfServiceEventPerformerAssistantsTypeCode ProcedureNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntity ProcedureNote2DocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth ProcedureNote2DocumentationOfServiceEventEffectiveTimeNoHighIfWidth ProcedureNote2DocumentationOfServiceEventProcedureCodes ProcedureNote2DocumentationOfServiceEventEffectiveTime ProcedureNote2DocumentationOfServiceEventCode ProcedureNote2DocumentationOfServiceEventPerformer ProcedureNote2DocumentationOfServiceEventPerformerAssistants ProcedureNote2DocumentationOfServiceEvent ProcedureNote2AuthorizationConsentClassCode ProcedureNote2AuthorizationConsentMoodCode ProcedureNote2AuthorizationConsentStatusCode ProcedureNote2AuthorizationTypeCode ProcedureNote2AuthorizationConsent ProcedureNote2ComponentOfEncompassingEncounterEncounterParticipantTypeCode ProcedureNote2ComponentOfEncompassingEncounterLocationHealthCareFacilityId ProcedureNote2ComponentOfEncompassingEncounterLocationHealthCareFacility ProcedureNote2ComponentOfEncompassingEncounterId ProcedureNote2ComponentOfEncompassingEncounterCode ProcedureNote2ComponentOfEncompassingEncounterEncounterParticipant ProcedureNote2ComponentOfEncompassingEncounterLocation ProcedureNote2ComponentOfEncompassingEncounter' constraints.validation.dependOn.ProcedureNote2DocumentationOfServiceEventPerformerAssignedEntityCode='ProcedureNote2DocumentationOfServiceEventPerformerAssignedEntityCodeP' constraints.validation.dependOn.ProcedureNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCode='ProcedureNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCodeP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureNote2Participant typeCode='IND' constraints.validation.error='ProcedureNote2ParticipantTypeCode ProcedureNote2ParticipantFunctionCode ProcedureNote2ParticipantFunctionCodeP ProcedureNote2ParticipantAssociatedEntity' functionCode.code='PCP' functionCode.codeSystem='2.16.840.1.113883.5.88' functionCode.codeSystemName='ParticipationFunction' functionCode.displayName='Primary Care Physician'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureNote2ParticipantAssociatedEntity classCode='PROV' constraints.validation.error='ProcedureNote2ParticipantAssociatedEntityClassCode ProcedureNote2ParticipantAssociatedEntityAssociatedPerson'</annotation>
@@ -47761,7 +47761,7 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureNote2ComponentOfEncompassingEncounterLocation constraints.validation.error='ProcedureNote2ComponentOfEncompassingEncounterLocationHealthCareFacility'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProcedureNote2ComponentOfEncompassingEncounterLocationHealthCareFacility constraints.validation.error='ProcedureNote2ComponentOfEncompassingEncounterLocationHealthCareFacilityId'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_16s-cV9xEey5t-mahoHmrg" base_Class="_qVEVkC-aEeSoCqqrpX8LzQ">
+  <Ecore:EClass xmi:id="_MjlCkH3sEeyivuDeOiJBMg" base_Class="_qVEVkC-aEeSoCqqrpX8LzQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='USRealmHeader2TemplateId ProgressNote2HasAnAssementAndPlanSection2OrBothAssementSectionAndPlanOfTreatmentSection2 ProgressNote2DoesNotHaveAssementAndPlanSection2WhenAssementOrPlanOfTreatment2ArePresent ProgressNote2Code ProgressNote2CodeP ProgressNote2ComponentOf ProgressNote2DocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth ProgressNote2DocumentationOfServiceEventTemplateId ProgressNote2DocumentationOfServiceEventClassCode ProgressNote2DocumentationOfServiceEvent ProgressNote2ComponentOfEncompassingEncounterUSRealmDateAndTimeDTLow ProgressNote2ComponentOfEncompassingEncounterLocationHealthCareFacilityId ProgressNote2ComponentOfEncompassingEncounterLocationHealthCareFacility ProgressNote2ComponentOfEncompassingEncounterId ProgressNote2ComponentOfEncompassingEncounterEffectiveTime ProgressNote2ComponentOfEncompassingEncounterLocation ProgressNote2ComponentOfEncompassingEncounter' templateId.root='2.16.840.1.113883.10.20.22.1.9' templateId.extension='2015-08-01' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' constraints.validation.dependOn.ProgressNote2Code='ProgressNote2CodeP' constraints.validation.warning='ProgressNote2DocumentationOf ProgressNote2DocumentationOfServiceEventUSRealmDateAndTimeDTLow ProgressNote2DocumentationOfServiceEventEffectiveTime' constraints.validation.info='ProgressNote2AssessmentSection ProgressNote2PlanOfTreatmentSection2 ProgressNote2AssessmentAndPlanSection2 ProgressNote2AllergiesSectionEntriesOptional2 ProgressNote2ChiefComplaintSection ProgressNote2InterventionsSection2 ProgressNote2InstructionsSection2 ProgressNote2MedicationsSectionEntriesOptional2 ProgressNote2ObjectiveSection ProgressNote2PhysicalExamSection2 ProgressNote2ProblemSectionEntriesOptional2 ProgressNote2ResultsSectionEntriesOptional2 ProgressNote2ReviewOfSystemsSection ProgressNote2SubjectiveSection ProgressNote2VitalSignsSectionEntriesOptional2 ProgressNote2NutritionSection' constraints.validation.query='ProgressNote2DocumentationOfServiceEventUSRealmDateAndTimeDTLow ProgressNote2DocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth ProgressNote2DocumentationOfServiceEventTemplateId ProgressNote2DocumentationOfServiceEventClassCode ProgressNote2DocumentationOfServiceEventEffectiveTime ProgressNote2DocumentationOfServiceEvent ProgressNote2ComponentOfEncompassingEncounterUSRealmDateAndTimeDTLow ProgressNote2ComponentOfEncompassingEncounterLocationHealthCareFacilityId ProgressNote2ComponentOfEncompassingEncounterLocationHealthCareFacility ProgressNote2ComponentOfEncompassingEncounterId ProgressNote2ComponentOfEncompassingEncounterEffectiveTime ProgressNote2ComponentOfEncompassingEncounterLocation ProgressNote2ComponentOfEncompassingEncounter'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProgressNote2DocumentationOf constraints.validation.error='ProgressNote2DocumentationOfServiceEvent'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProgressNote2DocumentationOfServiceEvent constraints.validation.error='ProgressNote2DocumentationOfServiceEventTemplateId ProgressNote2DocumentationOfServiceEventEffectiveTimeHasHighWhenNoWidth ProgressNote2DocumentationOfServiceEventClassCode' templateId.root='2.16.840.1.113883.10.20.21.3.1' classCode='PCPR' constraints.validation.warning='ProgressNote2DocumentationOfServiceEventEffectiveTime ServiceEventProgressNote2DocumentationOfServiceEventUSRealmDateAndTimeDTLow' constraints.validation.query='ServiceEventProgressNote2DocumentationOfServiceEventUSRealmDateAndTimeDTLow'</annotation>
@@ -47772,7 +47772,7 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProgressNote2ComponentOfEncompassingEncounterLocationHealthCareFacility constraints.validation.error='ProgressNote2ComponentOfEncompassingEncounterLocationHealthCareFacilityId'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProgressNote2ComponentOfEncompassingEncounterUSRealmDateAndTimeDT constraints.validation.error='ProgressNote2ComponentOfEncompassingEncounterUSRealmDateAndTimeDTLow'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_2GYC8V9xEey5t-mahoHmrg" base_Class="_MrNuQC-6EeSoCqqrpX8LzQ">
+  <Ecore:EClass xmi:id="_Mt6DQn3sEeyivuDeOiJBMg" base_Class="_MrNuQC-6EeSoCqqrpX8LzQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='USRealmHeader2TemplateId UnstructuredDocument2RecordTarget UnstructuredDocument2Custodian UnstructuredDocument2Component UnstructuredDocument2RecordTargetPatientRoleId UnstructuredDocument2RecordTargetPatientRole UnstructuredDocument2CustodianAssignedCustodianRepresentedCustodianOrganization UnstructuredDocument2CustodianAssignedCustodian UnstructuredDocument2ComponentNonXMLBodyHasReferenceOrRepresentation UnstructuredDocument2ComponentNonXMLBodyMediaTypeFileFormats UnstructuredDocument2ComponentNonXMLBodyText UnstructuredDocument2ComponentNonXMLBody' templateId.root='2.16.840.1.113883.10.20.22.1.10' templateId.extension='2015-08-01' constraints.validation.query='UnstructuredDocument2RecordTargetPatientRoleId UnstructuredDocument2RecordTargetPatientRole UnstructuredDocument2CustodianAssignedCustodianRepresentedCustodianOrganization UnstructuredDocument2CustodianAssignedCustodian UnstructuredDocument2ComponentNonXMLBodyEDMediaType UnstructuredDocument2ComponentNonXMLBodyHasReferenceOrRepresentation UnstructuredDocument2ComponentNonXMLBodyMediaTypeFileFormats UnstructuredDocument2ComponentNonXMLBodyText UnstructuredDocument2ComponentNonXMLBody' constraints.validation.info='UnstructuredDocument2ComponentNonXMLBodyEDMediaType'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolUnstructuredDocument2RecordTarget constraints.validation.error='UnstructuredDocument2RecordTargetPatientRole'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolUnstructuredDocument2RecordTargetPatientRole constraints.validation.error='UnstructuredDocument2RecordTargetPatientRoleId'</annotation>
@@ -47782,40 +47782,40 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolUnstructuredDocument2ComponentNonXMLBody constraints.validation.error='UnstructuredDocument2ComponentNonXMLBodyHasReferenceOrRepresentation UnstructuredDocument2ComponentNonXMLBodyMediaTypeFileFormats UnstructuredDocument2ComponentNonXMLBodyText' constraints.validation.info='UnstructuredDocument2ComponentNonXMLBodyEDMediaType' constraints.validation.query='UnstructuredDocument2ComponentNonXMLBodyEDMediaType'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolUnstructuredDocument2ComponentNonXMLBodyED mediaType='text/plain' constraints.validation.info='UnstructuredDocument2ComponentNonXMLBodyEDMediaType'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_2KH6gF9xEey5t-mahoHmrg" base_Class="_XA96QDhDEeS1WeMhbm6GZw">
+  <Ecore:EClass xmi:id="_MxNO4H3sEeyivuDeOiJBMg" base_Class="_XA96QDhDEeS1WeMhbm6GZw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PreconditionForSubstanceAdministration2TemplateId PreconditionForSubstanceAdministrationCode PreconditionForSubstanceAdministrationCodeP PreconditionForSubstanceAdministrationText PreconditionForSubstanceAdministrationValue PreconditionForSubstanceAdministrationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.25' templateId.extension='2014-06-09' code.code='ASSERTION' code.codeSystem='2.16.840.1.113883.5.4' code.codeSystemName='HL7ActCode' code.displayName='Assertion' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_28iO4l9xEey5t-mahoHmrg" base_Class="_YYgjwIC3EeS108flGLVEBA">
+  <Ecore:EClass xmi:id="_NcluMn3sEeyivuDeOiJBMg" base_Class="_YYgjwIC3EeS108flGLVEBA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='NumberOfPressureUlcersObservation2TemplateId NumberOfPressureUlcersObservationCode NumberOfPressureUlcersObservationCodeP NumberOfPressureUlcersObservationEntryRelationship NumberOfPressureUlcersObservation2CDTranslation NumberOfPressureUlcersObservation2CDTranslationP NumberOfPressureUlcersObservationEntryRelationshipObservationClassCode NumberOfPressureUlcersObservationEntryRelationshipObservationMoodCode NumberOfPressureUlcersObservation2EntryRelationshipObservationCodeP NumberOfPressureUlcersObservation2EntryRelationshipObservationCode NumberOfPressureUlcersObservationEntryRelationshipObservationValueP NumberOfPressureUlcersObservationEntryRelationshipTypeCode NumberOfPressureUlcersObservationEntryRelationshipObservation' templateId.root='2.16.840.1.113883.10.20.22.4.76' templateId.extension='2015-08-01' constraints.validation.dependOn.NumberOfPressureUlcersObservationCode='NumberOfPressureUlcersObservationCodeP' constraints.validation.query='NumberOfPressureUlcersObservation2CDTranslation NumberOfPressureUlcersObservation2CDTranslationP NumberOfPressureUlcersObservationEntryRelationshipObservationClassCode NumberOfPressureUlcersObservationEntryRelationshipObservationMoodCode NumberOfPressureUlcersObservation2EntryRelationshipObservationCodeP NumberOfPressureUlcersObservation2EntryRelationshipObservationCode NumberOfPressureUlcersObservationEntryRelationshipObservationValueP NumberOfPressureUlcersObservationEntryRelationshipObservationValue NumberOfPressureUlcersObservationEntryRelationshipTypeCode NumberOfPressureUlcersObservationEntryRelationshipObservation' constraints.validation.dependOn.NumberOfPressureUlcersObservation2EntryRelationshipObservationCode='NumberOfPressureUlcersObservation2EntryRelationshipObservationCodeP' constraints.validation.warning='NumberOfPressureUlcersObservationEntryRelationshipObservationValue' constraints.validation.dependOn.NumberOfPressureUlcersObservationEntryRelationshipObservationValue='NumberOfPressureUlcersObservationEntryRelationshipObservationValueP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolNumberOfPressureUlcersObservation2EntryRelationship typeCode='SUBJ' constraints.validation.error='NumberOfPressureUlcersObservationEntryRelationshipTypeCode NumberOfPressureUlcersObservationEntryRelationshipObservation'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolNumberOfPressureUlcersObservation2EntryRelationshipObservation classCode='OBS' constraints.validation.error='NumberOfPressureUlcersObservationEntryRelationshipObservationClassCode NumberOfPressureUlcersObservationEntryRelationshipObservationMoodCode NumberOfPressureUlcersObservation2EntryRelationshipObservationCode NumberOfPressureUlcersObservation2EntryRelationshipObservationCodeP NumberOfPressureUlcersObservationEntryRelationshipObservationValueP' moodCode='EVN' code.code='ASSERTION' code.codeSystem='2.16.840.1.113883.5.4' code.codeSystemName='HL7ActCode' code.displayName='Assertion' constraints.validation.dependOn.NumberOfPressureUlcersObservation2EntryRelationshipObservationCode='NumberOfPressureUlcersObservation2EntryRelationshipObservationCodeP' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT' constraints.validation.warning='NumberOfPressureUlcersObservationEntryRelationshipObservationValue' constraints.validation.dependOn.NumberOfPressureUlcersObservationEntryRelationshipObservationValue='NumberOfPressureUlcersObservationEntryRelationshipObservationValueP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolNumberOfPressureUlcersObservation2CD translation.code='75277-4' translation.codeSystem='2.16.840.1.113883.6.1' translation.codeSystemName='LOINC' translation.displayName='Number of pressure ulcers' constraints.validation.error='NumberOfPressureUlcersObservation2CDTranslation NumberOfPressureUlcersObservation2CDTranslationP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_2_hRcl9xEey5t-mahoHmrg" base_Class="_YvV88IV5EeSRBMdZotACQg">
+  <Ecore:EClass xmi:id="_NfM9Un3sEeyivuDeOiJBMg" base_Class="_YvV88IV5EeSRBMdZotACQg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='FamilyHistoryObservation2TemplateId FamilyHistoryObservationCodeP FamilyHistoryObservation2CDTranslationP' templateId.root='2.16.840.1.113883.10.20.22.4.46' templateId.extension='2015-08-01' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' constraints.validation.warning='FamilyHistoryObservationCode FamilyHistoryObservation2CDTranslation' constraints.validation.dependOn.FamilyHistoryObservationCode='FamilyHistoryObservationCodeP' constraints.validation.query='FamilyHistoryObservation2CDTranslation FamilyHistoryObservation2CDTranslationP'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolFamilyHistoryObservation2CD translation.codeSystem='2.16.840.1.113883.6.1' translation.codeSystemName='LOINC' constraints.validation.warning='FamilyHistoryObservation2CDTranslation' constraints.validation.error='FamilyHistoryObservation2CDTranslationP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_3BluAF9xEey5t-mahoHmrg" base_Class="_6whQEIbpEeSxzopshBnQuw">
+  <Ecore:EClass xmi:id="_NhNIcH3sEeyivuDeOiJBMg" base_Class="_6whQEIbpEeSxzopshBnQuw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='FamilyHistoryOrganizer2TemplateId FamilyHistoryOrganizer2Id FamilyHistoryOrganizerFamilyHistoryObservation' templateId.root='2.16.840.1.113883.10.20.22.4.45' templateId.extension='2015-08-01'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_3CIgkF9xEey5t-mahoHmrg" base_Class="_NGivoIevEeSBauRYePLghA">
+  <Ecore:EClass xmi:id="_Nhs3sn3sEeyivuDeOiJBMg" base_Class="_NGivoIevEeSBauRYePLghA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='FamilyHistorySection2TemplateId' templateId.root='2.16.840.1.113883.10.20.22.2.15' templateId.extension='2015-08-01' constraints.validation.info='FamilyHistorySectionFamilyHistory'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_3CqFAV9xEey5t-mahoHmrg" base_Class="_zKKIUIe9EeSBauRYePLghA">
+  <Ecore:EClass xmi:id="_NiL_4n3sEeyivuDeOiJBMg" base_Class="_zKKIUIe9EeSBauRYePLghA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PhysicianReadingStudyPerformer2TemplateId' templateId.root='2.16.840.1.113883.10.20.6.2.1' templateId.extension='2014-06-09'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_3CqsEl9xEey5t-mahoHmrg" base_Class="_S0oqIIfLEeSBauRYePLghA">
+  <Ecore:EClass xmi:id="_NiMm8n3sEeyivuDeOiJBMg" base_Class="_S0oqIIfLEeSBauRYePLghA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='CourseOfCareSectionTemplateId CourseOfCareSectionCode CourseOfCareSectionCodeP CourseOfCareSectionTitle CourseOfCareSectionText' templateId.root='2.16.840.1.113883.10.20.22.2.64' code.code='8648-8' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Hospital Course Narrative'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_3lfFQl9xEey5t-mahoHmrg" base_Class="_dGARYOLSEeS505YV9ux2XA">
+  <Ecore:EClass xmi:id="_OAiv0H3sEeyivuDeOiJBMg" base_Class="_dGARYOLSEeS505YV9ux2XA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='PlannedInterventionActTemplateId PlannedInterventionActClassCode PlannedInterventionActMoodCode PlannedInterventionActMoodCodeP PlannedInterventionActId PlannedInterventionActCode PlannedInterventionActCodeP PlannedInterventionActStatusCode PlannedInterventionActStatusCodeP PlannedInterventionActEntryReferenceGoalObs PlannedInterventionActReferenceTypeCode PlannedInterventionActReferenceExternalDocumentReference' templateId.root='2.16.840.1.113883.10.20.22.4.146' templateId.extension='2015-08-01' classCode='ACT' constraints.validation.dependOn.PlannedInterventionActMoodCode='PlannedInterventionActMoodCodeP' code.code='362956003' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' code.displayName='procedure / intervention (navigational concept)' constraints.validation.dependOn.PlannedInterventionActCode='PlannedInterventionActCodeP' statusCode.code='active' constraints.validation.warning='PlannedInterventionActEffectiveTime PlannedInterventionActAuthorParticipation' constraints.validation.info='PlannedInterventionActAdvanceDirectiveObservation2 PlannedInterventionActImmunizationActivity2 PlannedInterventionActMedicationActivity2 PlannedInterventionActProcedureActivityAct2 PlannedInterventionActInterventionAct PlannedInterventionActProcedureActivityObservation2 PlannedInterventionActProcedureActivityProcedure2 PlannedInterventionActEncounterActivity2 PlannedInterventionActInstruction2 PlannedInterventionActNonMedicinalSupplyActivity2 PlannedInterventionActPlannedAct2 PlannedInterventionActPlannedEncounter2 PlannedInterventionActPlannedObservation2 PlannedInterventionActPlannedProcedure2 PlannedInterventionActPlannedMedicationActivity2 PlannedInterventionActPlannedSupply2 PlannedInterventionActNutritionRecommendation PlannedInterventionActEntryReferenceDocInstance PlannedInterventionActHandoffCommunicationParticipants PlannedInterventionActPlannedImmunizationActivity PlannedInterventionActReference' constraints.validation.query='PlannedInterventionActReferenceTypeCode PlannedInterventionActReferenceExternalDocumentReference'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolPlannedInterventionActReference typeCode='REFR' constraints.validation.error='PlannedInterventionActReferenceTypeCode PlannedInterventionActReferenceExternalDocumentReference'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_3zN_QF9xEey5t-mahoHmrg" base_Class="_mMk3QON1EeS_XOr-dz_KWA">
+  <Ecore:EClass xmi:id="_OL4dIH3sEeyivuDeOiJBMg" base_Class="_mMk3QON1EeS_XOr-dz_KWA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='RiskConcernActTemplateId RiskConcernActClassCode RiskConcernActMoodCode RiskConcernActId RiskConcernActCode RiskConcernActCodeP RiskConcernActStatusCode RiskConcernActStatusCodeP RiskConcernActReferenceTypeCode RiskConcernActReferenceExternalDocumentReference' templateId.root='2.16.840.1.113883.10.20.22.4.136' templateId.extension='2015-08-01' classCode='ACT' moodCode='EVN' code.code='281694009' code.codeSystem='2.16.840.1.113883.6.96' code.codeSystemName='SNOMEDCT' code.displayName='At risk for' constraints.validation.dependOn.RiskConcernActCode='RiskConcernActCodeP' constraints.validation.info='RiskConcernActEffectiveTime RiskConcernActProblemObservation2 RiskConcernActAllergyObservation2 RiskConcernActEntryReferenceRelatesTo RiskConcernActEntryReferenceHasComponent RiskConcernActAssessmentScaleObservation RiskConcernActMentalStatusObservation2 RiskConcernActSelfCareActivities RiskConcernActMentalStatusObservation2B RiskConcernActSmokingStatusMeaningfulUse2 RiskConcernActEncounterDiagnosis2 RiskConcernActFamilyHistoryOrganizer2 RiskConcernActFunctionalStatusObservation2 RiskConcernActHospitalAdmissionDiagnosis2 RiskConcernActMentalStatusObservation2C RiskConcernActNutritionAssessment RiskConcernActNutritionAssessmentB RiskConcernActPostprocedureDiagnosis2 RiskConcernActPregnancyObservation RiskConcernActPreoperativeDiagnosis2 RiskConcernActReactionObservation2 RiskConcernActResultObservation2 RiskConcernActSensoryStatus RiskConcernActSocialHistoryObservation2 RiskConcernActSubstanceOrDeviceAllergyObservation2 RiskConcernActTobaccoUse2 RiskConcernActVitalSignObservation2 RiskConcernActWoundObservation RiskConcernActProblemObservation2HasSupport RiskConcernActCaregiverCharacteristics RiskConcernActCulturalAndReligiousObservation RiskConcernActCharacteristicsOfHomeEnvironment RiskConcernActNutritionalStatusObservation RiskConcernActResultOrganizer2 RiskConcernActPriorityPreferencePatient RiskConcernActPriorityPreferenceProvider RiskConcernActProblemConcernAct2 RiskConcernActEntryReferenceHealthConcern RiskConcernActReference' constraints.validation.warning='RiskConcernActAuthorParticipation' constraints.validation.query='RiskConcernActReferenceTypeCode RiskConcernActReferenceExternalDocumentReference'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolRiskConcernActReference typeCode='REFR' constraints.validation.error='RiskConcernActReferenceTypeCode RiskConcernActReferenceExternalDocumentReference'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_4apLol9xEey5t-mahoHmrg" base_Class="_kowjcDr-EeWD4MX6K2c_gA">
+  <Ecore:EClass xmi:id="_Os8i0H3sEeyivuDeOiJBMg" base_Class="_kowjcDr-EeWD4MX6K2c_gA">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MedicationFreeTextSigTemplateId MedicationFreeTextSigTextReferenceValue MedicationFreeTextSigClassCode MedicationFreeTextSigMoodCode MedicationFreeTextSigCode MedicationFreeTextSigCodeP MedicationFreeTextSigText MedicationFreeTextSigConsumable MedicationFreeTextSigEDReference MedicationFreeTextSigConsumableManufacturedProductManufacturedLabeledDrugNullFlavor MedicationFreeTextSigConsumableManufacturedProductManufacturedLabeledDrug MedicationFreeTextSigConsumableManufacturedProduct' templateId.root='2.16.840.1.113883.10.20.22.4.147' classCode='SBADM' code.code='76662-6' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Instructions Medication' constraints.validation.warning='MedicationFreeTextSigEDTELValue' constraints.validation.query='MedicationFreeTextSigEDTELValue MedicationFreeTextSigEDReference MedicationFreeTextSigConsumableManufacturedProductManufacturedLabeledDrugNullFlavor MedicationFreeTextSigConsumableManufacturedProductManufacturedLabeledDrug MedicationFreeTextSigConsumableManufacturedProduct'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMedicationFreeTextSigED constraints.validation.error='MedicationFreeTextSigEDReference' constraints.validation.warning='EDMedicationFreeTextSigEDTELValue' constraints.validation.query='EDMedicationFreeTextSigEDTELValue'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMedicationFreeTextSigEDTEL constraints.validation.warning='MedicationFreeTextSigEDTELValue'</annotation>
@@ -47823,22 +47823,22 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMedicationFreeTextSigConsumableManufacturedProduct constraints.validation.error='MedicationFreeTextSigConsumableManufacturedProductManufacturedLabeledDrug'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolMedicationFreeTextSigConsumableManufacturedProductManufacturedLabeledDrug nullFlavor='NA' constraints.validation.error='MedicationFreeTextSigConsumableManufacturedProductManufacturedLabeledDrugNullFlavor'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_4daLwF9xEey5t-mahoHmrg" base_Class="_8fGTcD-qEeaJttsCYk-pKw">
+  <Ecore:EClass xmi:id="_OvOawn3sEeyivuDeOiJBMg" base_Class="_8fGTcD-qEeaJttsCYk-pKw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='BirthSexObservationTemplateId BirthSexObservationClassCode BirthSexObservationMoodCode BirthSexObservationCode BirthSexObservationCodeP BirthSexObservationStatusCode BirthSexObservationStatusCodeP BirthSexObservationValue BirthSexObservationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.200' templateId.extension='2016-06-01' classCode='OBS' moodCode='EVN' code.code='76689-9' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Sex Assigned At Birth' constraints.validation.dependOn.BirthSexObservationCode='BirthSexObservationCodeP' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.5.1' value.codeSystemName='AdministrativeGender'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_4fJ4MF9xEey5t-mahoHmrg" base_Class="_LspMELDzEeafNo3UpQoAYw">
+  <Ecore:EClass xmi:id="_OwkekH3sEeyivuDeOiJBMg" base_Class="_LspMELDzEeafNo3UpQoAYw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='CriticalityObservationTemplateId CriticalityObservationClassCode CriticalityObservationMoodCode CriticalityObservationCode CriticalityObservationCodeP CriticalityObservationStatusCode CriticalityObservationStatusCodeP CriticalityObservationValue CriticalityObservationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.145' classCode='OBS' moodCode='EVN' code.code='82606-5' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Allergy or intolerance criticality' constraints.validation.dependOn.CriticalityObservationCode='CriticalityObservationCodeP' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.5.1063' value.codeSystemName='ObservationValue'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_4kWhQF9xEey5t-mahoHmrg" base_Class="_W5MCgEc1EeiFfJtNAawVHw">
+  <Ecore:EClass xmi:id="_O0A0IH3sEeyivuDeOiJBMg" base_Class="_W5MCgEc1EeiFfJtNAawVHw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='AllergyStatusObservation2TemplateId AllergyStatusObservationCode AllergyStatusObservationValue' templateId.root='2.16.840.1.113883.10.20.22.4.28' templateId.extension='2014-06-09' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_4leiol9xEey5t-mahoHmrg" base_Class="_vyb38EfNEeiFfJtNAawVHw">
+  <Ecore:EClass xmi:id="_O0494X3sEeyivuDeOiJBMg" base_Class="_vyb38EfNEeiFfJtNAawVHw">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProblemStatus2TemplateId ProblemStatusText ProblemStatusValue' templateId.root='2.16.840.1.113883.10.20.22.4.6' templateId.extension='2014-06-09' constraints.validation.info='ProblemStatusTextReference ProblemStatusReferenceValue ProblemStatusTextReferenceValue' value.codeSystem='2.16.840.1.113883.6.96' value.codeSystemName='SNOMEDCT'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_4mE_kl9xEey5t-mahoHmrg" base_Class="_CB2x8Ac_Eeu0W_grHCxLsQ">
+  <Ecore:EClass xmi:id="_O1Z7QH3sEeyivuDeOiJBMg" base_Class="_CB2x8Ac_Eeu0W_grHCxLsQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='CareTeamsTemplateId CareTeamsCode CareTeamsCodeP CareTeamsTitle CareTeamsText' templateId.root='2.16.840.1.113883.10.20.22.2.500' templateId.extension='2019-07-01' code.code='85847-2' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Patient Care team information' constraints.validation.warning='CareTeamsCareTeamOrganizer'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_4mLtQl9xEey5t-mahoHmrg" base_Class="_aigdQAc_Eeu0W_grHCxLsQ">
+  <Ecore:EClass xmi:id="_O1fa0H3sEeyivuDeOiJBMg" base_Class="_aigdQAc_Eeu0W_grHCxLsQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='CareTeamOrganizerTemplateId CareTeamOrganizerId CareTeamOrganizerCode CareTeamOrganizerCodeP CareTeamOrganizerStatusCode CareTeamOrganizerStatusCodeP CareTeamOrganizerEffectiveTime CareTeamOrganizerClassCode CareTeamOrganizerMoodCode CareTeamOrganizerCareTeamMemberAct CareTeamOrganizerIVLTSLow' templateId.root='2.16.840.1.113883.10.20.22.4.500' templateId.extension='2019-07-01' code.code='86744-0' code.displayName='Care Team' constraints.validation.dependOn.CareTeamOrganizerStatusCode='CareTeamOrganizerStatusCodeP' classCode='CLUSTER' moodCode='EVN' constraints.validation.warning='CareTeamOrganizerCareTeamMember CareTeamOrganizerAuthor' constraints.validation.info='CareTeamOrganizerCareLocation CareTeamOrganizerNoteActivity CareTeamOrganizerCareTeamTypeObservation CareTeamOrganizerIVLTSHigh' constraints.validation.query='CareTeamOrganizerIVLTSLow CareTeamOrganizerIVLTSHigh'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCareTeamOrganizerIVLTS constraints.validation.error='CareTeamOrganizerIVLTSLow' constraints.validation.info='CareTeamOrganizerIVLTSHigh'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCareTeamOrganizerCareTeamMember typeCode='PPRF' constraints.validation.error='CareTeamOrganizerCareTeamMemberTypeCode CareTeamOrganizerCareTeamMemberSDTCFunctionCode CareTeamOrganizerCareTeamMemberParticipantRole'</annotation>
@@ -47847,10 +47847,10 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCareTeamOrganizerCareLocationParticipantRole constraints.validation.error='CareTeamOrganizerCareLocationParticipantRoleId CareTeamOrganizerCareLocationParticipantRolePlayingEntity' constraints.validation.warning='CareTeamOrganizerCareLocationParticipantRoleAddr CareTeamOrganizerCareLocationParticipantRoleTelecom'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCareTeamOrganizerCareLocationParticipantRolePlayingEntity constraints.validation.error='CareTeamOrganizerCareLocationParticipantRolePlayingEntityName CareTeamOrganizerCareLocationParticipantRolePlayingEntityClassCode' classCode='ENT'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_4qTYQF9xEey5t-mahoHmrg" base_Class="_1OFHAAdKEeu6cuZQ8fwlvQ">
+  <Ecore:EClass xmi:id="_O44tEX3sEeyivuDeOiJBMg" base_Class="_1OFHAAdKEeu6cuZQ8fwlvQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='CareTeamTypeObservationTemplateId CareTeamTypeObservationCode CareTeamTypeObservationCodeP CareTeamTypeObservationStatusCode CareTeamTypeObservationStatusCodeP CareTeamTypeObservationValue CareTeamTypeObservationValueP CareTeamTypeObservationClassCode CareTeamTypeObservationMoodCode' templateId.root='2.16.840.1.113883.10.20.22.4.500.2' templateId.extension='2019-07-01' code.code='86744-0' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Care Team' constraints.validation.dependOn.CareTeamTypeObservationCode='CareTeamTypeObservationCodeP' statusCode.code='completed' value.codeSystem='2.16.840.1.113883.6.1' value.codeSystemName='LOINC' classCode='OBS' moodCode='EVN'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_4rd14l9xEey5t-mahoHmrg" base_Class="_hBwkAAmBEeut3_ZvYAZhww">
+  <Ecore:EClass xmi:id="_O51vUn3sEeyivuDeOiJBMg" base_Class="_hBwkAAmBEeut3_ZvYAZhww">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='NoteActivityTemplateId NoteActivityCode NoteActivityCodeP NoteActivityText NoteActivityStatusCode NoteActivityEffectiveTime NoteActivityClassCode NoteActivityMoodCode NoteActivityAuthor' templateId.root='2.16.840.1.113883.10.20.22.4.202' templateId.extension='2016-11-01' code.code='34109-9' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Note' constraints.validation.dependOn.NoteActivityCode='NoteActivityCodeP' classCode='ACT' moodCode='EVN' constraints.validation.info='NoteActivityParticipant NoteActivityReference' constraints.validation.warning='NoteActivityCDTranslation1P NoteActivityCDTranslation1 NoteActivityIVLTSValue' constraints.validation.query='NoteActivityCDTranslation1P NoteActivityCDTranslation1 NoteActivityIVLTSValue' constraints.validation.dependOn.NoteActivityCDTranslation1='NoteActivityCDTranslation1P'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolNoteActivityCD translation1.codeSystem='2.16.840.1.113883.6.1' translation1.codeSystemName='LOINC' constraints.validation.warning='NoteActivityCDTranslation1 NoteActivityCDTranslation1P' constraints.validation.dependOn.NoteActivityCDTranslation1='NoteActivityCDTranslation1P'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolNoteActivityIVLTS constraints.validation.warning='NoteActivityIVLTSValue'</annotation>
@@ -47860,7 +47860,7 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolNoteActivityReference constraints.validation.error='NoteActivityReferenceExternalDocument'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolNoteActivityReferenceExternalDocument constraints.validation.error='NoteActivityReferenceExternalDocumentId' constraints.validation.warning='NoteActivityReferenceExternalDocumentCode'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_4wW88l9xEey5t-mahoHmrg" base_Class="_zwKpQAmUEeut3_ZvYAZhww">
+  <Ecore:EClass xmi:id="_O93TsH3sEeyivuDeOiJBMg" base_Class="_zwKpQAmUEeut3_ZvYAZhww">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='CareTeamMemberActTemplateId CareTeamMemberActId CareTeamMemberActStatusCode CareTeamMemberActStatusCodeP CareTeamMemberActEffectiveTime CareTeamMemberActClassCode CareTeamMemberActMoodCode CareTeamMemberActPerformer CareTeamMemberActIVLTSLow' templateId.root='2.16.840.1.113883.10.20.22.4.500.1' templateId.extension='2019-07-01' classCode='PCPR' moodCode='EVN' constraints.validation.info='CareTeamMemberActParticipant CareTeamMemberActCareTeamMemberScheduleObservation CareTeamMemberActNoteActivity CareTeamMemberActParticipant2 CareTeamMemberActIVLTSHigh' constraints.validation.query='CareTeamMemberActIVLTSLow CareTeamMemberActIVLTSHigh'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCareTeamMemberActIVLTS constraints.validation.error='CareTeamMemberActIVLTSLow' constraints.validation.info='CareTeamMemberActIVLTSHigh'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCareTeamMemberActPerformer2 sDTCFunctionCode.codeSystem='2.16.840.1.113883.6.96' sDTCFunctionCode.codeSystemName='SNOMEDCT' constraints.validation.error='CareTeamMemberActPerformer2SDTCFunctionCode CareTeamMemberActPerformer2SDTCFunctionCodeP'</annotation>
@@ -47868,61 +47868,61 @@ value.code = 'completed')</body>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCareTeamMemberActIndividualParticipantParticipantRole constraints.validation.error='CareTeamMemberActIndividualParticipantParticipantRoleNullFlavor'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCareTeamMemberActLocationParticipant constraints.validation.error='CareTeamMemberActLocationParticipantTemplateId CareTeamMemberActLocationParticipantTypeCode CareTeamMemberActLocationParticipantParticipantRole' templateId.root='null' typeCode='LOC'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_41y2kl9xEey5t-mahoHmrg" base_Class="_yf1BYAvGEeuHK5c-vnh5Wg">
+  <Ecore:EClass xmi:id="_PBeBUH3sEeyivuDeOiJBMg" base_Class="_yf1BYAvGEeuHK5c-vnh5Wg">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='CareTeamMemberScheduleObservationTemplateId CareTeamMemberScheduleObservationCode CareTeamMemberScheduleObservationCodeP CareTeamMemberScheduleObservationText CareTeamMemberScheduleObservationValue CareTeamMemberScheduleObservationClassCode CareTeamMemberScheduleObservationMoodCode CareTeamMemberScheduleObservationStatusCode CareTeamMemberScheduleObservationStatusCodeP CareTeamMemberScheduleObservationEDTELValue CareTeamMemberScheduleObservationEDReference' templateId.root='2.16.840.1.113883.10.20.22.4.500.3' templateId.extension='2019-07-01' code.code='57203-2' code.codeSystem='2.16.840.1.113883.6.1' code.codeSystemName='LOINC' code.displayName='Episode Timing [CMS Assessment]' constraints.validation.dependOn.CareTeamMemberScheduleObservationCode='CareTeamMemberScheduleObservationCodeP' classCode='OBS' moodCode='EVN' statusCode.code='completed' constraints.validation.query='CareTeamMemberScheduleObservationEDTELValue CareTeamMemberScheduleObservationEDReference'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCareTeamMemberScheduleObservationED constraints.validation.error='CareTeamMemberScheduleObservationEDReference EDCareTeamMemberScheduleObservationEDTELValue' constraints.validation.query='EDCareTeamMemberScheduleObservationEDTELValue'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolCareTeamMemberScheduleObservationEDTEL constraints.validation.error='CareTeamMemberScheduleObservationEDTELValue'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_448RMF9xEey5t-mahoHmrg" base_Class="_J9bRQA5ZEeuzkrfERpFDKQ">
+  <Ecore:EClass xmi:id="_PD0Ksn3sEeyivuDeOiJBMg" base_Class="_J9bRQA5ZEeuzkrfERpFDKQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ProvenanceAuthorParticipationTemplateId ProvenanceAuthorParticipationTime ProvenanceAuthorParticipationAssignedAuthor ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonPNFamily ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonPNGiven ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonName ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganizationName ProvenanceAuthorParticipationProvenanceAssignedAuthorId ProvenanceAuthorParticipationProvenanceAssignedAuthorCode ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganization' templateId.root='2.16.840.1.113883.10.20.22.5 .6' templateId.extension='2019-10-01' constraints.validation.query='ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonPNFamily ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonPNGiven ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonName ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganizationId ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganizationName ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganizationTelecom ProvenanceAuthorParticipationProvenanceAssignedAuthorId ProvenanceAuthorParticipationProvenanceAssignedAuthorCode ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPerson ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganization ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedAuthoringDevice' constraints.validation.warning='ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganizationId ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganizationTelecom ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPerson' constraints.validation.info='ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedAuthoringDevice'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProvenanceAuthorParticipationProvenanceAssignedAuthor constraints.validation.error='ProvenanceAuthorParticipationProvenanceAssignedAuthorId ProvenanceAuthorParticipationProvenanceAssignedAuthorCode ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganization' code.codeSystem='2.16.840.1.113883.5.111' code.codeSystemName='RoleCode' constraints.validation.warning='ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPerson' constraints.validation.info='ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedAuthoringDevice'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPerson constraints.validation.error='ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonName AssignedPersonProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonPNFamily AssignedPersonProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonPNGiven' constraints.validation.query='AssignedPersonProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonPNFamily AssignedPersonProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonPNGiven'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonPN constraints.validation.error='ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonPNFamily ProvenanceAuthorParticipationProvenanceAssignedAuthorAssignedPersonPNGiven'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganization constraints.validation.warning='ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganizationId ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganizationTelecom' constraints.validation.error='ProvenanceAuthorParticipationProvenanceAssignedAuthorRepresentedOrganizationName'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_49EjQF9xEey5t-mahoHmrg" base_Class="_iyVA4Cz7EeuxZ80rBBFFIQ">
+  <Ecore:EClass xmi:id="_PG568n3sEeyivuDeOiJBMg" base_Class="_iyVA4Cz7EeuxZ80rBBFFIQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='SerialNumberObservationTemplateId SerialNumberObservationCode SerialNumberObservationCodeP SerialNumberObservationValue' templateId.root='2.16.840.1.113883.10.20.22.4.319' templateId.extension='2019-06-21' code.code='C101671' code.codeSystem='2.16.840.1.113883.3.26.1.1' code.codeSystemName='NCI Thesaurus' code.displayName='Serial Number' constraints.validation.dependOn.SerialNumberObservationCode='SerialNumberObservationCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_49JbwF9xEey5t-mahoHmrg" base_Class="_azjXACz8EeuxZ80rBBFFIQ">
+  <Ecore:EClass xmi:id="_PG-MYH3sEeyivuDeOiJBMg" base_Class="_azjXACz8EeuxZ80rBBFFIQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='MRISafetyObservationTemplateId MRISafetyObservationCode MRISafetyObservationValue MRISafetyObservationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.318' templateId.extension='2019-06-21' code.code='C106044' code.codeSystem='2.16.840.1.113883.3.26.1.1' code.codeSystemName='NCI Thesaurus' code.displayName='MRI Safety' value.codeSystem='2.16.840.1.113883.3.26.1.1' value.codeSystemName='NCI Thesaurus'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_4-OZ0F9xEey5t-mahoHmrg" base_Class="_2V3xoCz-EeuxZ80rBBFFIQ">
+  <Ecore:EClass xmi:id="_PH2WIH3sEeyivuDeOiJBMg" base_Class="_2V3xoCz-EeuxZ80rBBFFIQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ModelNumberObservationTemplateId ModelNumberObservationCode ModelNumberObservationCodeP ModelNumberObservationValue' templateId.root='2.16.840.1.113883.10.20.22.4.317' templateId.extension='2019-06-21' code.code='C99285' code.codeSystem='2.16.840.1.113883.3.26.1.1' code.codeSystemName='NCI Thesaurus' code.displayName='Model Number' constraints.validation.dependOn.ModelNumberObservationCode='ModelNumberObservationCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_4-TSUF9xEey5t-mahoHmrg" base_Class="_uvNFwCz_EeuxZ80rBBFFIQ">
+  <Ecore:EClass xmi:id="_PH6AgH3sEeyivuDeOiJBMg" base_Class="_uvNFwCz_EeuxZ80rBBFFIQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ManufacturingDateObservationTemplateId ManufacturingDateObservationCode ManufacturingDateObservationCodeP ManufacturingDateObservationValue ManufacturingDateObservationTSValue' templateId.root='2.16.840.1.113883.10.20.22.4.316' templateId.extension='2019-06' code.code='C101669' code.codeSystem='2.16.840.1.113883.3.26.1.1' code.codeSystemName='NCI Thesaurus' code.displayName='Manufacturing Date' constraints.validation.dependOn.ManufacturingDateObservationCode='ManufacturingDateObservationCodeP' constraints.validation.query='ManufacturingDateObservationTSValue'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolManufacturingDateObservationTS constraints.validation.error='ManufacturingDateObservationTSValue'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_4-Yx4l9xEey5t-mahoHmrg" base_Class="_YvpowC0AEeuxZ80rBBFFIQ">
+  <Ecore:EClass xmi:id="_PH-R833sEeyivuDeOiJBMg" base_Class="_YvpowC0AEeuxZ80rBBFFIQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='LotOrBatchNumberObservationTemplateId LotOrBatchNumberObservationCode LotOrBatchNumberObservationCodeP LotOrBatchNumberObservationValue' templateId.root='2.16.840.1.113883.10.20.22.4.315' templateId.extension='2019-06-21' code.code='C101672' code.codeSystem='2.16.840.1.113883.3.26.1.1' code.codeSystemName='NCI Thesaurus' code.displayName='Lot or Batch Number' constraints.validation.dependOn.LotOrBatchNumberObservationCode='LotOrBatchNumberObservationCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_4-dqYF9xEey5t-mahoHmrg" base_Class="_YK8jwC0BEeuxZ80rBBFFIQ">
+  <Ecore:EClass xmi:id="_PIB8Un3sEeyivuDeOiJBMg" base_Class="_YK8jwC0BEeuxZ80rBBFFIQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='LatexSafetyObservationTemplateId LatexSafetyObservationCode LatexSafetyObservationCodeP LatexSafetyObservationValue LatexSafetyObservationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.314' templateId.extension='2019-06-21' code.code='C160938' code.codeSystem='2.16.840.1.113883.3.26.1.1' code.codeSystemName='NCI Thesaurus' code.displayName='Latex Safety Status' constraints.validation.dependOn.LatexSafetyObservationCode='LatexSafetyObservationCodeP' value.codeSystem='2.16.840.1.113883.3.26.1.1' value.codeSystemName='NCI Thesaurus'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_4_iocF9xEey5t-mahoHmrg" base_Class="_fdGGQC0CEeuxZ80rBBFFIQ">
+  <Ecore:EClass xmi:id="_PI6tIH3sEeyivuDeOiJBMg" base_Class="_fdGGQC0CEeuxZ80rBBFFIQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ImplantableDeviceStatusObservationTemplateId ImplantableDeviceStatusObservationCode ImplantableDeviceStatusObservationCodeP ImplantableDeviceStatusObservationValue ImplantableDeviceStatusObservationValueP' templateId.root='2.16.840.1.113883.10.20.22.4.305' templateId.extension='2019-06-21' code.code='C160939' code.codeSystem='2.16.840.1.113883.3.26.1.1' code.codeSystemName='NCI Thesaurus' code.displayName='Implantable Device Status' constraints.validation.dependOn.ImplantableDeviceStatusObservationCode='ImplantableDeviceStatusObservationCodeP' value.codeSystem='2.16.840.1.113883.3.26.1.1' value.codeSystemName='NCI Thesaurus'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_5AoNkF9xEey5t-mahoHmrg" base_Class="_oDgF8C0DEeuxZ80rBBFFIQ">
+  <Ecore:EClass xmi:id="_PJ16MH3sEeyivuDeOiJBMg" base_Class="_oDgF8C0DEeuxZ80rBBFFIQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='ExpirationDateObservationTemplateId ExpirationDateObservationCode ExpirationDateObservationCodeP ExpirationDateObservationValue ExpirationDateObservationTSValue' templateId.root='2.16.840.1.113883.10.20.22.4.309' templateId.extension='2019-06-21' code.code='C101670' code.codeSystem='2.16.840.1.113883.3.26.1.1' code.codeSystemName='NCI Thesaurus' code.displayName='Expiration Date' constraints.validation.dependOn.ExpirationDateObservationCode='ExpirationDateObservationCodeP' constraints.validation.query='ExpirationDateObservationTSValue'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolExpirationDateObservationTS constraints.validation.error='ExpirationDateObservationTSValue'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_5AuUMF9xEey5t-mahoHmrg" base_Class="_q-hQIC0EEeuxZ80rBBFFIQ">
+  <Ecore:EClass xmi:id="_PJ6ysX3sEeyivuDeOiJBMg" base_Class="_q-hQIC0EEeuxZ80rBBFFIQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='DistinctIdentificationCodeObservationTemplateId DistinctIdentificationCodeObservationCode DistinctIdentificationCodeObservationCodeP DistinctIdentificationCodeObservationValue' templateId.root='2.16.840.1.113883.10.20.22.4.308' templateId.extension='2019-06-21' code.code='C113843' code.codeSystem='2.16.840.1.113883.3.26.1.1' code.codeSystemName='NCI Thesaurus' code.displayName='Distinct Identification Code' constraints.validation.dependOn.DistinctIdentificationCodeObservationCode='DistinctIdentificationCodeObservationCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_5AzMsV9xEey5t-mahoHmrg" base_Class="_aXaegC0FEeuxZ80rBBFFIQ">
+  <Ecore:EClass xmi:id="_PJ-dEn3sEeyivuDeOiJBMg" base_Class="_aXaegC0FEeuxZ80rBBFFIQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='DeviceIdentifierObservationTemplateId DeviceIdentifierObservationCode DeviceIdentifierObservationCodeP DeviceIdentifierObservationValue DeviceIdentifierObservationIIUDI issuing agency DeviceIdentifierObservationIIRoot DeviceIdentifierObservationIIExtension DeviceIdentifierObservationIIDisplayable' templateId.root='2.16.840.1.113883.10.20.22.4.304' templateId.extension='2019-06-21' code.code='C101722' code.codeSystem='2.16.840.1.113883.3.26.1.1' code.codeSystemName='NCI Thesaurus' code.displayName='Primary DI Number' constraints.validation.dependOn.DeviceIdentifierObservationCode='DeviceIdentifierObservationCodeP' constraints.validation.query='DeviceIdentifierObservationIIUDI issuing agency DeviceIdentifierObservationIIRoot DeviceIdentifierObservationIIExtension DeviceIdentifierObservationIIDisplayable'</annotation>
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation/consolDeviceIdentifierObservationII constraints.validation.error='DeviceIdentifierObservationIIUDI issuing agency DeviceIdentifierObservationIIRoot DeviceIdentifierObservationIIExtension DeviceIdentifierObservationIIDisplayable' displayable='true'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_5A7vkl9xEey5t-mahoHmrg" base_Class="_CsrcoC0HEeuxZ80rBBFFIQ">
+  <Ecore:EClass xmi:id="_PKHnAH3sEeyivuDeOiJBMg" base_Class="_CsrcoC0HEeuxZ80rBBFFIQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='CompanyNameObservationTemplateId CompanyNameObservationCode CompanyNameObservationCodeP CompanyNameObservationValue' templateId.root='2.16.840.1.113883.10.20.22.4.303' templateId.extension='2019-06-21' code.code='C54131' code.codeSystem='2.16.840.1.113883.3.26.1.1' code.codeSystemName='NCI Thesaurus' code.displayName='Company Name' constraints.validation.dependOn.CompanyNameObservationCode='CompanyNameObservationCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_5BAoEF9xEey5t-mahoHmrg" base_Class="_BUBLIC0IEeuxZ80rBBFFIQ">
+  <Ecore:EClass xmi:id="_PKLRYn3sEeyivuDeOiJBMg" base_Class="_BUBLIC0IEeuxZ80rBBFFIQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='CatalogNumberObservationTemplateId CatalogNumberObservationCode CatalogNumberObservationCodeP CatalogNumberObservationValue' templateId.root='2.16.840.1.113883.10.20.22.4.302' templateId.extension='2019-06-21' code.code='C99286' code.codeSystem='2.16.840.1.113883.3.26.1.1' code.codeSystemName='NCI Thesaurus' code.displayName='Catalog Number' constraints.validation.dependOn.CatalogNumberObservationCode='CatalogNumberObservationCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_5BEScl9xEey5t-mahoHmrg" base_Class="_E41gQC0JEeuxZ80rBBFFIQ">
+  <Ecore:EClass xmi:id="_PKO7wn3sEeyivuDeOiJBMg" base_Class="_E41gQC0JEeuxZ80rBBFFIQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='BrandNameObservationTemplateId BrandNameObservationCode BrandNameObservationCodeP BrandNameObservationValue' templateId.root='2.16.840.1.113883.10.20.22.4.301' templateId.extension='2019-06-21' code.code='C71898' code.codeSystem='2.16.840.1.113883.3.26.1.1' code.codeSystemName='NCI Thesaurus' code.displayName='Brand Name' constraints.validation.dependOn.BrandNameObservationCode='BrandNameObservationCodeP'</annotation>
   </Ecore:EClass>
-  <Ecore:EClass xmi:id="_5BIj4l9xEey5t-mahoHmrg" base_Class="_yU3ZUC0JEeuxZ80rBBFFIQ">
+  <Ecore:EClass xmi:id="_PKT0QH3sEeyivuDeOiJBMg" base_Class="_yU3ZUC0JEeuxZ80rBBFFIQ">
     <annotation>http://www.openhealthtools.org/mdht/uml/cda/annotation constraints.validation.error='UDIOrganizerTemplateId UDIOrganizerId UDIOrganizerStatusCode UDIOrganizerStatusCodeP UDIOrganizerClassCode UDIOrganizerMoodCode UDIOrganizerDeviceIdentifierObservation' templateId.root='2.16.840.1.113883.10.20.22.4.311' templateId.extension='2019-06-21' constraints.validation.info='UDIOrganizerCode UDIOrganizerCodeP UDIOrganizerBrandNameObservation UDIOrganizerModelNumberObservation UDIOrganizerCompanyNameObservation UDIOrganizerCatalogNumberObservation UDIOrganizerLatexSafetyObservation UDIOrganizerMRISafetyObservation UDIOrganizerImplantableDeviceStatusObservation' constraints.validation.dependOn.UDIOrganizerCode='UDIOrganizerCodeP' statusCode.code='completed' constraints.validation.dependOn.UDIOrganizerStatusCode='UDIOrganizerStatusCodeP' classCode='CLUSTER' moodCode='EVN' constraints.validation.warning='UDIOrganizerLotOrBatchNumberObservation UDIOrganizerSerialNumberObservation UDIOrganizerManufacturingDateObservation UDIOrganizerExpirationDateObservation UDIOrganizerDistinctIdentificationCodeObservation'</annotation>
   </Ecore:EClass>
 </xmi:XMI>
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/plugin.properties b/generated/org.openhealthtools.mdht.uml.cda.consol2/plugin.properties
index 5e450c7285..cc059ef146 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/plugin.properties
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/plugin.properties
@@ -493,12 +493,12 @@ CarePlanCarePlanDocumentationOfServiceEventIVLTSLow = Consol Care Plan (V2) SHAL
 CarePlanCarePlanDocumentationOfServiceEventPerformer1 = Consol Care Plan (V2) SHALL contain exactly one [1..1] documentationOf, where its type is Documentation Of (CONF:1198-31901) each SHALL contain exactly one [1..1] serviceEvent, where  (CONF:1198-31902) serviceEvent SHALL contain at least one [1..*] performer, where its type is Performer (CONF:1198-31905)
 CarePlanCarePlanDocumentationOfServiceEventPerformerAssignedEntity = Consol Care Plan (V2) SHALL contain exactly one [1..1] documentationOf, where its type is Documentation Of (CONF:1198-31901) each SHALL contain exactly one [1..1] serviceEvent, where  (CONF:1198-31902) each SHALL contain at least one [1..*] performer, where  (CONF:1198-31905) performer1 SHALL contain exactly one [1..1] assignedEntity, where its type is Assigned Entity (CONF:1198-31907)
 CarePlanCarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPerson = Consol Care Plan (V2) SHALL contain exactly one [1..1] documentationOf, where its type is Documentation Of (CONF:1198-31901) each SHALL contain exactly one [1..1] serviceEvent, where  (CONF:1198-31902) each SHALL contain at least one [1..*] performer, where  (CONF:1198-31905) each SHALL contain exactly one [1..1] assignedEntity, where  (CONF:1198-31907) assignedEntity SHALL contain exactly one [1..1] assignedPerson, where its type is Assigned Person (CONF:1198-32328)
-CarePlanCarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNameFamily = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHALL contain exactly one [1..1] documentationOf, where its type is Documentation Of (CONF:1198-31901) each SHALL contain exactly one [1..1] serviceEvent, where  (CONF:1198-31902) each SHALL contain at least one [1..*] performer, where  (CONF:1198-31905) each SHALL contain exactly one [1..1] assignedEntity, where  (CONF:1198-31907) each SHALL contain exactly one [1..1] assignedPerson, where  (CONF:1198-32328) each SHALL contain exactly one [1..1] name (CONF:1198-32329) name SHALL NOT contain  [0..0] family (CONF:81-9372)
-CarePlanCarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNameGiven = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHALL contain exactly one [1..1] documentationOf, where its type is Documentation Of (CONF:1198-31901) each SHALL contain exactly one [1..1] serviceEvent, where  (CONF:1198-31902) each SHALL contain at least one [1..*] performer, where  (CONF:1198-31905) each SHALL contain exactly one [1..1] assignedEntity, where  (CONF:1198-31907) each SHALL contain exactly one [1..1] assignedPerson, where  (CONF:1198-32328) each SHALL contain exactly one [1..1] name (CONF:1198-32329) name SHALL NOT contain  [0..0] given (CONF:81-9372)
-CarePlanCarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNamePrefix = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHALL contain exactly one [1..1] documentationOf, where its type is Documentation Of (CONF:1198-31901) each SHALL contain exactly one [1..1] serviceEvent, where  (CONF:1198-31902) each SHALL contain at least one [1..*] performer, where  (CONF:1198-31905) each SHALL contain exactly one [1..1] assignedEntity, where  (CONF:1198-31907) each SHALL contain exactly one [1..1] assignedPerson, where  (CONF:1198-32328) each SHALL contain exactly one [1..1] name (CONF:1198-32329) name SHALL NOT contain  [0..0] prefix (CONF:81-9372)
-CarePlanCarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNameSuffix = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHALL contain exactly one [1..1] documentationOf, where its type is Documentation Of (CONF:1198-31901) each SHALL contain exactly one [1..1] serviceEvent, where  (CONF:1198-31902) each SHALL contain at least one [1..*] performer, where  (CONF:1198-31905) each SHALL contain exactly one [1..1] assignedEntity, where  (CONF:1198-31907) each SHALL contain exactly one [1..1] assignedPerson, where  (CONF:1198-32328) each SHALL contain exactly one [1..1] name (CONF:1198-32329) name SHALL NOT contain  [0..0] suffix (CONF:81-9372)
+CarePlanCarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNameFamily = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHALL contain exactly one [1..1] documentationOf, where its type is Documentation Of (CONF:1198-31901) each SHALL contain exactly one [1..1] serviceEvent, where  (CONF:1198-31902) each SHALL contain at least one [1..*] performer, where  (CONF:1198-31905) each SHALL contain exactly one [1..1] assignedEntity, where  (CONF:1198-31907) each SHALL contain exactly one [1..1] assignedPerson, where  (CONF:1198-32328) each SHALL contain exactly one [1..1] name (CONF:1198-32329) name SHALL NOT contain  [0..0] family (CONF:81-9372)
+CarePlanCarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNameGiven = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHALL contain exactly one [1..1] documentationOf, where its type is Documentation Of (CONF:1198-31901) each SHALL contain exactly one [1..1] serviceEvent, where  (CONF:1198-31902) each SHALL contain at least one [1..*] performer, where  (CONF:1198-31905) each SHALL contain exactly one [1..1] assignedEntity, where  (CONF:1198-31907) each SHALL contain exactly one [1..1] assignedPerson, where  (CONF:1198-32328) each SHALL contain exactly one [1..1] name (CONF:1198-32329) name SHALL NOT contain  [0..0] given (CONF:81-9372)
+CarePlanCarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNamePrefix = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHALL contain exactly one [1..1] documentationOf, where its type is Documentation Of (CONF:1198-31901) each SHALL contain exactly one [1..1] serviceEvent, where  (CONF:1198-31902) each SHALL contain at least one [1..*] performer, where  (CONF:1198-31905) each SHALL contain exactly one [1..1] assignedEntity, where  (CONF:1198-31907) each SHALL contain exactly one [1..1] assignedPerson, where  (CONF:1198-32328) each SHALL contain exactly one [1..1] name (CONF:1198-32329) name SHALL NOT contain  [0..0] prefix (CONF:81-9372)
+CarePlanCarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNameSuffix = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHALL contain exactly one [1..1] documentationOf, where its type is Documentation Of (CONF:1198-31901) each SHALL contain exactly one [1..1] serviceEvent, where  (CONF:1198-31902) each SHALL contain at least one [1..*] performer, where  (CONF:1198-31905) each SHALL contain exactly one [1..1] assignedEntity, where  (CONF:1198-31907) each SHALL contain exactly one [1..1] assignedPerson, where  (CONF:1198-32328) each SHALL contain exactly one [1..1] name (CONF:1198-32329) name SHALL NOT contain  [0..0] suffix (CONF:81-9372)
 CarePlanCarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent = Consol Care Plan (V2) SHALL contain exactly one [1..1] documentationOf, where its type is Documentation Of (CONF:1198-31901) each SHALL contain exactly one [1..1] serviceEvent, where  (CONF:1198-31902) each SHALL contain at least one [1..*] performer, where  (CONF:1198-31905) each SHALL contain exactly one [1..1] assignedEntity, where  (CONF:1198-31907) each SHALL contain exactly one [1..1] assignedPerson, where  (CONF:1198-32328) each SHALL contain exactly one [1..1] name (CONF:1198-32329) null
-CarePlanCarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNameUse = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHALL contain exactly one [1..1] documentationOf, where its type is Documentation Of (CONF:1198-31901) each SHALL contain exactly one [1..1] serviceEvent, where  (CONF:1198-31902) each SHALL contain at least one [1..*] performer, where  (CONF:1198-31905) each SHALL contain exactly one [1..1] assignedEntity, where  (CONF:1198-31907) each SHALL contain exactly one [1..1] assignedPerson, where  (CONF:1198-32328) each SHALL contain exactly one [1..1] name (CONF:1198-32329) name SHALL contain zero or one [0..1] @use, which SHALL be selected from ValueSet EntityNameUse 2.16.840.1.113883.1.11.15913 STATIC
+CarePlanCarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonGeneralHeaderConstraintsUSRealmPersonNameUse = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHALL contain exactly one [1..1] documentationOf, where its type is Documentation Of (CONF:1198-31901) each SHALL contain exactly one [1..1] serviceEvent, where  (CONF:1198-31902) each SHALL contain at least one [1..*] performer, where  (CONF:1198-31905) each SHALL contain exactly one [1..1] assignedEntity, where  (CONF:1198-31907) each SHALL contain exactly one [1..1] assignedPerson, where  (CONF:1198-32328) each SHALL contain exactly one [1..1] name (CONF:1198-32329) name SHALL contain zero or one [0..1] @use, which SHALL be selected from ValueSet EntityNameUse 2.16.840.1.113883.1.11.15913 STATIC
 CarePlanCarePlanDocumentationOfServiceEventPerformerAssignedEntityAssignedPersonName = Consol Care Plan (V2) SHALL contain exactly one [1..1] documentationOf, where its type is Documentation Of (CONF:1198-31901) each SHALL contain exactly one [1..1] serviceEvent, where  (CONF:1198-31902) each SHALL contain at least one [1..*] performer, where  (CONF:1198-31905) each SHALL contain exactly one [1..1] assignedEntity, where  (CONF:1198-31907) each SHALL contain exactly one [1..1] assignedPerson, where  (CONF:1198-32328) assignedPerson SHALL contain exactly one [1..1] name (CONF:1198-32329)
 CarePlanCarePlanDocumentationOfServiceEventPerformerAssignedEntityCode = Consol Care Plan (V2) SHALL contain exactly one [1..1] documentationOf, where its type is Documentation Of (CONF:1198-31901) each SHALL contain exactly one [1..1] serviceEvent, where  (CONF:1198-31902) each SHALL contain at least one [1..*] performer, where  (CONF:1198-31905) each SHALL contain exactly one [1..1] assignedEntity, where  (CONF:1198-31907) assignedEntity MAY contain zero or one [0..1] code (CONF:1198-31909)
 CarePlanCarePlanDocumentationOfServiceEventPerformerAssignedEntityId = Consol Care Plan (V2) SHALL contain exactly one [1..1] documentationOf, where its type is Documentation Of (CONF:1198-31901) each SHALL contain exactly one [1..1] serviceEvent, where  (CONF:1198-31902) each SHALL contain at least one [1..*] performer, where  (CONF:1198-31905) each SHALL contain exactly one [1..1] assignedEntity, where  (CONF:1198-31907) assignedEntity SHALL contain at least one [1..*] id (CONF:1198-31908)
@@ -511,12 +511,12 @@ CarePlanCarePlanInformationRecipientIntendedRecipient = Consol Care Plan (V2) SH
 CarePlanCarePlanInformationRecipientIntendedRecipientAddr = Consol Care Plan (V2) SHOULD contain zero or more [0..*] informationRecipient, where its type is Information Recipient (CONF:1198-31993) each SHALL contain exactly one [1..1] intendedRecipient, where  (CONF:1198-31994) intendedRecipient SHOULD contain zero or more [0..*] addr (CONF:1198-31997)
 CarePlanCarePlanInformationRecipientIntendedRecipientId = Consol Care Plan (V2) SHOULD contain zero or more [0..*] informationRecipient, where its type is Information Recipient (CONF:1198-31993) each SHALL contain exactly one [1..1] intendedRecipient, where  (CONF:1198-31994) intendedRecipient SHALL contain at least one [1..*] id (CONF:1198-31996)
 CarePlanCarePlanInformationRecipientIntendedRecipientInformationRecipient = Consol Care Plan (V2) SHOULD contain zero or more [0..*] informationRecipient, where its type is Information Recipient (CONF:1198-31993) each SHALL contain exactly one [1..1] intendedRecipient, where  (CONF:1198-31994) intendedRecipient SHOULD contain zero or one [0..1] informationRecipient, where its type is Information Recipient (CONF:1198-31999)
-CarePlanCarePlanInformationRecipientIntendedRecipientInformationRecipientGeneralHeaderConstraintsUSRealmPersonNameFamily = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] informationRecipient, where its type is Information Recipient (CONF:1198-31993) each SHALL contain exactly one [1..1] intendedRecipient, where  (CONF:1198-31994) each SHOULD contain zero or one [0..1] informationRecipient, where  (CONF:1198-31999) each SHALL contain exactly one [1..1] name (CONF:1198-32320) such that it  Note: The name should use pn (PN.US.FIELDED). name SHALL NOT contain  [0..0] family (CONF:81-9372)
-CarePlanCarePlanInformationRecipientIntendedRecipientInformationRecipientGeneralHeaderConstraintsUSRealmPersonNameGiven = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] informationRecipient, where its type is Information Recipient (CONF:1198-31993) each SHALL contain exactly one [1..1] intendedRecipient, where  (CONF:1198-31994) each SHOULD contain zero or one [0..1] informationRecipient, where  (CONF:1198-31999) each SHALL contain exactly one [1..1] name (CONF:1198-32320) such that it  Note: The name should use pn (PN.US.FIELDED). name SHALL NOT contain  [0..0] given (CONF:81-9372)
-CarePlanCarePlanInformationRecipientIntendedRecipientInformationRecipientGeneralHeaderConstraintsUSRealmPersonNamePrefix = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] informationRecipient, where its type is Information Recipient (CONF:1198-31993) each SHALL contain exactly one [1..1] intendedRecipient, where  (CONF:1198-31994) each SHOULD contain zero or one [0..1] informationRecipient, where  (CONF:1198-31999) each SHALL contain exactly one [1..1] name (CONF:1198-32320) such that it  Note: The name should use pn (PN.US.FIELDED). name SHALL NOT contain  [0..0] prefix (CONF:81-9372)
-CarePlanCarePlanInformationRecipientIntendedRecipientInformationRecipientGeneralHeaderConstraintsUSRealmPersonNameSuffix = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] informationRecipient, where its type is Information Recipient (CONF:1198-31993) each SHALL contain exactly one [1..1] intendedRecipient, where  (CONF:1198-31994) each SHOULD contain zero or one [0..1] informationRecipient, where  (CONF:1198-31999) each SHALL contain exactly one [1..1] name (CONF:1198-32320) such that it  Note: The name should use pn (PN.US.FIELDED). name SHALL NOT contain  [0..0] suffix (CONF:81-9372)
+CarePlanCarePlanInformationRecipientIntendedRecipientInformationRecipientGeneralHeaderConstraintsUSRealmPersonNameFamily = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] informationRecipient, where its type is Information Recipient (CONF:1198-31993) each SHALL contain exactly one [1..1] intendedRecipient, where  (CONF:1198-31994) each SHOULD contain zero or one [0..1] informationRecipient, where  (CONF:1198-31999) each SHALL contain exactly one [1..1] name (CONF:1198-32320) such that it  Note: The name should use pn (PN.US.FIELDED). name SHALL NOT contain  [0..0] family (CONF:81-9372)
+CarePlanCarePlanInformationRecipientIntendedRecipientInformationRecipientGeneralHeaderConstraintsUSRealmPersonNameGiven = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] informationRecipient, where its type is Information Recipient (CONF:1198-31993) each SHALL contain exactly one [1..1] intendedRecipient, where  (CONF:1198-31994) each SHOULD contain zero or one [0..1] informationRecipient, where  (CONF:1198-31999) each SHALL contain exactly one [1..1] name (CONF:1198-32320) such that it  Note: The name should use pn (PN.US.FIELDED). name SHALL NOT contain  [0..0] given (CONF:81-9372)
+CarePlanCarePlanInformationRecipientIntendedRecipientInformationRecipientGeneralHeaderConstraintsUSRealmPersonNamePrefix = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] informationRecipient, where its type is Information Recipient (CONF:1198-31993) each SHALL contain exactly one [1..1] intendedRecipient, where  (CONF:1198-31994) each SHOULD contain zero or one [0..1] informationRecipient, where  (CONF:1198-31999) each SHALL contain exactly one [1..1] name (CONF:1198-32320) such that it  Note: The name should use pn (PN.US.FIELDED). name SHALL NOT contain  [0..0] prefix (CONF:81-9372)
+CarePlanCarePlanInformationRecipientIntendedRecipientInformationRecipientGeneralHeaderConstraintsUSRealmPersonNameSuffix = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] informationRecipient, where its type is Information Recipient (CONF:1198-31993) each SHALL contain exactly one [1..1] intendedRecipient, where  (CONF:1198-31994) each SHOULD contain zero or one [0..1] informationRecipient, where  (CONF:1198-31999) each SHALL contain exactly one [1..1] name (CONF:1198-32320) such that it  Note: The name should use pn (PN.US.FIELDED). name SHALL NOT contain  [0..0] suffix (CONF:81-9372)
 CarePlanCarePlanInformationRecipientIntendedRecipientInformationRecipientGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent = Consol Care Plan (V2) SHOULD contain zero or more [0..*] informationRecipient, where its type is Information Recipient (CONF:1198-31993) each SHALL contain exactly one [1..1] intendedRecipient, where  (CONF:1198-31994) each SHOULD contain zero or one [0..1] informationRecipient, where  (CONF:1198-31999) each SHALL contain exactly one [1..1] name (CONF:1198-32320) such that it  Note: The name should use pn (PN.US.FIELDED). null
-CarePlanCarePlanInformationRecipientIntendedRecipientInformationRecipientGeneralHeaderConstraintsUSRealmPersonNameUse = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] informationRecipient, where its type is Information Recipient (CONF:1198-31993) each SHALL contain exactly one [1..1] intendedRecipient, where  (CONF:1198-31994) each SHOULD contain zero or one [0..1] informationRecipient, where  (CONF:1198-31999) each SHALL contain exactly one [1..1] name (CONF:1198-32320) such that it  Note: The name should use pn (PN.US.FIELDED). name SHALL contain zero or one [0..1] @use, which SHALL be selected from ValueSet EntityNameUse 2.16.840.1.113883.1.11.15913 STATIC
+CarePlanCarePlanInformationRecipientIntendedRecipientInformationRecipientGeneralHeaderConstraintsUSRealmPersonNameUse = Consol Care Plan (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] informationRecipient, where its type is Information Recipient (CONF:1198-31993) each SHALL contain exactly one [1..1] intendedRecipient, where  (CONF:1198-31994) each SHOULD contain zero or one [0..1] informationRecipient, where  (CONF:1198-31999) each SHALL contain exactly one [1..1] name (CONF:1198-32320) such that it  Note: The name should use pn (PN.US.FIELDED). name SHALL contain zero or one [0..1] @use, which SHALL be selected from ValueSet EntityNameUse 2.16.840.1.113883.1.11.15913 STATIC
 CarePlanCarePlanInformationRecipientIntendedRecipientInformationRecipientName = Consol Care Plan (V2) SHOULD contain zero or more [0..*] informationRecipient, where its type is Information Recipient (CONF:1198-31993) each SHALL contain exactly one [1..1] intendedRecipient, where  (CONF:1198-31994) each SHOULD contain zero or one [0..1] informationRecipient, where  (CONF:1198-31999) informationRecipient SHALL contain exactly one [1..1] name (CONF:1198-32320) such that it  Note: The name should use US Realm Person Name (PN.US.FIELDED).
 CarePlanCarePlanInformationRecipientIntendedRecipientReceivedOrganization = Consol Care Plan (V2) SHOULD contain zero or more [0..*] informationRecipient, where its type is Information Recipient (CONF:1198-31993) each SHALL contain exactly one [1..1] intendedRecipient, where  (CONF:1198-31994) intendedRecipient SHOULD contain zero or one [0..1] receivedOrganization, where its type is Received Organization (CONF:1198-32000)
 CarePlanCarePlanInformationRecipientIntendedRecipientReceivedOrganizationId = Consol Care Plan (V2) SHOULD contain zero or more [0..*] informationRecipient, where its type is Information Recipient (CONF:1198-31993) each SHALL contain exactly one [1..1] intendedRecipient, where  (CONF:1198-31994) each SHOULD contain zero or one [0..1] receivedOrganization, where  (CONF:1198-32000) receivedOrganization SHOULD contain zero or more [0..*] id (CONF:1198-32001)
@@ -3185,7 +3185,7 @@ LongitudinalCareWoundObservationProblemObservation2TemplateId = SHALL contain ex
 LotOrBatchNumberObservationLotOrBatchNumberObservationCode = Consol Lot Or Batch Number Observation SHALL contain exactly one [1..1] code (CONF:4437-3451)/@code="C101672" Lot or Batch Number (CodeSystem: 2.16.840.1.113883.3.26.1.1 NCI Thesaurus) (CONF:4437-3454, CONF:4437-3455, CONF:4437-3456, CONF:4437-3457)
 LotOrBatchNumberObservationLotOrBatchNumberObservationCodeP = Consol Lot Or Batch Number Observation SHALL contain exactly one [1..1] code (CONF:4437-3451)/@code="C101672" Lot or Batch Number (CodeSystem: 2.16.840.1.113883.3.26.1.1 NCI Thesaurus) (CONF:4437-3454, CONF:4437-3455, CONF:4437-3456, CONF:4437-3457)
 LotOrBatchNumberObservationLotOrBatchNumberObservationTemplateId = SHALL contain exactly one [1..1] templateId ( CONF:4437-3452, CONF:4437-3450, CONF:4437-3453 ) such that it SHALL contain exactly one [1..1] @root="2.16.840.1.113883.10.20.22.4.315" and SHALL contain exactly one [1..1] @extension="2019-06-21"
-LotOrBatchNumberObservationLotOrBatchNumberObservationValue = Consol Lot Or Batch Number Observation SHALL contain exactly one [1..1] value with @xsi:type="ST" (CONF:4437-3458)
+LotOrBatchNumberObservationLotOrBatchNumberObservationValue = Consol Lot Or Batch Number Observation SHALL contain exactly one [1..1] value with @xsi:type="ED" (CONF:4437-3458)
 MRISafetyObservationMRISafetyObservationCode = Consol MRI Safety Observation SHALL contain exactly one [1..1] code/@code="C106044" MRI Safety (CodeSystem: 2.16.840.1.113883.3.26.1.1 NCI Thesaurus) (CONF:4437-3473, CONF:4437-3474, CONF:4437-3475, CONF:4437)
 MRISafetyObservationMRISafetyObservationTemplateId = SHALL contain exactly one [1..1] templateId ( CONF:4437-3469, CONF:4437-3471 ) such that it SHALL contain exactly one [1..1] @root="2.16.840.1.113883.10.20.22.4.318" and SHALL contain exactly one [1..1] @extension="2019-06-21"
 MRISafetyObservationMRISafetyObservationValue = Consol MRI Safety Observation SHALL contain exactly one [1..1] value with @xsi:type="CD" (CONF:4437-3477), which SHALL be selected from ValueSet MRISafetyStatus 2.16.840.1.113762.1.4.1021.46 STATIC (CONF:4437-3478, CONF:4437-3479, CONF:4437-3537)
@@ -5755,14 +5755,14 @@ ReferralNoteReferralNoteParticipantCallbackContactTypeCode = Consol Referral Not
 ReferralNoteReferralNoteParticipantCaregiver = Consol Referral Note (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642)
 ReferralNoteReferralNoteParticipantCaregiverAssociatedEntity = Consol Referral Note (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) participantCaregiver SHALL contain exactly one [1..1] associatedEntity, where its type is Associated Entity (CONF:1198-31643)
 ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityAssociatedPerson = Consol Referral Note (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) associatedEntity SHALL contain exactly one [1..1] associatedPerson, where its type is Associated Person (CONF:1198-31644)
-ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNameFamily = Consol Referral Note (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) each SHALL contain exactly one [1..1] associatedPerson, where  (CONF:1198-31644) This associatedPerson SHALL contain at least one [1..*] US Realm Patient Name (PTN.US.FIELDED) (identifier: urn:oid:2.16.840.1.113883.10.20.22.5.1) (CONF:1198-31645) name SHALL NOT contain  [0..0] family (CONF:81-9372)
-ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNameGiven = Consol Referral Note (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) each SHALL contain exactly one [1..1] associatedPerson, where  (CONF:1198-31644) This associatedPerson SHALL contain at least one [1..*] US Realm Patient Name (PTN.US.FIELDED) (identifier: urn:oid:2.16.840.1.113883.10.20.22.5.1) (CONF:1198-31645) name SHALL NOT contain  [0..0] given (CONF:81-9372)
-ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNamePrefix = Consol Referral Note (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) each SHALL contain exactly one [1..1] associatedPerson, where  (CONF:1198-31644) This associatedPerson SHALL contain at least one [1..*] US Realm Patient Name (PTN.US.FIELDED) (identifier: urn:oid:2.16.840.1.113883.10.20.22.5.1) (CONF:1198-31645) name SHALL NOT contain  [0..0] prefix (CONF:81-9372)
-ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNameSuffix = Consol Referral Note (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) each SHALL contain exactly one [1..1] associatedPerson, where  (CONF:1198-31644) This associatedPerson SHALL contain at least one [1..*] US Realm Patient Name (PTN.US.FIELDED) (identifier: urn:oid:2.16.840.1.113883.10.20.22.5.1) (CONF:1198-31645) name SHALL NOT contain  [0..0] suffix (CONF:81-9372)
-ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNameTemplateId = Consol Referral Note (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) each SHALL contain exactly one [1..1] associatedPerson, where  (CONF:1198-31644) This associatedPerson SHALL contain at least one [1..*] US Realm Patient Name (PTN.US.FIELDED) (identifier: urn:oid:2.16.840.1.113883.10.20.22.5.1) (CONF:1198-31645) SHALL contain exactly one [1..1] templateId such that it SHALL contain exactly one [1..1] @root=""
-ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPatientNameMixedContent = Consol Referral Note (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) each SHALL contain exactly one [1..1] associatedPerson, where  (CONF:1198-31644) This associatedPerson SHALL contain at least one [1..*] US Realm Patient Name (PTN.US.FIELDED) (identifier: urn:oid:2.16.840.1.113883.10.20.22.5.1) (CONF:1198-31645) null
+ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNameFamily = Consol Referral Note (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) each SHALL contain exactly one [1..1] associatedPerson, where  (CONF:1198-31644) This associatedPerson SHALL contain at least one [1..*] US Realm Patient Name (PTN.US.FIELDED) (identifier: urn:oid:2.16.840.1.113883.10.20.22.5.1) (CONF:1198-31645) name SHALL NOT contain  [0..0] family (CONF:81-9372)
+ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNameGiven = Consol Referral Note (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) each SHALL contain exactly one [1..1] associatedPerson, where  (CONF:1198-31644) This associatedPerson SHALL contain at least one [1..*] US Realm Patient Name (PTN.US.FIELDED) (identifier: urn:oid:2.16.840.1.113883.10.20.22.5.1) (CONF:1198-31645) name SHALL NOT contain  [0..0] given (CONF:81-9372)
+ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNamePrefix = Consol Referral Note (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) each SHALL contain exactly one [1..1] associatedPerson, where  (CONF:1198-31644) This associatedPerson SHALL contain at least one [1..*] US Realm Patient Name (PTN.US.FIELDED) (identifier: urn:oid:2.16.840.1.113883.10.20.22.5.1) (CONF:1198-31645) name SHALL NOT contain  [0..0] prefix (CONF:81-9372)
+ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNameSuffix = Consol Referral Note (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) each SHALL contain exactly one [1..1] associatedPerson, where  (CONF:1198-31644) This associatedPerson SHALL contain at least one [1..*] US Realm Patient Name (PTN.US.FIELDED) (identifier: urn:oid:2.16.840.1.113883.10.20.22.5.1) (CONF:1198-31645) name SHALL NOT contain  [0..0] suffix (CONF:81-9372)
+ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNameTemplateId = Consol Referral Note (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) each SHALL contain exactly one [1..1] associatedPerson, where  (CONF:1198-31644) This associatedPerson SHALL contain at least one [1..*] US Realm Patient Name (PTN.US.FIELDED) (identifier: urn:oid:2.16.840.1.113883.10.20.22.5.1) (CONF:1198-31645) SHALL contain exactly one [1..1] templateId such that it SHALL contain exactly one [1..1] @root=""
+ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPatientNameMixedContent = Consol Referral Note (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) each SHALL contain exactly one [1..1] associatedPerson, where  (CONF:1198-31644) This associatedPerson SHALL contain at least one [1..*] US Realm Patient Name (PTN.US.FIELDED) (identifier: urn:oid:2.16.840.1.113883.10.20.22.5.1) (CONF:1198-31645) null
 ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNameUSRealmPersonNameMixedContent = Consol Referral Note (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) each SHALL contain exactly one [1..1] associatedPerson, where  (CONF:1198-31644) This associatedPerson SHALL contain at least one [1..*] US Realm Patient Name (PTN.US.FIELDED) (identifier: urn:oid:2.16.840.1.113883.10.20.22.5.1) (CONF:1198-31645) null
-ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNameUse = Consol Referral Note (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) each SHALL contain exactly one [1..1] associatedPerson, where  (CONF:1198-31644) This associatedPerson SHALL contain at least one [1..*] US Realm Patient Name (PTN.US.FIELDED) (identifier: urn:oid:2.16.840.1.113883.10.20.22.5.1) (CONF:1198-31645) name SHALL contain zero or one [0..1] @use, which SHALL be selected from ValueSet EntityNameUse 2.16.840.1.113883.1.11.15913 STATIC
+ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonGeneralHeaderConstraintsUSRealmPersonNameUse = Consol Referral Note (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) each SHALL contain exactly one [1..1] associatedPerson, where  (CONF:1198-31644) This associatedPerson SHALL contain at least one [1..*] US Realm Patient Name (PTN.US.FIELDED) (identifier: urn:oid:2.16.840.1.113883.10.20.22.5.1) (CONF:1198-31645) name SHALL contain zero or one [0..1] @use, which SHALL be selected from ValueSet EntityNameUse 2.16.840.1.113883.1.11.15913 STATIC
 ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityAssociatedPersonName = Consol Referral Note (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) each SHALL contain exactly one [1..1] associatedPerson, where  (CONF:1198-31644) This associatedPerson SHALL contain at least one [1..*] US Realm Patient Name (PTN.US.FIELDED) (identifier: urn:oid:2.16.840.1.113883.10.20.22.5.1) (CONF:1198-31645)
 ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityClassCode = Consol Referral Note (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) associatedEntity SHALL contain exactly one [1..1] @classCode, which SHALL be selected from ValueSet INDRoleclassCodes 2.16.840.1.113883.11.20.9.33 DYNAMIC (CONF:1198-31925)
 ReferralNoteReferralNoteParticipantCaregiverAssociatedEntityClassCodeP = Consol Referral Note (V2) SHOULD contain zero or more [0..*] participant, where its type is Participant Caregiver (CONF:1198-31642) each SHALL contain exactly one [1..1] associatedEntity, where  (CONF:1198-31643) associatedEntity SHALL contain exactly one [1..1] @classCode, which SHALL be selected from ValueSet INDRoleclassCodes 2.16.840.1.113883.11.20.9.33 DYNAMIC (CONF:1198-31925)
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/ConsolPackage.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/ConsolPackage.java
index 2e947b409f..1ed88a9931 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/ConsolPackage.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/ConsolPackage.java
@@ -8696,6 +8696,15 @@ public interface ConsolPackage extends EPackage {
 	 */
 	int RESULT_ORGANIZER__CODE = CDAPackage.ORGANIZER__CODE;
 
+	/**
+	 * The feature id for the '<em><b>STDC Text</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESULT_ORGANIZER__STDC_TEXT = CDAPackage.ORGANIZER__STDC_TEXT;
+
 	/**
 	 * The feature id for the '<em><b>Status Code</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -10848,6 +10857,15 @@ public interface ConsolPackage extends EPackage {
 	 */
 	int FAMILY_HISTORY_ORGANIZER__CODE = CDAPackage.ORGANIZER__CODE;
 
+	/**
+	 * The feature id for the '<em><b>STDC Text</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FAMILY_HISTORY_ORGANIZER__STDC_TEXT = CDAPackage.ORGANIZER__STDC_TEXT;
+
 	/**
 	 * The feature id for the '<em><b>Status Code</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -11815,6 +11833,15 @@ public interface ConsolPackage extends EPackage {
 	 */
 	int FUNCTIONAL_STATUS_RESULT_ORGANIZER__CODE = RESULT_ORGANIZER__CODE;
 
+	/**
+	 * The feature id for the '<em><b>STDC Text</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FUNCTIONAL_STATUS_RESULT_ORGANIZER__STDC_TEXT = RESULT_ORGANIZER__STDC_TEXT;
+
 	/**
 	 * The feature id for the '<em><b>Status Code</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -13197,6 +13224,15 @@ public interface ConsolPackage extends EPackage {
 	 */
 	int COGNITIVE_STATUS_RESULT_ORGANIZER__CODE = RESULT_ORGANIZER__CODE;
 
+	/**
+	 * The feature id for the '<em><b>STDC Text</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COGNITIVE_STATUS_RESULT_ORGANIZER__STDC_TEXT = RESULT_ORGANIZER__STDC_TEXT;
+
 	/**
 	 * The feature id for the '<em><b>Status Code</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -20399,6 +20435,15 @@ public interface ConsolPackage extends EPackage {
 	 */
 	int VITAL_SIGNS_ORGANIZER__CODE = CDAPackage.ORGANIZER__CODE;
 
+	/**
+	 * The feature id for the '<em><b>STDC Text</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VITAL_SIGNS_ORGANIZER__STDC_TEXT = CDAPackage.ORGANIZER__STDC_TEXT;
+
 	/**
 	 * The feature id for the '<em><b>Status Code</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -37909,6 +37954,15 @@ public interface ConsolPackage extends EPackage {
 	 */
 	int ADVANCE_DIRECTIVE_ORGANIZER__CODE = CDAPackage.ORGANIZER__CODE;
 
+	/**
+	 * The feature id for the '<em><b>STDC Text</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ADVANCE_DIRECTIVE_ORGANIZER__STDC_TEXT = CDAPackage.ORGANIZER__STDC_TEXT;
+
 	/**
 	 * The feature id for the '<em><b>Status Code</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -39761,6 +39815,15 @@ public interface ConsolPackage extends EPackage {
 	 */
 	int MEDICAL_EQUIPMENT_ORGANIZER__CODE = CDAPackage.ORGANIZER__CODE;
 
+	/**
+	 * The feature id for the '<em><b>STDC Text</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MEDICAL_EQUIPMENT_ORGANIZER__STDC_TEXT = CDAPackage.ORGANIZER__STDC_TEXT;
+
 	/**
 	 * The feature id for the '<em><b>Status Code</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -47566,6 +47629,15 @@ public interface ConsolPackage extends EPackage {
 	 */
 	int FAMILY_HISTORY_ORGANIZER2__CODE = FAMILY_HISTORY_ORGANIZER__CODE;
 
+	/**
+	 * The feature id for the '<em><b>STDC Text</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FAMILY_HISTORY_ORGANIZER2__STDC_TEXT = FAMILY_HISTORY_ORGANIZER__STDC_TEXT;
+
 	/**
 	 * The feature id for the '<em><b>Status Code</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -55875,6 +55947,15 @@ public interface ConsolPackage extends EPackage {
 	 */
 	int RESULT_ORGANIZER2__CODE = RESULT_ORGANIZER__CODE;
 
+	/**
+	 * The feature id for the '<em><b>STDC Text</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RESULT_ORGANIZER2__STDC_TEXT = RESULT_ORGANIZER__STDC_TEXT;
+
 	/**
 	 * The feature id for the '<em><b>Status Code</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -59340,6 +59421,15 @@ public interface ConsolPackage extends EPackage {
 	 */
 	int MENTAL_STATUS_ORGANIZER2__CODE = COGNITIVE_STATUS_RESULT_ORGANIZER__CODE;
 
+	/**
+	 * The feature id for the '<em><b>STDC Text</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MENTAL_STATUS_ORGANIZER2__STDC_TEXT = COGNITIVE_STATUS_RESULT_ORGANIZER__STDC_TEXT;
+
 	/**
 	 * The feature id for the '<em><b>Status Code</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -63239,6 +63329,15 @@ public interface ConsolPackage extends EPackage {
 	 */
 	int VITAL_SIGNS_ORGANIZER2__CODE = VITAL_SIGNS_ORGANIZER__CODE;
 
+	/**
+	 * The feature id for the '<em><b>STDC Text</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VITAL_SIGNS_ORGANIZER2__STDC_TEXT = VITAL_SIGNS_ORGANIZER__STDC_TEXT;
+
 	/**
 	 * The feature id for the '<em><b>Status Code</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -63590,6 +63689,15 @@ public interface ConsolPackage extends EPackage {
 	 */
 	int FUNCTIONAL_STATUS_ORGANIZER2__CODE = FUNCTIONAL_STATUS_RESULT_ORGANIZER__CODE;
 
+	/**
+	 * The feature id for the '<em><b>STDC Text</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FUNCTIONAL_STATUS_ORGANIZER2__STDC_TEXT = FUNCTIONAL_STATUS_RESULT_ORGANIZER__STDC_TEXT;
+
 	/**
 	 * The feature id for the '<em><b>Status Code</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -74414,6 +74522,15 @@ public interface ConsolPackage extends EPackage {
 	 */
 	int CARE_TEAM_ORGANIZER__CODE = CDAPackage.ORGANIZER__CODE;
 
+	/**
+	 * The feature id for the '<em><b>STDC Text</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CARE_TEAM_ORGANIZER__STDC_TEXT = CDAPackage.ORGANIZER__STDC_TEXT;
+
 	/**
 	 * The feature id for the '<em><b>Status Code</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -79644,6 +79761,15 @@ public interface ConsolPackage extends EPackage {
 	 */
 	int UDI_ORGANIZER__CODE = CDAPackage.ORGANIZER__CODE;
 
+	/**
+	 * The feature id for the '<em><b>STDC Text</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UDI_ORGANIZER__STDC_TEXT = CDAPackage.ORGANIZER__STDC_TEXT;
+
 	/**
 	 * The feature id for the '<em><b>Status Code</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/LotOrBatchNumberObservation.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/LotOrBatchNumberObservation.java
index da94a86fac..be1f9606e8 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/LotOrBatchNumberObservation.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/LotOrBatchNumberObservation.java
@@ -64,7 +64,7 @@ public interface LotOrBatchNumberObservation extends Observation {
 	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
 	 * @param context The cache of context-specific information.
 	 * <!-- end-model-doc -->
-	 * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='(self.value-&gt;isEmpty() or self.value-&gt;exists(element | element.isNullFlavorUndefined())) implies (self.value-&gt;size() =  1 and self.value-&gt;forAll(element | element.oclIsTypeOf(datatypes::ST)))'"
+	 * @model annotation="http://www.eclipse.org/uml2/1.1.0/GenModel body='(self.value-&gt;isEmpty() or self.value-&gt;exists(element | element.isNullFlavorUndefined())) implies (self.value-&gt;size() =  1 and self.value-&gt;forAll(element | element.oclIsTypeOf(datatypes::ED)))'"
 	 * @generated
 	 */
 	boolean validateLotOrBatchNumberObservationValue(DiagnosticChain diagnostics, Map<Object, Object> context);
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/impl/ConsolPackageImpl.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/impl/ConsolPackageImpl.java
index 44234716b2..bdebf0142b 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/impl/ConsolPackageImpl.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/impl/ConsolPackageImpl.java
@@ -2484,7 +2484,7 @@ private ConsolPackageImpl() {
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
+	 *
 	 * <p>This method is used to initialize {@link ConsolPackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdmissionDiagnosisSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdmissionDiagnosisSection2Operations.java
index e1122dfc40..8ce527a22b 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdmissionDiagnosisSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdmissionDiagnosisSection2Operations.java
@@ -78,7 +78,7 @@ protected AdmissionDiagnosisSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_DIAGNOSIS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_DIAGNOSIS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -149,7 +149,7 @@ public static boolean validateAdmissionDiagnosisSection2TemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADMISSION_DIAGNOSIS_SECTION2_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADMISSION_DIAGNOSIS_SECTION2_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -223,7 +223,7 @@ public static boolean validateAdmissionDiagnosisSection2CETranslation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADMISSION_DIAGNOSIS_SECTION2_CE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADMISSION_DIAGNOSIS_SECTION2_CE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -344,7 +344,7 @@ public static HospitalAdmissionDiagnosis2 getConsolHospitalAdmissionDiagnosis2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -396,7 +396,7 @@ public static boolean validateHospitalAdmissionDiagnosisSectionCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.HospitalAdmissionDiagnosisSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.HospitalAdmissionDiagnosisSectionCodeP", passToken);
 				}
@@ -429,7 +429,7 @@ public static boolean validateHospitalAdmissionDiagnosisSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -506,7 +506,7 @@ public static boolean validateHospitalAdmissionDiagnosisSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION_HOSPITAL_ADMISSION_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION_HOSPITAL_ADMISSION_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdmissionMedication2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdmissionMedication2Operations.java
index 0aa3efadd1..ac8f300864 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdmissionMedication2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdmissionMedication2Operations.java
@@ -80,7 +80,7 @@ protected AdmissionMedication2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -172,7 +172,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(Admission
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_MEDICATION_ACTIVITY2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity2> result = (Collection<MedicationActivity2>) query.evaluate(admissionMedication2);
-		return new BasicEList.UnmodifiableEList<MedicationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -194,7 +194,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(Admission
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -242,7 +242,7 @@ public static boolean validateAdmissionMedicationCodeP(AdmissionMedication2 admi
 					"org.openhealthtools.mdht.uml.cda.consol.AdmissionMedicationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.AdmissionMedicationCodeP", passToken);
 				}
 				passToken.add(admissionMedication2);
@@ -274,7 +274,7 @@ public static boolean validateAdmissionMedicationCodeP(AdmissionMedication2 admi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -347,7 +347,7 @@ public static boolean validateAdmissionMedicationCode(AdmissionMedication2 admis
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdmissionMedicationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdmissionMedicationOperations.java
index 5beff65a7e..72099ea8b3 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdmissionMedicationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdmissionMedicationOperations.java
@@ -87,7 +87,7 @@ protected AdmissionMedicationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -153,7 +153,7 @@ public static boolean validateAdmissionMedicationTemplateId(AdmissionMedication
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -246,7 +246,7 @@ public static boolean validateAdmissionMedicationCodeP(AdmissionMedication admis
 					"org.openhealthtools.mdht.uml.cda.consol.AdmissionMedicationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.AdmissionMedicationCodeP", passToken);
 				}
 				passToken.add(admissionMedication);
@@ -328,7 +328,7 @@ public static boolean validateAdmissionMedicationCode(AdmissionMedication admiss
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAdmissionMedicationCodeP(AdmissionMedication, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Admission Medication Code P</em>}' operation.
@@ -349,7 +349,7 @@ public static boolean validateAdmissionMedicationCode(AdmissionMedication admiss
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAdmissionMedicationCode(AdmissionMedication, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Admission Medication Code</em>}' operation.
@@ -372,7 +372,7 @@ public static boolean validateAdmissionMedicationCode(AdmissionMedication admiss
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -437,7 +437,7 @@ public static boolean validateAdmissionMedicationMoodCode(AdmissionMedication ad
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADMISSION_MEDICATION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -529,7 +529,7 @@ public static EList<MedicationActivity> getMedicationActivities(AdmissionMedicat
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_MEDICATION_ACTIVITIES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity> result = (Collection<MedicationActivity>) query.evaluate(admissionMedication);
-		return new BasicEList.UnmodifiableEList<MedicationActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // AdmissionMedicationOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdmissionMedicationsSectionEntriesOptional2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdmissionMedicationsSectionEntriesOptional2Operations.java
index 49951c4185..f961e7589c 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdmissionMedicationsSectionEntriesOptional2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdmissionMedicationsSectionEntriesOptional2Operations.java
@@ -105,7 +105,7 @@ public static EList<AdmissionMedication2> getConsolAdmissionMedication2s(
 		@SuppressWarnings("unchecked")
 		Collection<AdmissionMedication2> result = (Collection<AdmissionMedication2>) query.evaluate(
 			admissionMedicationsSectionEntriesOptional2);
-		return new BasicEList.UnmodifiableEList<AdmissionMedication2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -127,7 +127,7 @@ public static EList<AdmissionMedication2> getConsolAdmissionMedication2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -199,7 +199,7 @@ public static boolean validateHospitalAdmissionMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -254,7 +254,7 @@ public static boolean validateHospitalAdmissionMedicationsSectionEntriesOptional
 					"org.openhealthtools.mdht.uml.cda.consol.HospitalAdmissionMedicationsSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.HospitalAdmissionMedicationsSectionEntriesOptionalCodeP",
 						passToken);
@@ -288,7 +288,7 @@ public static boolean validateHospitalAdmissionMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -370,7 +370,7 @@ public static boolean validateHospitalAdmissionMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_ADMISSION_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_ADMISSION_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectiveObservation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectiveObservation2Operations.java
index a010c5e153..3ebf1cf1d3 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectiveObservation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectiveObservation2Operations.java
@@ -113,7 +113,7 @@ protected AdvanceDirectiveObservation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -182,7 +182,7 @@ public static boolean validateAdvanceDirectiveObservation2TemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -251,7 +251,7 @@ public static boolean validateAdvanceDirectiveObservation2Value(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -323,7 +323,7 @@ public static boolean validateAdvanceDirectiveObservation2AuthorParticipation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_CD_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_CD_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -398,7 +398,7 @@ public static boolean validateAdvanceDirectiveObservation2CDTranslation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_CD_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_CD_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -473,7 +473,7 @@ public static boolean validateAdvanceDirectiveObservation2CDTranslationP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -547,7 +547,7 @@ public static boolean validateAdvanceDirectiveObservation2IVLTSLow(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -621,7 +621,7 @@ public static boolean validateAdvanceDirectiveObservation2IVLTSHigh(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_VERIFIER_PARTICIPANT_ROLE_PLAYING_ENTITY_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_VERIFIER_PARTICIPANT_ROLE_PLAYING_ENTITY_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -697,7 +697,7 @@ public static boolean validateAdvanceDirectiveObservation2VerifierParticipantRol
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_VERIFIER_PARTICIPANT_ROLE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_VERIFIER_PARTICIPANT_ROLE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -753,7 +753,7 @@ public static boolean validateAdvanceDirectiveObservation2VerifierParticipantRol
 						"org.openhealthtools.mdht.uml.cda.consol.AdvanceDirectiveObservation2VerifierParticipantRoleCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.AdvanceDirectiveObservation2VerifierParticipantRoleCodeP",
 							passToken);
@@ -788,7 +788,7 @@ public static boolean validateAdvanceDirectiveObservation2VerifierParticipantRol
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_VERIFIER_PARTICIPANT_ROLE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_VERIFIER_PARTICIPANT_ROLE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -873,7 +873,7 @@ public static boolean validateAdvanceDirectiveObservation2VerifierParticipantRol
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_VERIFIER_PARTICIPANT_ROLE_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_VERIFIER_PARTICIPANT_ROLE_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -948,7 +948,7 @@ public static boolean validateAdvanceDirectiveObservation2VerifierParticipantRol
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_VERIFIER_PARTICIPANT_ROLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_VERIFIER_PARTICIPANT_ROLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1024,7 +1024,7 @@ public static boolean validateAdvanceDirectiveObservation2VerifierParticipantRol
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_VERIFIER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_VERIFIER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1099,7 +1099,7 @@ public static boolean validateAdvanceDirectiveObservation2VerifierTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_CUSTODIAN_CUSTODIAN_ROLE_CUSTODIAN_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_CUSTODIAN_CUSTODIAN_ROLE_CUSTODIAN_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1157,7 +1157,7 @@ public static boolean validateAdvanceDirectiveObservation2CustodianCustodianRole
 						"org.openhealthtools.mdht.uml.cda.consol.AdvanceDirectiveObservation2CustodianCustodianRoleCustodianEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.AdvanceDirectiveObservation2CustodianCustodianRoleCustodianEntityCodeP",
 							passToken);
@@ -1192,7 +1192,7 @@ public static boolean validateAdvanceDirectiveObservation2CustodianCustodianRole
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_CUSTODIAN_CUSTODIAN_ROLE_CUSTODIAN_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_CUSTODIAN_CUSTODIAN_ROLE_CUSTODIAN_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1279,7 +1279,7 @@ public static boolean validateAdvanceDirectiveObservation2CustodianCustodianRole
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_CUSTODIAN_CUSTODIAN_ROLE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_CUSTODIAN_CUSTODIAN_ROLE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1335,7 +1335,7 @@ public static boolean validateAdvanceDirectiveObservation2CustodianCustodianRole
 						"org.openhealthtools.mdht.uml.cda.consol.AdvanceDirectiveObservation2CustodianCustodianRoleCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.AdvanceDirectiveObservation2CustodianCustodianRoleCodeP",
 							passToken);
@@ -1370,7 +1370,7 @@ public static boolean validateAdvanceDirectiveObservation2CustodianCustodianRole
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_CUSTODIAN_CUSTODIAN_ROLE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_CUSTODIAN_CUSTODIAN_ROLE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1455,7 +1455,7 @@ public static boolean validateAdvanceDirectiveObservation2CustodianCustodianRole
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_REFERENCE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_TEXT_MEDIA_TYPE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_REFERENCE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_TEXT_MEDIA_TYPE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1532,7 +1532,7 @@ public static boolean validateAdvanceDirectiveObservation2ReferenceAdvanceDirect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_REFERENCE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_REFERENCE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1609,7 +1609,7 @@ public static boolean validateAdvanceDirectiveObservation2ReferenceAdvanceDirect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION2_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1686,7 +1686,7 @@ public static boolean validateAdvanceDirectiveObservation2AdvanceDirectiveObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_HAS_STARTING_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_HAS_STARTING_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1756,7 +1756,7 @@ public static boolean validateAdvanceDirectiveObservationHasStartingTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_HAS_ENDING_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_HAS_ENDING_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1826,7 +1826,7 @@ public static boolean validateAdvanceDirectiveObservationHasEndingTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1877,7 +1877,7 @@ public static boolean validateAdvanceDirectiveObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.AdvanceDirectiveObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.AdvanceDirectiveObservationCodeP", passToken);
 				}
 				passToken.add(advanceDirectiveObservation2);
@@ -1909,7 +1909,7 @@ public static boolean validateAdvanceDirectiveObservationCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1986,7 +1986,7 @@ public static boolean validateAdvanceDirectiveObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2056,7 +2056,7 @@ public static boolean validateAdvanceDirectiveObservationEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_VERIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_VERIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2125,7 +2125,7 @@ public static boolean validateAdvanceDirectiveObservationVerifier(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2194,7 +2194,7 @@ public static boolean validateAdvanceDirectiveObservationCustodian(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2263,7 +2263,7 @@ public static boolean validateAdvanceDirectiveObservationReference(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_VERIFIER_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_VERIFIER_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2338,7 +2338,7 @@ public static boolean validateAdvanceDirectiveObservationVerifierTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_VERIFIER_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_VERIFIER_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2413,7 +2413,7 @@ public static boolean validateAdvanceDirectiveObservationVerifierParticipantRole
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_CUSTODIAN_ROLE_CUSTODIAN_ENTITY_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_CUSTODIAN_ROLE_CUSTODIAN_ENTITY_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2489,7 +2489,7 @@ public static boolean validateAdvanceDirectiveObservationCustodianCustodianRoleC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_CUSTODIAN_ROLE_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_CUSTODIAN_ROLE_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2564,7 +2564,7 @@ public static boolean validateAdvanceDirectiveObservationCustodianCustodianRoleA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_CUSTODIAN_ROLE_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_CUSTODIAN_ROLE_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2639,7 +2639,7 @@ public static boolean validateAdvanceDirectiveObservationCustodianCustodianRoleT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_CUSTODIAN_ROLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_CUSTODIAN_ROLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2715,7 +2715,7 @@ public static boolean validateAdvanceDirectiveObservationCustodianCustodianRoleP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2792,7 +2792,7 @@ public static boolean validateAdvanceDirectiveObservationCustodianAdvanceDirecti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2867,7 +2867,7 @@ public static boolean validateAdvanceDirectiveObservationReferenceExternalDocume
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2944,7 +2944,7 @@ public static boolean validateAdvanceDirectiveObservationReferenceExternalDocume
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectiveObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectiveObservationOperations.java
index deddc5ff77..606d8230c4 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectiveObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectiveObservationOperations.java
@@ -108,7 +108,7 @@ protected AdvanceDirectiveObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_HAS_STARTING_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_HAS_STARTING_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -178,7 +178,7 @@ public static boolean validateAdvanceDirectiveObservationHasStartingTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_HAS_ENDING_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_HAS_ENDING_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -248,7 +248,7 @@ public static boolean validateAdvanceDirectiveObservationHasEndingTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -317,7 +317,7 @@ public static boolean validateAdvanceDirectiveObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -386,7 +386,7 @@ public static boolean validateAdvanceDirectiveObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -455,7 +455,7 @@ public static boolean validateAdvanceDirectiveObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -521,7 +521,7 @@ public static boolean validateAdvanceDirectiveObservationId(AdvanceDirectiveObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -572,7 +572,7 @@ public static boolean validateAdvanceDirectiveObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.AdvanceDirectiveObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.AdvanceDirectiveObservationCodeP", passToken);
 				}
 				passToken.add(advanceDirectiveObservation);
@@ -604,7 +604,7 @@ public static boolean validateAdvanceDirectiveObservationCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -681,7 +681,7 @@ public static boolean validateAdvanceDirectiveObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -750,7 +750,7 @@ public static boolean validateAdvanceDirectiveObservationStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -820,7 +820,7 @@ public static boolean validateAdvanceDirectiveObservationEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_VERIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_VERIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -889,7 +889,7 @@ public static boolean validateAdvanceDirectiveObservationVerifier(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -958,7 +958,7 @@ public static boolean validateAdvanceDirectiveObservationCustodian(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1027,7 +1027,7 @@ public static boolean validateAdvanceDirectiveObservationReference(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_VERIFIER_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_VERIFIER_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1102,7 +1102,7 @@ public static boolean validateAdvanceDirectiveObservationVerifierTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_VERIFIER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_VERIFIER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1177,7 +1177,7 @@ public static boolean validateAdvanceDirectiveObservationVerifierTypeCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_VERIFIER_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_VERIFIER_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1252,7 +1252,7 @@ public static boolean validateAdvanceDirectiveObservationVerifierParticipantRole
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_CUSTODIAN_ROLE_CUSTODIAN_ENTITY_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_CUSTODIAN_ROLE_CUSTODIAN_ENTITY_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1328,7 +1328,7 @@ public static boolean validateAdvanceDirectiveObservationCustodianCustodianRoleC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_CUSTODIAN_ROLE_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_CUSTODIAN_ROLE_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1403,7 +1403,7 @@ public static boolean validateAdvanceDirectiveObservationCustodianCustodianRoleA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_CUSTODIAN_ROLE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_CUSTODIAN_ROLE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1478,7 +1478,7 @@ public static boolean validateAdvanceDirectiveObservationCustodianCustodianRoleC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_CUSTODIAN_ROLE_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_CUSTODIAN_ROLE_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1553,7 +1553,7 @@ public static boolean validateAdvanceDirectiveObservationCustodianCustodianRoleT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_CUSTODIAN_ROLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_CUSTODIAN_ROLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1629,7 +1629,7 @@ public static boolean validateAdvanceDirectiveObservationCustodianCustodianRoleP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1704,7 +1704,7 @@ public static boolean validateAdvanceDirectiveObservationCustodianTypeCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_ADVANCE_DIRECTIVE_OBSERVATION_CUSTODIAN_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1781,7 +1781,7 @@ public static boolean validateAdvanceDirectiveObservationCustodianAdvanceDirecti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_TEXT_MEDIA_TYPE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_TEXT_MEDIA_TYPE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1857,7 +1857,7 @@ public static boolean validateAdvanceDirectiveObservationReferenceExternalDocume
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1933,7 +1933,7 @@ public static boolean validateAdvanceDirectiveObservationReferenceExternalDocume
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2008,7 +2008,7 @@ public static boolean validateAdvanceDirectiveObservationReferenceExternalDocume
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2085,7 +2085,7 @@ public static boolean validateAdvanceDirectiveObservationReferenceExternalDocume
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2160,7 +2160,7 @@ public static boolean validateAdvanceDirectiveObservationReferenceTypeCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVE_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectiveOrganizerOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectiveOrganizerOperations.java
index f3c68c1fc6..b4c3fafd3a 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectiveOrganizerOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectiveOrganizerOperations.java
@@ -87,7 +87,7 @@ protected AdvanceDirectiveOrganizerOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -155,7 +155,7 @@ public static boolean validateAdvanceDirectiveOrganizerTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -223,7 +223,7 @@ public static boolean validateAdvanceDirectiveOrganizerClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -290,7 +290,7 @@ public static boolean validateAdvanceDirectiveOrganizerMoodCode(AdvanceDirective
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -358,7 +358,7 @@ public static boolean validateAdvanceDirectiveOrganizerId(AdvanceDirectiveOrgani
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -424,7 +424,7 @@ public static boolean validateAdvanceDirectiveOrganizerCode(AdvanceDirectiveOrga
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -491,7 +491,7 @@ public static boolean validateAdvanceDirectiveOrganizerCodeP(AdvanceDirectiveOrg
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -543,7 +543,7 @@ public static boolean validateAdvanceDirectiveOrganizerStatusCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.AdvanceDirectiveOrganizerStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.AdvanceDirectiveOrganizerStatusCodeP", passToken);
 				}
@@ -575,7 +575,7 @@ public static boolean validateAdvanceDirectiveOrganizerStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -651,7 +651,7 @@ public static boolean validateAdvanceDirectiveOrganizerStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_ADVANCE_DIRECTIVE_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_ADVANCE_DIRECTIVE_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -721,7 +721,7 @@ public static boolean validateAdvanceDirectiveOrganizerAdvanceDirectiveObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVE_ORGANIZER_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -819,7 +819,7 @@ public static EList<AdvanceDirectiveObservation2> getAdvanceDirectiveObservation
 		@SuppressWarnings("unchecked")
 		Collection<AdvanceDirectiveObservation2> result = (Collection<AdvanceDirectiveObservation2>) query.evaluate(
 			advanceDirectiveOrganizer);
-		return new BasicEList.UnmodifiableEList<AdvanceDirectiveObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // AdvanceDirectiveOrganizerOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectivesSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectivesSection2Operations.java
index f5255f6289..55e7eb7d7e 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectivesSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectivesSection2Operations.java
@@ -92,7 +92,7 @@ protected AdvanceDirectivesSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION2_HAS_ADVANCE_DIRECTIVE_OBSERVATION2_XOR_ADVANCE_DIRECTIVE_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION2_HAS_ADVANCE_DIRECTIVE_OBSERVATION2_XOR_ADVANCE_DIRECTIVE_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -209,7 +209,7 @@ public static boolean validateAdvanceDirectivesSection2Text(AdvanceDirectivesSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAdvanceDirectivesSection2Text(AdvanceDirectivesSection2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Advance Directives Section2 Text</em>}' operation.
@@ -230,7 +230,7 @@ public static boolean validateAdvanceDirectivesSection2Text(AdvanceDirectivesSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -296,7 +296,7 @@ public static boolean validateAdvanceDirectivesSection2Title(AdvanceDirectivesSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION2_ENTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION2_ENTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -362,7 +362,7 @@ public static boolean validateAdvanceDirectivesSection2Entry(AdvanceDirectivesSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVES_SECTION2_ENTRY_HAS_ADVANCE_DIRECTIVE_OBSERVATION2_XOR_ADVANCE_DIRECTIVE_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVES_SECTION2_ENTRY_HAS_ADVANCE_DIRECTIVE_OBSERVATION2_XOR_ADVANCE_DIRECTIVE_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -439,7 +439,7 @@ public static boolean validateAdvanceDirectivesSection2EntryHasAdvanceDirectiveO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVES_SECTION2_ENTRY_ADVANCE_DIRECTIVE_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVES_SECTION2_ENTRY_ADVANCE_DIRECTIVE_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -514,7 +514,7 @@ public static boolean validateAdvanceDirectivesSection2EntryAdvanceDirectiveOrga
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVES_SECTION2_ENTRY_ADVANCE_DIRECTIVE_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ADVANCE_DIRECTIVES_SECTION2_ENTRY_ADVANCE_DIRECTIVE_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -621,7 +621,7 @@ public static boolean validateAdvanceDirectivesSectionEntriesOptionalCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.AdvanceDirectivesSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.AdvanceDirectivesSectionEntriesOptionalCodeP",
 						passToken);
@@ -818,7 +818,7 @@ public static EList<AdvanceDirectiveObservation2> getConsolAdvanceDirectiveObser
 		@SuppressWarnings("unchecked")
 		Collection<AdvanceDirectiveObservation2> result = (Collection<AdvanceDirectiveObservation2>) query.evaluate(
 			advanceDirectivesSection2);
-		return new BasicEList.UnmodifiableEList<AdvanceDirectiveObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -868,7 +868,7 @@ public static EList<AdvanceDirectiveOrganizer> getConsolAdvanceDirectiveOrganize
 		@SuppressWarnings("unchecked")
 		Collection<AdvanceDirectiveOrganizer> result = (Collection<AdvanceDirectiveOrganizer>) query.evaluate(
 			advanceDirectivesSection2);
-		return new BasicEList.UnmodifiableEList<AdvanceDirectiveOrganizer>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -890,7 +890,7 @@ public static EList<AdvanceDirectiveOrganizer> getConsolAdvanceDirectiveOrganize
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -960,7 +960,7 @@ public static boolean validateAdvanceDirectivesSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAdvanceDirectivesSectionEntriesOptionalCode(AdvanceDirectivesSection2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Advance Directives Section Entries Optional Code</em>}' operation.
@@ -983,7 +983,7 @@ public static boolean validateAdvanceDirectivesSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAdvanceDirectivesSectionEntriesOptional2AdvanceDirectiveOrganizer(AdvanceDirectivesSection2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Advance Directives Section Entries Optional2 Advance Directive Organizer</em>}' operation.
@@ -1004,7 +1004,7 @@ public static boolean validateAdvanceDirectivesSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL2_ADVANCE_DIRECTIVE_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL2_ADVANCE_DIRECTIVE_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAdvanceDirectivesSectionEntriesOptionalAdvanceDirectiveObservation(AdvanceDirectivesSection2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Advance Directives Section Entries Optional Advance Directive Observation</em>}' operation.
@@ -1025,7 +1025,7 @@ public static boolean validateAdvanceDirectivesSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_ADVANCE_DIRECTIVE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_ADVANCE_DIRECTIVE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #getConsolAdvanceDirectiveObservation2s(AdvanceDirectivesSection2) <em>Get Consol Advance Directive Observation2s</em>}' operation.
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectivesSectionEntriesOptional2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectivesSectionEntriesOptional2Operations.java
index 22d73c50f7..87bee03a79 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectivesSectionEntriesOptional2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectivesSectionEntriesOptional2Operations.java
@@ -84,7 +84,7 @@ protected AdvanceDirectivesSectionEntriesOptional2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL2_ADVANCE_DIRECTIVE_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL2_ADVANCE_DIRECTIVE_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -184,7 +184,7 @@ public static EList<AdvanceDirectiveOrganizer> getAdvanceDirectiveOrganizers(
 		@SuppressWarnings("unchecked")
 		Collection<AdvanceDirectiveOrganizer> result = (Collection<AdvanceDirectiveOrganizer>) query.evaluate(
 			advanceDirectivesSectionEntriesOptional2);
-		return new BasicEList.UnmodifiableEList<AdvanceDirectiveOrganizer>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -234,7 +234,7 @@ public static EList<AdvanceDirectiveObservation2> getConsolAdvanceDirectiveObser
 		@SuppressWarnings("unchecked")
 		Collection<AdvanceDirectiveObservation2> result = (Collection<AdvanceDirectiveObservation2>) query.evaluate(
 			advanceDirectivesSectionEntriesOptional2);
-		return new BasicEList.UnmodifiableEList<AdvanceDirectiveObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -256,7 +256,7 @@ public static EList<AdvanceDirectiveObservation2> getConsolAdvanceDirectiveObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -327,7 +327,7 @@ public static boolean validateAdvanceDirectivesSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -380,7 +380,7 @@ public static boolean validateAdvanceDirectivesSectionEntriesOptionalCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.AdvanceDirectivesSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.AdvanceDirectivesSectionEntriesOptionalCodeP",
 						passToken);
@@ -414,7 +414,7 @@ public static boolean validateAdvanceDirectivesSectionEntriesOptionalCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -493,7 +493,7 @@ public static boolean validateAdvanceDirectivesSectionEntriesOptionalCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_ADVANCE_DIRECTIVE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_ADVANCE_DIRECTIVE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectivesSectionEntriesOptionalOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectivesSectionEntriesOptionalOperations.java
index a7c84e921c..c58cb99fed 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectivesSectionEntriesOptionalOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectivesSectionEntriesOptionalOperations.java
@@ -87,7 +87,7 @@ protected AdvanceDirectivesSectionEntriesOptionalOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -160,7 +160,7 @@ public static boolean validateAdvanceDirectivesSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -230,7 +230,7 @@ public static boolean validateAdvanceDirectivesSectionEntriesOptionalCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -300,7 +300,7 @@ public static boolean validateAdvanceDirectivesSectionEntriesOptionalCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -370,7 +370,7 @@ public static boolean validateAdvanceDirectivesSectionEntriesOptionalTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -440,7 +440,7 @@ public static boolean validateAdvanceDirectivesSectionEntriesOptionalText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_ADVANCE_DIRECTIVE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_ADVANCE_DIRECTIVE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -540,7 +540,7 @@ public static EList<AdvanceDirectiveObservation> getAdvanceDirectiveObservations
 		@SuppressWarnings("unchecked")
 		Collection<AdvanceDirectiveObservation> result = (Collection<AdvanceDirectiveObservation>) query.evaluate(
 			advanceDirectivesSectionEntriesOptional);
-		return new BasicEList.UnmodifiableEList<AdvanceDirectiveObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // AdvanceDirectivesSectionEntriesOptionalOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectivesSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectivesSectionOperations.java
index a70f329475..79dd4fe140 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectivesSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AdvanceDirectivesSectionOperations.java
@@ -86,7 +86,7 @@ protected AdvanceDirectivesSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -152,7 +152,7 @@ public static boolean validateAdvanceDirectivesSectionTitle(AdvanceDirectivesSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -218,7 +218,7 @@ public static boolean validateAdvanceDirectivesSectionText(AdvanceDirectivesSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ADVANCE_DIRECTIVE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ADVANCE_DIRECTIVE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -316,7 +316,7 @@ public static EList<AdvanceDirectiveObservation> getConsolAdvanceDirectiveObserv
 		@SuppressWarnings("unchecked")
 		Collection<AdvanceDirectiveObservation> result = (Collection<AdvanceDirectiveObservation>) query.evaluate(
 			advanceDirectivesSection);
-		return new BasicEList.UnmodifiableEList<AdvanceDirectiveObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -338,7 +338,7 @@ public static EList<AdvanceDirectiveObservation> getConsolAdvanceDirectiveObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -408,7 +408,7 @@ public static boolean validateAdvanceDirectivesSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -461,7 +461,7 @@ public static boolean validateAdvanceDirectivesSectionEntriesOptionalCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.AdvanceDirectivesSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.AdvanceDirectivesSectionEntriesOptionalCodeP",
 						passToken);
@@ -495,7 +495,7 @@ public static boolean validateAdvanceDirectivesSectionEntriesOptionalCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AgeObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AgeObservationOperations.java
index 1e2a015680..df4e6f7fb5 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AgeObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AgeObservationOperations.java
@@ -84,7 +84,7 @@ protected AgeObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_AGE_OBSERVATION_VALUE_UNITS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_AGE_OBSERVATION_VALUE_UNITS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -149,7 +149,7 @@ public static boolean validateAgeObservationValueUnits(AgeObservation ageObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_AGE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_AGE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -214,7 +214,7 @@ public static boolean validateAgeObservationTemplateId(AgeObservation ageObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_AGE_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_AGE_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -279,7 +279,7 @@ public static boolean validateAgeObservationClassCode(AgeObservation ageObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_AGE_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_AGE_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -344,7 +344,7 @@ public static boolean validateAgeObservationMoodCode(AgeObservation ageObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_AGE_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_AGE_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -392,7 +392,7 @@ public static boolean validateAgeObservationCodeP(AgeObservation ageObservation,
 					"org.openhealthtools.mdht.uml.cda.consol.AgeObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.AgeObservationCodeP", passToken);
 				}
 				passToken.add(ageObservation);
@@ -424,7 +424,7 @@ public static boolean validateAgeObservationCodeP(AgeObservation ageObservation,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_AGE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_AGE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -498,7 +498,7 @@ public static boolean validateAgeObservationCode(AgeObservation ageObservation,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_AGE_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_AGE_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -563,7 +563,7 @@ public static boolean validateAgeObservationStatusCode(AgeObservation ageObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_AGE_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_AGE_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -628,7 +628,7 @@ public static boolean validateAgeObservationStatusCodeP(AgeObservation ageObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_AGE_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_AGE_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergiesSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergiesSection2Operations.java
index f9d2ae9928..7becff11d8 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergiesSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergiesSection2Operations.java
@@ -83,7 +83,7 @@ protected AllergiesSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateAllergiesSection2NullFlavor(AllergiesSection2 alle
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -213,7 +213,7 @@ public static boolean validateAllergiesSection2Title(AllergiesSection2 allergies
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -278,7 +278,7 @@ public static boolean validateAllergiesSection2Text(AllergiesSection2 allergiesS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -345,7 +345,7 @@ public static boolean validateAllergiesSectionEntriesOptionalTemplateId(Allergie
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -395,7 +395,7 @@ public static boolean validateAllergiesSectionEntriesOptionalCodeP(AllergiesSect
 					"org.openhealthtools.mdht.uml.cda.consol.AllergiesSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.AllergiesSectionEntriesOptionalCodeP", passToken);
 				}
@@ -428,7 +428,7 @@ public static boolean validateAllergiesSectionEntriesOptionalCodeP(AllergiesSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -503,7 +503,7 @@ public static boolean validateAllergiesSectionEntriesOptionalCode(AllergiesSecti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_ALLERGY_PROBLEM_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_ALLERGY_PROBLEM_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -597,7 +597,7 @@ public static EList<AllergyConcernAct2> getConsolAllergyConcernAct2s(AllergiesSe
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_ALLERGY_CONCERN_ACT2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<AllergyConcernAct2> result = (Collection<AllergyConcernAct2>) query.evaluate(allergiesSection2);
-		return new BasicEList.UnmodifiableEList<AllergyConcernAct2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // AllergiesSection2Operations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergiesSectionEntriesOptional2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergiesSectionEntriesOptional2Operations.java
index 87a6bbc73d..f7ac72d1ce 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergiesSectionEntriesOptional2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergiesSectionEntriesOptional2Operations.java
@@ -108,7 +108,7 @@ public static EList<AllergyConcernAct2> getConsolAllergyConcernAct2s(
 		@SuppressWarnings("unchecked")
 		Collection<AllergyConcernAct2> result = (Collection<AllergyConcernAct2>) query.evaluate(
 			allergiesSectionEntriesOptional2);
-		return new BasicEList.UnmodifiableEList<AllergyConcernAct2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -130,7 +130,7 @@ public static EList<AllergyConcernAct2> getConsolAllergyConcernAct2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -200,7 +200,7 @@ public static boolean validateAllergiesSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -253,7 +253,7 @@ public static boolean validateAllergiesSectionEntriesOptionalCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.AllergiesSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.AllergiesSectionEntriesOptionalCodeP", passToken);
 				}
@@ -286,7 +286,7 @@ public static boolean validateAllergiesSectionEntriesOptionalCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -365,7 +365,7 @@ public static boolean validateAllergiesSectionEntriesOptionalCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_ALLERGY_PROBLEM_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_ALLERGY_PROBLEM_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergiesSectionEntriesOptionalOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergiesSectionEntriesOptionalOperations.java
index 313105fc73..5c8d9b5652 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergiesSectionEntriesOptionalOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergiesSectionEntriesOptionalOperations.java
@@ -87,7 +87,7 @@ protected AllergiesSectionEntriesOptionalOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -159,7 +159,7 @@ public static boolean validateAllergiesSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -228,7 +228,7 @@ public static boolean validateAllergiesSectionEntriesOptionalCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -298,7 +298,7 @@ public static boolean validateAllergiesSectionEntriesOptionalCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -368,7 +368,7 @@ public static boolean validateAllergiesSectionEntriesOptionalTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -437,7 +437,7 @@ public static boolean validateAllergiesSectionEntriesOptionalText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_ALLERGY_PROBLEM_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_ALLERGY_PROBLEM_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -534,7 +534,7 @@ public static EList<AllergyProblemAct> getAllergyProblemActs(
 		@SuppressWarnings("unchecked")
 		Collection<AllergyProblemAct> result = (Collection<AllergyProblemAct>) query.evaluate(
 			allergiesSectionEntriesOptional);
-		return new BasicEList.UnmodifiableEList<AllergyProblemAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // AllergiesSectionEntriesOptionalOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergiesSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergiesSectionOperations.java
index 47a17631f3..666184c779 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergiesSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergiesSectionOperations.java
@@ -86,7 +86,7 @@ protected AllergiesSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateAllergiesSectionTitle(AllergiesSection allergiesSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -216,7 +216,7 @@ public static boolean validateAllergiesSectionText(AllergiesSection allergiesSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ALLERGY_PROBLEM_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ALLERGY_PROBLEM_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -309,7 +309,7 @@ public static EList<AllergyProblemAct> getConsolAllergyProblemActs(AllergiesSect
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_ALLERGY_PROBLEM_ACTS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<AllergyProblemAct> result = (Collection<AllergyProblemAct>) query.evaluate(allergiesSection);
-		return new BasicEList.UnmodifiableEList<AllergyProblemAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -331,7 +331,7 @@ public static EList<AllergyProblemAct> getConsolAllergyProblemActs(AllergiesSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -398,7 +398,7 @@ public static boolean validateAllergiesSectionEntriesOptionalTemplateId(Allergie
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -448,7 +448,7 @@ public static boolean validateAllergiesSectionEntriesOptionalCodeP(AllergiesSect
 					"org.openhealthtools.mdht.uml.cda.consol.AllergiesSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.AllergiesSectionEntriesOptionalCodeP", passToken);
 				}
@@ -481,7 +481,7 @@ public static boolean validateAllergiesSectionEntriesOptionalCodeP(AllergiesSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGIES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyConcernAct2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyConcernAct2Operations.java
index ab28330467..099bdc0db4 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyConcernAct2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyConcernAct2Operations.java
@@ -85,7 +85,7 @@ protected AllergyConcernAct2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_CONCERN_ACT2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_CONCERN_ACT2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateAllergyConcernAct2TemplateId(AllergyConcernAct2 al
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_CONCERN_ACT2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_CONCERN_ACT2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -244,7 +244,7 @@ public static EList<AllergyObservation2> getConsolAllergyObservation2s(AllergyCo
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_ALLERGY_OBSERVATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<AllergyObservation2> result = (Collection<AllergyObservation2>) query.evaluate(allergyConcernAct2);
-		return new BasicEList.UnmodifiableEList<AllergyObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -266,7 +266,7 @@ public static EList<AllergyObservation2> getConsolAllergyObservation2s(AllergyCo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -331,7 +331,7 @@ public static boolean validateAllergyProblemActCode(AllergyConcernAct2 allergyCo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_ALLERGY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_ALLERGY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -398,7 +398,7 @@ public static boolean validateAllergyProblemActAllergyObservation(AllergyConcern
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_PROBLEM_ACT_CD_CODE_AND_CODE_SYSTEM_VALUES__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_PROBLEM_ACT_CD_CODE_AND_CODE_SYSTEM_VALUES__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -471,7 +471,7 @@ public static boolean validateAllergyProblemActCDCodeAndCodeSystemValues(Allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_PROBLEM_ACT_CD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_PROBLEM_ACT_CD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -543,7 +543,7 @@ public static boolean validateAllergyProblemActCDCode(AllergyConcernAct2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_PROBLEM_ACT_CD_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_PROBLEM_ACT_CD_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyObservation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyObservation2Operations.java
index 94044fb77d..3c4fa9cb93 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyObservation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyObservation2Operations.java
@@ -125,7 +125,7 @@ protected AllergyObservation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION2_CRITICALITY_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION2_CRITICALITY_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -194,7 +194,7 @@ public static boolean validateAllergyObservation2CriticalityInversionIndicator(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -260,7 +260,7 @@ public static boolean validateAllergyObservation2TemplateId(AllergyObservation2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION2_NEGATION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION2_NEGATION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -353,7 +353,7 @@ public static boolean validateAllergyObservationValueP(AllergyObservation2 aller
 					"org.openhealthtools.mdht.uml.cda.consol.AllergyObservationValueP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.AllergyObservationValueP", passToken);
 				}
 				passToken.add(allergyObservation2);
@@ -411,7 +411,7 @@ public static boolean validateAllergyObservationStatusCodeP(AllergyObservation2
 					"org.openhealthtools.mdht.uml.cda.consol.AllergyObservationStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.AllergyObservationStatusCodeP", passToken);
 				}
 				passToken.add(allergyObservation2);
@@ -808,7 +808,7 @@ public static EList<AllergyStatusObservation> getConsolAllergyStatusObservations
 		@SuppressWarnings("unchecked")
 		Collection<AllergyStatusObservation> result = (Collection<AllergyStatusObservation>) query.evaluate(
 			allergyObservation2);
-		return new BasicEList.UnmodifiableEList<AllergyStatusObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -837,7 +837,7 @@ public static EList<ReactionObservation2> getConsolReactionObservation2s(Allergy
 		@SuppressWarnings("unchecked")
 		Collection<ReactionObservation2> result = (Collection<ReactionObservation2>) query.evaluate(
 			allergyObservation2);
-		return new BasicEList.UnmodifiableEList<ReactionObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1266,7 +1266,7 @@ public static boolean validateAllergyObservationCodeP(AllergyObservation2 allerg
 					"org.openhealthtools.mdht.uml.cda.consol.AllergyObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.AllergyObservationCodeP", passToken);
 				}
 				passToken.add(allergyObservation2);
@@ -1296,7 +1296,7 @@ public static boolean validateAllergyObservationCodeP(AllergyObservation2 allerg
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1369,7 +1369,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAllergyObservation2AuthorParticipation(AllergyObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Allergy Observation2 Author Participation</em>}' operation.
@@ -1390,7 +1390,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAllergyObservation2CriticalityObservation(AllergyObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Allergy Observation2 Criticality Observation</em>}' operation.
@@ -1411,7 +1411,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION2_CRITICALITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION2_CRITICALITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAllergyObservation2IVLTSLow(AllergyObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Allergy Observation2 IVLTS Low</em>}' operation.
@@ -1432,7 +1432,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION2_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION2_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAllergyObservation2IVLTSHigh(AllergyObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Allergy Observation2 IVLTS High</em>}' operation.
@@ -1453,7 +1453,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION2_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION2_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAllergyObservationParticipantParticipantRolePlayingEntityAllergySpecificMedication(AllergyObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Allergy Observation Participant Participant Role Playing Entity Allergy Specific Medication</em>}' operation.
@@ -1474,7 +1474,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ALLERGY_SPECIFIC_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ALLERGY_SPECIFIC_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAllergyObservationParticipantParticipantRolePlayingEntityAllergyClassMedication(AllergyObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Allergy Observation Participant Participant Role Playing Entity Allergy Class Medication</em>}' operation.
@@ -1495,7 +1495,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ALLERGY_CLASS_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ALLERGY_CLASS_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAllergyObservationParticipantParticipantRolePlayingEntityAllergyFoodOtherSubstance(AllergyObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Allergy Observation Participant Participant Role Playing Entity Allergy Food Other Substance</em>}' operation.
@@ -1516,7 +1516,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ALLERGY_FOOD_OTHER_SUBSTANCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ALLERGY_FOOD_OTHER_SUBSTANCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #getConsolAllergyStatusObservations(AllergyObservation2) <em>Get Consol Allergy Status Observations</em>}' operation.
@@ -1617,7 +1617,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_VALUE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_VALUE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAllergyObservationOriginalTextReference(AllergyObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Allergy Observation Original Text Reference</em>}' operation.
@@ -1638,7 +1638,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAllergyObservationOriginalTextReferenceValue(AllergyObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Allergy Observation Original Text Reference Value</em>}' operation.
@@ -1659,7 +1659,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAllergyObservationReferenceValue(AllergyObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Allergy Observation Reference Value</em>}' operation.
@@ -1680,7 +1680,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSubstanceOrDeviceAllergyObservationAllergyStatusInversionIndicator(AllergyObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Substance Or Device Allergy Observation Allergy Status Inversion Indicator</em>}' operation.
@@ -1701,7 +1701,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_ALLERGY_STATUS_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_ALLERGY_STATUS_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSubstanceOrDeviceAllergyObservationReactionInversionIndicator(AllergyObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Substance Or Device Allergy Observation Reaction Inversion Indicator</em>}' operation.
@@ -1722,7 +1722,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_REACTION_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_REACTION_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSubstanceOrDeviceAllergyObservationSeverityInversionIndicator(AllergyObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Substance Or Device Allergy Observation Severity Inversion Indicator</em>}' operation.
@@ -1743,7 +1743,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_SEVERITY_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_SEVERITY_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAllergyObservationCodeP(AllergyObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Allergy Observation Code P</em>}' operation.
@@ -1764,7 +1764,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAllergyObservationCode(AllergyObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Allergy Observation Code</em>}' operation.
@@ -1787,7 +1787,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAllergyObservationValue(AllergyObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Allergy Observation Value</em>}' operation.
@@ -1810,7 +1810,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation2 allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1884,7 +1884,7 @@ public static boolean validateAllergyObservationValue(AllergyObservation2 allerg
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1958,7 +1958,7 @@ public static boolean validateAllergyObservationStatusCode(AllergyObservation2 a
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2025,7 +2025,7 @@ public static boolean validateAllergyObservationEffectiveTime(AllergyObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_ALLERGY_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_ALLERGY_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2093,7 +2093,7 @@ public static boolean validateAllergyObservationAllergyStatusObservation(Allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_REACTION_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_REACTION_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2160,7 +2160,7 @@ public static boolean validateAllergyObservationReactionObservation(AllergyObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_SEVERITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_SEVERITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2227,7 +2227,7 @@ public static boolean validateAllergyObservationSeverityObservation(AllergyObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2293,7 +2293,7 @@ public static boolean validateAllergyObservationParticipant(AllergyObservation2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2368,7 +2368,7 @@ public static boolean validateAllergyObservationParticipantParticipantRolePlayin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2443,7 +2443,7 @@ public static boolean validateAllergyObservationParticipantParticipantRolePlayin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2519,7 +2519,7 @@ public static boolean validateAllergyObservationParticipantParticipantRolePlayin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2594,7 +2594,7 @@ public static boolean validateAllergyObservationParticipantParticipantRolePlayin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2670,7 +2670,7 @@ public static boolean validateAllergyObservationParticipantParticipantRolePlayin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2744,7 +2744,7 @@ public static boolean validateAllergyObservationParticipantParticipantRolePlayin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2818,7 +2818,7 @@ public static boolean validateAllergyObservationParticipantParticipantRolePlayin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyObservationOperations.java
index 03d3356152..bccdc4bb9f 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyObservationOperations.java
@@ -118,7 +118,7 @@ protected AllergyObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_VALUE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_VALUE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -185,7 +185,7 @@ public static boolean validateAllergyObservationValueOriginalText(AllergyObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -252,7 +252,7 @@ public static boolean validateAllergyObservationOriginalTextReference(AllergyObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -320,7 +320,7 @@ public static boolean validateAllergyObservationOriginalTextReferenceValue(Aller
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -387,7 +387,7 @@ public static boolean validateAllergyObservationReferenceValue(AllergyObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -452,7 +452,7 @@ public static boolean validateAllergyObservationClassCode(AllergyObservation all
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -517,7 +517,7 @@ public static boolean validateAllergyObservationMoodCode(AllergyObservation alle
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -582,7 +582,7 @@ public static boolean validateAllergyObservationId(AllergyObservation allergyObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -630,7 +630,7 @@ public static boolean validateAllergyObservationCodeP(AllergyObservation allergy
 					"org.openhealthtools.mdht.uml.cda.consol.AllergyObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.AllergyObservationCodeP", passToken);
 				}
 				passToken.add(allergyObservation);
@@ -662,7 +662,7 @@ public static boolean validateAllergyObservationCodeP(AllergyObservation allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -736,7 +736,7 @@ public static boolean validateAllergyObservationCode(AllergyObservation allergyO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -801,7 +801,7 @@ public static boolean validateAllergyObservationStatusCode(AllergyObservation al
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -870,7 +870,7 @@ public static boolean validateAllergyObservationEffectiveTime(AllergyObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -935,7 +935,7 @@ public static boolean validateAllergyObservationValue(AllergyObservation allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_REACTION_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_REACTION_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1002,7 +1002,7 @@ public static boolean validateAllergyObservationReactionObservation(AllergyObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_SEVERITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_SEVERITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1069,7 +1069,7 @@ public static boolean validateAllergyObservationSeverityObservation(AllergyObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_ALLERGY_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_ALLERGY_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1136,7 +1136,7 @@ public static boolean validateAllergyObservationAllergyStatusObservation(Allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1201,7 +1201,7 @@ public static boolean validateAllergyObservationParticipant(AllergyObservation a
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1276,7 +1276,7 @@ public static boolean validateAllergyObservationParticipantParticipantRolePlayin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1351,7 +1351,7 @@ public static boolean validateAllergyObservationParticipantParticipantRolePlayin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1427,7 +1427,7 @@ public static boolean validateAllergyObservationParticipantParticipantRolePlayin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1502,7 +1502,7 @@ public static boolean validateAllergyObservationParticipantParticipantRolePlayin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1577,7 +1577,7 @@ public static boolean validateAllergyObservationParticipantParticipantRolePlayin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CODE_TERMINOLOGY_VALUE_SET_GROUP_SRFI__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CODE_TERMINOLOGY_VALUE_SET_GROUP_SRFI__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1653,7 +1653,7 @@ public static boolean validateAllergyObservationParticipantParticipantRolePlayin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1727,7 +1727,7 @@ public static boolean validateAllergyObservationParticipantParticipantRolePlayin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1803,7 +1803,7 @@ public static boolean validateAllergyObservationParticipantParticipantRolePlayin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1877,7 +1877,7 @@ public static boolean validateAllergyObservationParticipantParticipantRoleClassC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1953,7 +1953,7 @@ public static boolean validateAllergyObservationParticipantParticipantRolePlayin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2025,7 +2025,7 @@ public static boolean validateAllergyObservationParticipantTypeCode(AllergyObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2124,7 +2124,7 @@ public static EList<ReactionObservation> getConsolReactionObservations(AllergyOb
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_REACTION_OBSERVATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ReactionObservation> result = (Collection<ReactionObservation>) query.evaluate(allergyObservation);
-		return new BasicEList.UnmodifiableEList<ReactionObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2238,7 +2238,7 @@ public static AllergyStatusObservation getConsolAllergyStatusObservation(Allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_ALLERGY_STATUS_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_ALLERGY_STATUS_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2307,7 +2307,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationAllergyStatusIn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_REACTION_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_REACTION_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2376,7 +2376,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationReactionInversi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_SEVERITY_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_SEVERITY_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2445,7 +2445,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationSeverityInversi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyProblemActOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyProblemActOperations.java
index 5d02a9173c..9221f32f65 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyProblemActOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyProblemActOperations.java
@@ -96,7 +96,7 @@ protected AllergyProblemActOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -163,7 +163,7 @@ public static boolean validateAllergyProblemActEffectiveTimeLow(AllergyProblemAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_EFFECTIVE_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_EFFECTIVE_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -230,7 +230,7 @@ public static boolean validateAllergyProblemActEffectiveTimeHigh(AllergyProblemA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -295,7 +295,7 @@ public static boolean validateAllergyProblemActTemplateId(AllergyProblemAct alle
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -360,7 +360,7 @@ public static boolean validateAllergyProblemActClassCode(AllergyProblemAct aller
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -425,7 +425,7 @@ public static boolean validateAllergyProblemActMoodCode(AllergyProblemAct allerg
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -490,7 +490,7 @@ public static boolean validateAllergyProblemActId(AllergyProblemAct allergyProbl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -557,7 +557,7 @@ public static boolean validateAllergyProblemActCode(AllergyProblemAct allergyPro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -622,7 +622,7 @@ public static boolean validateAllergyProblemActStatusCode(AllergyProblemAct alle
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -689,7 +689,7 @@ public static boolean validateAllergyProblemActEffectiveTime(AllergyProblemAct a
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_ALLERGY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_PROBLEM_ACT_ALLERGY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -756,7 +756,7 @@ public static boolean validateAllergyProblemActAllergyObservation(AllergyProblem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_PROBLEM_ACT_CD_CODE_AND_CODE_SYSTEM_VALUES__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_PROBLEM_ACT_CD_CODE_AND_CODE_SYSTEM_VALUES__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -829,7 +829,7 @@ public static boolean validateAllergyProblemActCDCodeAndCodeSystemValues(Allergy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_PROBLEM_ACT_CD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_PROBLEM_ACT_CD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -901,7 +901,7 @@ public static boolean validateAllergyProblemActCDCode(AllergyProblemAct allergyP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_PROBLEM_ACT_CD_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ALLERGY_PROBLEM_ACT_CD_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -998,7 +998,7 @@ public static EList<AllergyObservation> getAllergyObservations(AllergyProblemAct
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_ALLERGY_OBSERVATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<AllergyObservation> result = (Collection<AllergyObservation>) query.evaluate(allergyProblemAct);
-		return new BasicEList.UnmodifiableEList<AllergyObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // AllergyProblemActOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyStatusObservation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyStatusObservation2Operations.java
index 35abdde7a4..198643e64a 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyStatusObservation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyStatusObservation2Operations.java
@@ -69,7 +69,7 @@ protected AllergyStatusObservation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_STATUS_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_STATUS_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -139,7 +139,7 @@ public static boolean validateAllergyStatusObservation2TemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_STATUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_STATUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -207,7 +207,7 @@ public static boolean validateAllergyStatusObservationCode(AllergyStatusObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_STATUS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_STATUS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyStatusObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyStatusObservationOperations.java
index 9ce3258fb1..2c7b6e111a 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyStatusObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AllergyStatusObservationOperations.java
@@ -80,7 +80,7 @@ protected AllergyStatusObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_STATUS_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_STATUS_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -147,7 +147,7 @@ public static boolean validateAllergyStatusObservationTemplateId(AllergyStatusOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_STATUS_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_STATUS_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -214,7 +214,7 @@ public static boolean validateAllergyStatusObservationClassCode(AllergyStatusObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_STATUS_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_STATUS_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -283,7 +283,7 @@ public static boolean validateAllergyStatusObservationMoodCode(AllergyStatusObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_STATUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_STATUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -350,7 +350,7 @@ public static boolean validateAllergyStatusObservationCode(AllergyStatusObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_STATUS_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_STATUS_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -419,7 +419,7 @@ public static boolean validateAllergyStatusObservationStatusCode(AllergyStatusOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_STATUS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ALLERGY_STATUS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AnesthesiaSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AnesthesiaSection2Operations.java
index e7be55f350..bc2981573d 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AnesthesiaSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AnesthesiaSection2Operations.java
@@ -83,7 +83,7 @@ protected AnesthesiaSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -176,7 +176,7 @@ public static EList<ProcedureActivityProcedure2> getConsolProcedureActivityProce
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityProcedure2> result = (Collection<ProcedureActivityProcedure2>) query.evaluate(
 			anesthesiaSection2);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityProcedure2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -224,7 +224,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(Anesthesi
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_MEDICATION_ACTIVITY2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity2> result = (Collection<MedicationActivity2>) query.evaluate(anesthesiaSection2);
-		return new BasicEList.UnmodifiableEList<MedicationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -246,7 +246,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(Anesthesi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -294,7 +294,7 @@ public static boolean validateAnesthesiaSectionCodeP(AnesthesiaSection2 anesthes
 					"org.openhealthtools.mdht.uml.cda.consol.AnesthesiaSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.AnesthesiaSectionCodeP", passToken);
 				}
 				passToken.add(anesthesiaSection2);
@@ -326,7 +326,7 @@ public static boolean validateAnesthesiaSectionCodeP(AnesthesiaSection2 anesthes
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -399,7 +399,7 @@ public static boolean validateAnesthesiaSectionCode(AnesthesiaSection2 anesthesi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_PROCEDURE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_PROCEDURE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -467,7 +467,7 @@ public static boolean validateAnesthesiaSectionProcedureActivityProcedure(Anesth
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AnesthesiaSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AnesthesiaSectionOperations.java
index f4f34f4b6e..292b9cff67 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AnesthesiaSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AnesthesiaSectionOperations.java
@@ -90,7 +90,7 @@ protected AnesthesiaSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -157,7 +157,7 @@ public static boolean validateAnesthesiaSectionTemplateId(AnesthesiaSection anes
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -222,7 +222,7 @@ public static boolean validateAnesthesiaSectionCode(AnesthesiaSection anesthesia
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -331,7 +331,7 @@ public static boolean validateAnesthesiaSectionText(AnesthesiaSection anesthesia
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateAnesthesiaSectionText(AnesthesiaSection, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Anesthesia Section Text</em>}' operation.
@@ -352,7 +352,7 @@ public static boolean validateAnesthesiaSectionText(AnesthesiaSection anesthesia
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -417,7 +417,7 @@ public static boolean validateAnesthesiaSectionTitle(AnesthesiaSection anesthesi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_PROCEDURE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_PROCEDURE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -484,7 +484,7 @@ public static boolean validateAnesthesiaSectionProcedureActivityProcedure(Anesth
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ANESTHESIA_SECTION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -579,7 +579,7 @@ public static EList<ProcedureActivityProcedure> getProcedureActivityProcedures(
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityProcedure> result = (Collection<ProcedureActivityProcedure>) query.evaluate(
 			anesthesiaSection);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityProcedure>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -626,7 +626,7 @@ public static EList<MedicationActivity> getMedicationActivities(AnesthesiaSectio
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_MEDICATION_ACTIVITIES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity> result = (Collection<MedicationActivity>) query.evaluate(anesthesiaSection);
-		return new BasicEList.UnmodifiableEList<MedicationActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // AnesthesiaSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentAndPlanSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentAndPlanSection2Operations.java
index 5d59345f7d..3a54246986 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentAndPlanSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentAndPlanSection2Operations.java
@@ -80,7 +80,7 @@ protected AssessmentAndPlanSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_AND_PLAN_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_AND_PLAN_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -173,7 +173,7 @@ public static EList<PlannedAct2> getConsolPlannedAct2s(AssessmentAndPlanSection2
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_PLANNED_ACT2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PlannedAct2> result = (Collection<PlannedAct2>) query.evaluate(assessmentAndPlanSection2);
-		return new BasicEList.UnmodifiableEList<PlannedAct2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -195,7 +195,7 @@ public static EList<PlannedAct2> getConsolPlannedAct2s(AssessmentAndPlanSection2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_AND_PLAN_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_AND_PLAN_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -245,7 +245,7 @@ public static boolean validateAssessmentAndPlanSectionCodeP(AssessmentAndPlanSec
 					"org.openhealthtools.mdht.uml.cda.consol.AssessmentAndPlanSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.AssessmentAndPlanSectionCodeP", passToken);
 				}
 				passToken.add(assessmentAndPlanSection2);
@@ -277,7 +277,7 @@ public static boolean validateAssessmentAndPlanSectionCodeP(AssessmentAndPlanSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_AND_PLAN_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_AND_PLAN_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -351,7 +351,7 @@ public static boolean validateAssessmentAndPlanSectionCode(AssessmentAndPlanSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_AND_PLAN_SECTION_PLAN_OF_CARE_ACTIVITY_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_AND_PLAN_SECTION_PLAN_OF_CARE_ACTIVITY_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentAndPlanSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentAndPlanSectionOperations.java
index abc7364dbf..760dd65594 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentAndPlanSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentAndPlanSectionOperations.java
@@ -86,7 +86,7 @@ protected AssessmentAndPlanSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_AND_PLAN_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_AND_PLAN_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -155,7 +155,7 @@ public static boolean validateAssessmentAndPlanSectionTemplateId(AssessmentAndPl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_AND_PLAN_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_AND_PLAN_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateAssessmentAndPlanSectionCode(AssessmentAndPlanSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_AND_PLAN_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_AND_PLAN_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -288,7 +288,7 @@ public static boolean validateAssessmentAndPlanSectionCodeP(AssessmentAndPlanSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_AND_PLAN_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_AND_PLAN_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -354,7 +354,7 @@ public static boolean validateAssessmentAndPlanSectionText(AssessmentAndPlanSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_AND_PLAN_SECTION_PLAN_OF_CARE_ACTIVITY_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_AND_PLAN_SECTION_PLAN_OF_CARE_ACTIVITY_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -451,7 +451,7 @@ public static EList<PlanOfCareActivityAct> getPlanOfCareActivityActs(
 		@SuppressWarnings("unchecked")
 		Collection<PlanOfCareActivityAct> result = (Collection<PlanOfCareActivityAct>) query.evaluate(
 			assessmentAndPlanSection);
-		return new BasicEList.UnmodifiableEList<PlanOfCareActivityAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // AssessmentAndPlanSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentScaleObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentScaleObservationOperations.java
index a37555a01b..1dfce589f9 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentScaleObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentScaleObservationOperations.java
@@ -100,7 +100,7 @@ protected AssessmentScaleObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_CODE_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_CODE_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -170,7 +170,7 @@ public static boolean validateAssessmentScaleObservationCodeCodeSystem(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_INTERPRETATION_CODE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_INTERPRETATION_CODE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -240,7 +240,7 @@ public static boolean validateAssessmentScaleObservationInterpretationCodeTransl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -309,7 +309,7 @@ public static boolean validateAssessmentScaleObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -378,7 +378,7 @@ public static boolean validateAssessmentScaleObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -446,7 +446,7 @@ public static boolean validateAssessmentScaleObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -512,7 +512,7 @@ public static boolean validateAssessmentScaleObservationCode(AssessmentScaleObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_DERIVATION_EXPR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_DERIVATION_EXPR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -581,7 +581,7 @@ public static boolean validateAssessmentScaleObservationDerivationExpr(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -650,7 +650,7 @@ public static boolean validateAssessmentScaleObservationEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -716,7 +716,7 @@ public static boolean validateAssessmentScaleObservationId(AssessmentScaleObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_INTERPRETATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_INTERPRETATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -787,7 +787,7 @@ public static boolean validateAssessmentScaleObservationInterpretationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -856,7 +856,7 @@ public static boolean validateAssessmentScaleObservationStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -925,7 +925,7 @@ public static boolean validateAssessmentScaleObservationStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -992,7 +992,7 @@ public static boolean validateAssessmentScaleObservationValue(AssessmentScaleObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1060,7 +1060,7 @@ public static boolean validateAssessmentScaleObservationAuthor(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_REFERENCE_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_REFERENCE_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1129,7 +1129,7 @@ public static boolean validateAssessmentScaleObservationReferenceRange(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1200,7 +1200,7 @@ public static boolean validateAssessmentScaleObservationAssessmentScaleSupportin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1276,7 +1276,7 @@ public static boolean validateAssessmentScaleObservationReferenceRangeObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1353,7 +1353,7 @@ public static boolean validateAssessmentScaleObservationReferenceRangeObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1429,7 +1429,7 @@ public static boolean validateAssessmentScaleObservationReferenceRangeObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1505,7 +1505,7 @@ public static boolean validateAssessmentScaleObservationReferenceRangeObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ASSESSMENT_SCALE_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1608,7 +1608,7 @@ public static EList<AssessmentScaleSupportingObservation> getAssessmentScaleSupp
 		@SuppressWarnings("unchecked")
 		Collection<AssessmentScaleSupportingObservation> result = (Collection<AssessmentScaleSupportingObservation>) query.evaluate(
 			assessmentScaleObservation);
-		return new BasicEList.UnmodifiableEList<AssessmentScaleSupportingObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // AssessmentScaleObservationOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentScaleSupportingObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentScaleSupportingObservationOperations.java
index 59891ea92f..da2198004d 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentScaleSupportingObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentScaleSupportingObservationOperations.java
@@ -80,7 +80,7 @@ protected AssessmentScaleSupportingObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_CODE_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_CODE_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -150,7 +150,7 @@ public static boolean validateAssessmentScaleSupportingObservationCodeCodeSystem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_VALUE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_VALUE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateAssessmentScaleSupportingObservationValueTranslati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -291,7 +291,7 @@ public static boolean validateAssessmentScaleSupportingObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -361,7 +361,7 @@ public static boolean validateAssessmentScaleSupportingObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -431,7 +431,7 @@ public static boolean validateAssessmentScaleSupportingObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -501,7 +501,7 @@ public static boolean validateAssessmentScaleSupportingObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -572,7 +572,7 @@ public static boolean validateAssessmentScaleSupportingObservationId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -642,7 +642,7 @@ public static boolean validateAssessmentScaleSupportingObservationStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -712,7 +712,7 @@ public static boolean validateAssessmentScaleSupportingObservationStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SCALE_SUPPORTING_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentSectionOperations.java
index f32ab08864..a086d9166d 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AssessmentSectionOperations.java
@@ -79,7 +79,7 @@ protected AssessmentSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -146,7 +146,7 @@ public static boolean validateAssessmentSectionTemplateId(AssessmentSection asse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -211,7 +211,7 @@ public static boolean validateAssessmentSectionCode(AssessmentSection assessment
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -276,7 +276,7 @@ public static boolean validateAssessmentSectionCodeP(AssessmentSection assessmen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -341,7 +341,7 @@ public static boolean validateAssessmentSectionText(AssessmentSection assessment
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ASSESSMENT_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AuthorParticipationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AuthorParticipationOperations.java
index 15489b8c43..f907f1cf5a 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AuthorParticipationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AuthorParticipationOperations.java
@@ -88,7 +88,7 @@ protected AuthorParticipationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_AUTHOR_PARTICIPATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_AUTHOR_PARTICIPATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -154,7 +154,7 @@ public static boolean validateAuthorParticipationTemplateId(AuthorParticipation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_AUTHOR_PARTICIPATION_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_AUTHOR_PARTICIPATION_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -219,7 +219,7 @@ public static boolean validateAuthorParticipationTime(AuthorParticipation author
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -286,7 +286,7 @@ public static boolean validateAuthorParticipationAssignedAuthor(AuthorParticipat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_ASSIGNED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_ASSIGNED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -360,7 +360,7 @@ public static boolean validateAuthorParticipationAssignedAuthorAssignedPersonNam
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -434,7 +434,7 @@ public static boolean validateAuthorParticipationAssignedAuthorRepresentedOrgani
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -508,7 +508,7 @@ public static boolean validateAuthorParticipationAssignedAuthorRepresentedOrgani
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -582,7 +582,7 @@ public static boolean validateAuthorParticipationAssignedAuthorRepresentedOrgani
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -656,7 +656,7 @@ public static boolean validateAuthorParticipationAssignedAuthorRepresentedOrgani
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_CODE_TERMINOLOGY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_CODE_TERMINOLOGY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -730,7 +730,7 @@ public static boolean validateAuthorParticipationAssignedAuthorCodeTerminology(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -802,7 +802,7 @@ public static boolean validateAuthorParticipationAssignedAuthorId(AuthorParticip
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -874,7 +874,7 @@ public static boolean validateAuthorParticipationAssignedAuthorCode(AuthorPartic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -947,7 +947,7 @@ public static boolean validateAuthorParticipationAssignedAuthorAssignedPerson(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AuthorizationActivityOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AuthorizationActivityOperations.java
index e0e3194f01..5e4d38eb77 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AuthorizationActivityOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/AuthorizationActivityOperations.java
@@ -87,7 +87,7 @@ protected AuthorizationActivityOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_AUTHORIZATION_ACTIVITY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_AUTHORIZATION_ACTIVITY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -154,7 +154,7 @@ public static boolean validateAuthorizationActivityTemplateId(AuthorizationActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_AUTHORIZATION_ACTIVITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_AUTHORIZATION_ACTIVITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -220,7 +220,7 @@ public static boolean validateAuthorizationActivityClassCode(AuthorizationActivi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_AUTHORIZATION_ACTIVITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_AUTHORIZATION_ACTIVITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -285,7 +285,7 @@ public static boolean validateAuthorizationActivityId(AuthorizationActivity auth
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_AUTHORIZATION_ACTIVITY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_AUTHORIZATION_ACTIVITY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -351,7 +351,7 @@ public static boolean validateAuthorizationActivityMoodCode(AuthorizationActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_AUTHORIZATION_ACTIVITY_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_AUTHORIZATION_ACTIVITY_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -418,7 +418,7 @@ public static boolean validateAuthorizationActivityEntryRelationship(Authorizati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHORIZATION_ACTIVITY_ENTRY_RELATIONSHIP_HAS_CLINICAL_STATEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHORIZATION_ACTIVITY_ENTRY_RELATIONSHIP_HAS_CLINICAL_STATEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -500,7 +500,7 @@ public static boolean validateAuthorizationActivityEntryRelationshipHasClinicalS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHORIZATION_ACTIVITY_ENTRY_RELATIONSHIP_HAS_AUTHORIZED_PERFORMERS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHORIZATION_ACTIVITY_ENTRY_RELATIONSHIP_HAS_AUTHORIZED_PERFORMERS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -574,7 +574,7 @@ public static boolean validateAuthorizationActivityEntryRelationshipHasAuthorize
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHORIZATION_ACTIVITY_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_AUTHORIZATION_ACTIVITY_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/BirthSexObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/BirthSexObservationOperations.java
index b119898ddc..44a0242111 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/BirthSexObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/BirthSexObservationOperations.java
@@ -76,7 +76,7 @@ protected BirthSexObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_BIRTH_SEX_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_BIRTH_SEX_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -142,7 +142,7 @@ public static boolean validateBirthSexObservationTemplateId(BirthSexObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_BIRTH_SEX_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_BIRTH_SEX_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -208,7 +208,7 @@ public static boolean validateBirthSexObservationClassCode(BirthSexObservation b
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_BIRTH_SEX_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_BIRTH_SEX_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -274,7 +274,7 @@ public static boolean validateBirthSexObservationMoodCode(BirthSexObservation bi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_BIRTH_SEX_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_BIRTH_SEX_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -322,7 +322,7 @@ public static boolean validateBirthSexObservationCodeP(BirthSexObservation birth
 					"org.openhealthtools.mdht.uml.cda.consol.BirthSexObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.BirthSexObservationCodeP", passToken);
 				}
 				passToken.add(birthSexObservation);
@@ -354,7 +354,7 @@ public static boolean validateBirthSexObservationCodeP(BirthSexObservation birth
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_BIRTH_SEX_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_BIRTH_SEX_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -428,7 +428,7 @@ public static boolean validateBirthSexObservationCode(BirthSexObservation birthS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_BIRTH_SEX_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_BIRTH_SEX_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -494,7 +494,7 @@ public static boolean validateBirthSexObservationStatusCode(BirthSexObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_BIRTH_SEX_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_BIRTH_SEX_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -563,7 +563,7 @@ public static boolean validateBirthSexObservationStatusCodeP(BirthSexObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_BIRTH_SEX_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_BIRTH_SEX_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -628,7 +628,7 @@ public static boolean validateBirthSexObservationValue(BirthSexObservation birth
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_BIRTH_SEX_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_BIRTH_SEX_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/BoundaryObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/BoundaryObservationOperations.java
index 287b42431e..20c7fccb06 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/BoundaryObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/BoundaryObservationOperations.java
@@ -79,7 +79,7 @@ protected BoundaryObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_BOUNDARY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_BOUNDARY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -145,7 +145,7 @@ public static boolean validateBoundaryObservationTemplateId(BoundaryObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_BOUNDARY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_BOUNDARY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -213,7 +213,7 @@ public static boolean validateBoundaryObservationClassCode(BoundaryObservation b
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_BOUNDARY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_BOUNDARY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -278,7 +278,7 @@ public static boolean validateBoundaryObservationCode(BoundaryObservation bounda
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_BOUNDARY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_BOUNDARY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -343,7 +343,7 @@ public static boolean validateBoundaryObservationMoodCode(BoundaryObservation bo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_BOUNDARY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_BOUNDARY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/BrandNameObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/BrandNameObservationOperations.java
index e437852fa5..f61786062c 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/BrandNameObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/BrandNameObservationOperations.java
@@ -81,7 +81,7 @@ protected BrandNameObservationOperations() {
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_BRAND_NAME_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_BRAND_NAME_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -146,7 +146,7 @@ public static boolean validateBrandNameObservationTemplateId(BrandNameObservatio
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_BRAND_NAME_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_BRAND_NAME_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -193,7 +193,7 @@ public static boolean validateBrandNameObservationCodeP(BrandNameObservation bra
 					"org.openhealthtools.mdht.uml.cda.consol.BrandNameObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.BrandNameObservationCodeP", passToken);
 				}
 				passToken.add(brandNameObservation);
@@ -224,7 +224,7 @@ public static boolean validateBrandNameObservationCodeP(BrandNameObservation bra
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_BRAND_NAME_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_BRAND_NAME_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -295,7 +295,7 @@ public static boolean validateBrandNameObservationCode(BrandNameObservation bran
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_BRAND_NAME_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_BRAND_NAME_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CarePlanOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CarePlanOperations.java
index 2c0f42a5b7..4be1ee2f96 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CarePlanOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CarePlanOperations.java
@@ -160,7 +160,7 @@ protected CarePlanOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_DOES_NOT_HAVE_PLAN_OF_TREATMENT_SECTION_V2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_DOES_NOT_HAVE_PLAN_OF_TREATMENT_SECTION_V2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -227,7 +227,7 @@ public static boolean validateCarePlanDoesNotHavePlanOfTreatmentSectionV2(CarePl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -274,7 +274,7 @@ public static boolean validateCarePlanCodeP(CarePlan carePlan, DiagnosticChain d
 					"org.openhealthtools.mdht.uml.cda.consol.CarePlanCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.CarePlanCodeP", passToken);
 				}
 				passToken.add(carePlan);
@@ -306,7 +306,7 @@ public static boolean validateCarePlanCodeP(CarePlan carePlan, DiagnosticChain d
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -377,7 +377,7 @@ public static boolean validateCarePlanCode(CarePlan carePlan, DiagnosticChain di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_SET_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_SET_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -441,7 +441,7 @@ public static boolean validateCarePlanSetId(CarePlan carePlan, DiagnosticChain d
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_VERSION_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_VERSION_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -505,7 +505,7 @@ public static boolean validateCarePlanVersionNumber(CarePlan carePlan, Diagnosti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -570,7 +570,7 @@ public static boolean validateCarePlanInformationRecipient(CarePlan carePlan, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_AUTHENTICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_AUTHENTICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -634,7 +634,7 @@ public static boolean validateCarePlanAuthenticator(CarePlan carePlan, Diagnosti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -700,7 +700,7 @@ public static boolean validateCarePlanParticipantCarePlanReview(CarePlan carePla
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_PARTICIPANT_CAREGIVER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_PARTICIPANT_CAREGIVER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -765,7 +765,7 @@ public static boolean validateCarePlanParticipantCaregiver(CarePlan carePlan, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -829,7 +829,7 @@ public static boolean validateCarePlanDocumentationOf(CarePlan carePlan, Diagnos
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_RELATED_DOCUMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_RELATED_DOCUMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -893,7 +893,7 @@ public static boolean validateCarePlanRelatedDocument(CarePlan carePlan, Diagnos
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -957,7 +957,7 @@ public static boolean validateCarePlanComponentOf(CarePlan carePlan, DiagnosticC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_HEALTH_CONCERNS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_HEALTH_CONCERNS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1022,7 +1022,7 @@ public static boolean validateCarePlanHealthConcernsSection(CarePlan carePlan, D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_GOALS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_GOALS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1086,7 +1086,7 @@ public static boolean validateCarePlanGoalsSection(CarePlan carePlan, Diagnostic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_HEALTH_STATUS_EVALUATIONS_OUTCOMES_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_HEALTH_STATUS_EVALUATIONS_OUTCOMES_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1153,7 +1153,7 @@ public static boolean validateCarePlanHealthStatusEvaluationsOutcomesSection(Car
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_INTERVENTIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_PLAN_INTERVENTIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1218,7 +1218,7 @@ public static boolean validateCarePlanInterventionsSection2(CarePlan carePlan, D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_INFORMATION_RECIPIENT_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_INFORMATION_RECIPIENT_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1305,7 +1305,7 @@ public static boolean validateCarePlanInformationRecipientIntendedRecipientInfor
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_INFORMATION_RECIPIENT_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_INFORMATION_RECIPIENT_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1379,7 +1379,7 @@ public static boolean validateCarePlanInformationRecipientIntendedRecipientInfor
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_RECEIVED_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_RECEIVED_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1453,7 +1453,7 @@ public static boolean validateCarePlanInformationRecipientIntendedRecipientRecei
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_RECEIVED_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_RECEIVED_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1527,7 +1527,7 @@ public static boolean validateCarePlanInformationRecipientIntendedRecipientRecei
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_RECEIVED_ORGANIZATION_STANDARD_INDUSTRY_CLASS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_RECEIVED_ORGANIZATION_STANDARD_INDUSTRY_CLASS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1584,7 +1584,7 @@ public static boolean validateCarePlanInformationRecipientIntendedRecipientRecei
 						"org.openhealthtools.mdht.uml.cda.consol.CarePlanInformationRecipientIntendedRecipientReceivedOrganizationStandardIndustryClassCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.CarePlanInformationRecipientIntendedRecipientReceivedOrganizationStandardIndustryClassCodeP",
 							passToken);
@@ -1619,7 +1619,7 @@ public static boolean validateCarePlanInformationRecipientIntendedRecipientRecei
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_RECEIVED_ORGANIZATION_STANDARD_INDUSTRY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_RECEIVED_ORGANIZATION_STANDARD_INDUSTRY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1705,7 +1705,7 @@ public static boolean validateCarePlanInformationRecipientIntendedRecipientRecei
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1777,7 +1777,7 @@ public static boolean validateCarePlanInformationRecipientIntendedRecipientId(Ca
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1850,7 +1850,7 @@ public static boolean validateCarePlanInformationRecipientIntendedRecipientAddr(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1923,7 +1923,7 @@ public static boolean validateCarePlanInformationRecipientIntendedRecipientTelec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1997,7 +1997,7 @@ public static boolean validateCarePlanInformationRecipientIntendedRecipientInfor
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_RECEIVED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_RECEIVED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2071,7 +2071,7 @@ public static boolean validateCarePlanInformationRecipientIntendedRecipientRecei
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_INFORMATION_RECIPIENT_INTENDED_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2143,7 +2143,7 @@ public static boolean validateCarePlanInformationRecipientIntendedRecipient(Care
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_AUTHENTICATOR_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_AUTHENTICATOR_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2217,7 +2217,7 @@ public static boolean validateCarePlanAuthenticatorAssignedEntityId(CarePlan car
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_AUTHENTICATOR_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_AUTHENTICATOR_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2289,7 +2289,7 @@ public static boolean validateCarePlanAuthenticatorAssignedEntityCode(CarePlan c
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_AUTHENTICATOR_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_AUTHENTICATOR_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2361,7 +2361,7 @@ public static boolean validateCarePlanAuthenticatorAssignedEntityCodeP(CarePlan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_AUTHENTICATOR_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_AUTHENTICATOR_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2433,7 +2433,7 @@ public static boolean validateCarePlanAuthenticatorTime(CarePlan carePlan, Diagn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_AUTHENTICATOR_SIGNATURE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_AUTHENTICATOR_SIGNATURE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2505,7 +2505,7 @@ public static boolean validateCarePlanAuthenticatorSignatureCode(CarePlan carePl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_AUTHENTICATOR_SDTC_SIGNATURE_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_AUTHENTICATOR_SDTC_SIGNATURE_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2577,7 +2577,7 @@ public static boolean validateCarePlanAuthenticatorSDTCSignatureText(CarePlan ca
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_AUTHENTICATOR_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_AUTHENTICATOR_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2649,7 +2649,7 @@ public static boolean validateCarePlanAuthenticatorAssignedEntity(CarePlan careP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW_ASSOCIATED_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW_ASSOCIATED_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2722,7 +2722,7 @@ public static boolean validateCarePlanParticipantCarePlanReviewAssociatedEntityC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW_ASSOCIATED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW_ASSOCIATED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2795,7 +2795,7 @@ public static boolean validateCarePlanParticipantCarePlanReviewAssociatedEntityI
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW_ASSOCIATED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW_ASSOCIATED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2849,7 +2849,7 @@ public static boolean validateCarePlanParticipantCarePlanReviewAssociatedEntityC
 						"org.openhealthtools.mdht.uml.cda.consol.CarePlanParticipantCarePlanReviewAssociatedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.CarePlanParticipantCarePlanReviewAssociatedEntityCodeP",
 							passToken);
@@ -2884,7 +2884,7 @@ public static boolean validateCarePlanParticipantCarePlanReviewAssociatedEntityC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW_ASSOCIATED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW_ASSOCIATED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2967,7 +2967,7 @@ public static boolean validateCarePlanParticipantCarePlanReviewAssociatedEntityC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3041,7 +3041,7 @@ public static boolean validateCarePlanParticipantCarePlanReviewTypeCode(CarePlan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW_FUNCTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW_FUNCTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3113,7 +3113,7 @@ public static boolean validateCarePlanParticipantCarePlanReviewFunctionCode(Care
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW_FUNCTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW_FUNCTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3185,7 +3185,7 @@ public static boolean validateCarePlanParticipantCarePlanReviewFunctionCodeP(Car
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3257,7 +3257,7 @@ public static boolean validateCarePlanParticipantCarePlanReviewTime(CarePlan car
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CARE_PLAN_REVIEW_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3330,7 +3330,7 @@ public static boolean validateCarePlanParticipantCarePlanReviewAssociatedEntity(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY_ASSOCIATED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY_ASSOCIATED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3404,7 +3404,7 @@ public static boolean validateCarePlanParticipantCaregiverAssociatedEntityAssoci
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY_CLASS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY_CLASS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3458,7 +3458,7 @@ public static boolean validateCarePlanParticipantCaregiverAssociatedEntityClassC
 						"org.openhealthtools.mdht.uml.cda.consol.CarePlanParticipantCaregiverAssociatedEntityClassCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.CarePlanParticipantCaregiverAssociatedEntityClassCodeP",
 							passToken);
@@ -3493,7 +3493,7 @@ public static boolean validateCarePlanParticipantCaregiverAssociatedEntityClassC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3576,7 +3576,7 @@ public static boolean validateCarePlanParticipantCaregiverAssociatedEntityClassC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY_ASSOCIATED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY_ASSOCIATED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3650,7 +3650,7 @@ public static boolean validateCarePlanParticipantCaregiverAssociatedEntityAssoci
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CAREGIVER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CAREGIVER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3722,7 +3722,7 @@ public static boolean validateCarePlanParticipantCaregiverTypeCode(CarePlan care
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3794,7 +3794,7 @@ public static boolean validateCarePlanParticipantCaregiverAssociatedEntity(CareP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3866,7 +3866,7 @@ public static boolean validateCarePlanDocumentationOfServiceEventIVLTSLow(CarePl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3938,7 +3938,7 @@ public static boolean validateCarePlanDocumentationOfServiceEventIVLTSHigh(CareP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_ASSIGNED_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_ASSIGNED_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4014,7 +4014,7 @@ public static boolean validateCarePlanDocumentationOfServiceEventPerformerAssign
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_ASSIGNED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_ASSIGNED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4088,7 +4088,7 @@ public static boolean validateCarePlanDocumentationOfServiceEventPerformerAssign
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4162,7 +4162,7 @@ public static boolean validateCarePlanDocumentationOfServiceEventPerformerAssign
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4236,7 +4236,7 @@ public static boolean validateCarePlanDocumentationOfServiceEventPerformerAssign
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4310,7 +4310,7 @@ public static boolean validateCarePlanDocumentationOfServiceEventPerformerAssign
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4383,7 +4383,7 @@ public static boolean validateCarePlanDocumentationOfServiceEventPerformerAssign
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4455,7 +4455,7 @@ public static boolean validateCarePlanDocumentationOfServiceEventClassCode(CareP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4527,7 +4527,7 @@ public static boolean validateCarePlanDocumentationOfServiceEventEffectiveTime(C
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4599,7 +4599,7 @@ public static boolean validateCarePlanDocumentationOfServiceEventPerformer1(Care
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4671,7 +4671,7 @@ public static boolean validateCarePlanDocumentationOfServiceEvent(CarePlan careP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_RELATED_DOCUMENT_PARENT_DOCUMENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_RELATED_DOCUMENT_PARENT_DOCUMENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4743,7 +4743,7 @@ public static boolean validateCarePlanRelatedDocumentParentDocumentId(CarePlan c
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_RELATED_DOCUMENT_PARENT_DOCUMENT_SET_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_RELATED_DOCUMENT_PARENT_DOCUMENT_SET_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4815,7 +4815,7 @@ public static boolean validateCarePlanRelatedDocumentParentDocumentSetId(CarePla
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_RELATED_DOCUMENT_PARENT_DOCUMENT_VERSION_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_RELATED_DOCUMENT_PARENT_DOCUMENT_VERSION_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4888,7 +4888,7 @@ public static boolean validateCarePlanRelatedDocumentParentDocumentVersionNumber
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_RELATED_DOCUMENT_TYPE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_RELATED_DOCUMENT_TYPE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4941,7 +4941,7 @@ public static boolean validateCarePlanRelatedDocumentTypeCodeP(CarePlan carePlan
 						"org.openhealthtools.mdht.uml.cda.consol.CarePlanRelatedDocumentTypeCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.CarePlanRelatedDocumentTypeCodeP", passToken);
 					}
@@ -4975,7 +4975,7 @@ public static boolean validateCarePlanRelatedDocumentTypeCodeP(CarePlan carePlan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_RELATED_DOCUMENT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_RELATED_DOCUMENT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5056,7 +5056,7 @@ public static boolean validateCarePlanRelatedDocumentTypeCode(CarePlan carePlan,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_RELATED_DOCUMENT_PARENT_DOCUMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_RELATED_DOCUMENT_PARENT_DOCUMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5128,7 +5128,7 @@ public static boolean validateCarePlanRelatedDocumentParentDocument(CarePlan car
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5201,7 +5201,7 @@ public static boolean validateCarePlanComponentOfEncompassingEncounterEffectiveT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_PLAN_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5451,7 +5451,7 @@ public static InterventionsSection2 getInterventionsSection2(CarePlan carePlan)
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamMemberActOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamMemberActOperations.java
index 20e12145c4..af9e0ecad4 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamMemberActOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamMemberActOperations.java
@@ -98,7 +98,7 @@ protected CareTeamMemberActOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -163,7 +163,7 @@ public static boolean validateCareTeamMemberActTemplateId(CareTeamMemberAct care
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -276,7 +276,7 @@ public static boolean validateCareTeamMemberActStatusCodeP(CareTeamMemberAct car
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateCareTeamMemberActStatusCodeP(CareTeamMemberAct, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Care Team Member Act Status Code P</em>}' operation.
@@ -297,7 +297,7 @@ public static boolean validateCareTeamMemberActStatusCodeP(CareTeamMemberAct car
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -362,7 +362,7 @@ public static boolean validateCareTeamMemberActStatusCode(CareTeamMemberAct care
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -429,7 +429,7 @@ public static boolean validateCareTeamMemberActEffectiveTime(CareTeamMemberAct c
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -494,7 +494,7 @@ public static boolean validateCareTeamMemberActClassCode(CareTeamMemberAct careT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -559,7 +559,7 @@ public static boolean validateCareTeamMemberActMoodCode(CareTeamMemberAct careTe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -624,7 +624,7 @@ public static boolean validateCareTeamMemberActPerformer(CareTeamMemberAct careT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -689,7 +689,7 @@ public static boolean validateCareTeamMemberActParticipant(CareTeamMemberAct car
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -757,7 +757,7 @@ public static boolean validateCareTeamMemberActCareTeamMemberScheduleObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_NOTE_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_NOTE_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -824,7 +824,7 @@ public static boolean validateCareTeamMemberActNoteActivity(CareTeamMemberAct ca
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_PARTICIPANT2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_ACT_PARTICIPANT2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -890,7 +890,7 @@ public static boolean validateCareTeamMemberActParticipant2(CareTeamMemberAct ca
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_TEAM_MEMBER_ACT_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_TEAM_MEMBER_ACT_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -963,7 +963,7 @@ public static boolean validateCareTeamMemberActIVLTSLow(CareTeamMemberAct careTe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_TEAM_MEMBER_ACT_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_TEAM_MEMBER_ACT_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamMemberScheduleObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamMemberScheduleObservationOperations.java
index 509904b1ef..4d33a84168 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamMemberScheduleObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamMemberScheduleObservationOperations.java
@@ -92,7 +92,7 @@ protected CareTeamMemberScheduleObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -162,7 +162,7 @@ public static boolean validateCareTeamMemberScheduleObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -215,7 +215,7 @@ public static boolean validateCareTeamMemberScheduleObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.CareTeamMemberScheduleObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.CareTeamMemberScheduleObservationCodeP", passToken);
 				}
@@ -248,7 +248,7 @@ public static boolean validateCareTeamMemberScheduleObservationCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -327,7 +327,7 @@ public static boolean validateCareTeamMemberScheduleObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -397,7 +397,7 @@ public static boolean validateCareTeamMemberScheduleObservationText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -467,7 +467,7 @@ public static boolean validateCareTeamMemberScheduleObservationValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -537,7 +537,7 @@ public static boolean validateCareTeamMemberScheduleObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -657,7 +657,7 @@ public static boolean validateCareTeamMemberScheduleObservationStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateCareTeamMemberScheduleObservationStatusCodeP(CareTeamMemberScheduleObservation, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Care Team Member Schedule Observation Status Code P</em>}' operation.
@@ -678,7 +678,7 @@ public static boolean validateCareTeamMemberScheduleObservationStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -748,7 +748,7 @@ public static boolean validateCareTeamMemberScheduleObservationStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_EDTEL_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_EDTEL_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -823,7 +823,7 @@ public static boolean validateCareTeamMemberScheduleObservationEDTELValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_ED_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_TEAM_MEMBER_SCHEDULE_OBSERVATION_ED_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamOrganizerOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamOrganizerOperations.java
index e74045ae96..677623b5fc 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamOrganizerOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamOrganizerOperations.java
@@ -105,7 +105,7 @@ protected CareTeamOrganizerOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -170,7 +170,7 @@ public static boolean validateCareTeamOrganizerTemplateId(CareTeamOrganizer care
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -280,7 +280,7 @@ public static boolean validateCareTeamOrganizerCodeP(CareTeamOrganizer careTeamO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateCareTeamOrganizerCodeP(CareTeamOrganizer, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Care Team Organizer Code P</em>}' operation.
@@ -301,7 +301,7 @@ public static boolean validateCareTeamOrganizerCodeP(CareTeamOrganizer careTeamO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -366,7 +366,7 @@ public static boolean validateCareTeamOrganizerCode(CareTeamOrganizer careTeamOr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -415,7 +415,7 @@ public static boolean validateCareTeamOrganizerStatusCodeP(CareTeamOrganizer car
 					"org.openhealthtools.mdht.uml.cda.consol.CareTeamOrganizerStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.CareTeamOrganizerStatusCodeP", passToken);
 				}
 				passToken.add(careTeamOrganizer);
@@ -447,7 +447,7 @@ public static boolean validateCareTeamOrganizerStatusCodeP(CareTeamOrganizer car
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -520,7 +520,7 @@ public static boolean validateCareTeamOrganizerStatusCode(CareTeamOrganizer care
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -587,7 +587,7 @@ public static boolean validateCareTeamOrganizerEffectiveTime(CareTeamOrganizer c
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -652,7 +652,7 @@ public static boolean validateCareTeamOrganizerClassCode(CareTeamOrganizer careT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -717,7 +717,7 @@ public static boolean validateCareTeamOrganizerMoodCode(CareTeamOrganizer careTe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_CARE_TEAM_MEMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_CARE_TEAM_MEMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -784,7 +784,7 @@ public static boolean validateCareTeamOrganizerCareTeamMember(CareTeamOrganizer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_CARE_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_CARE_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -850,7 +850,7 @@ public static boolean validateCareTeamOrganizerCareLocation(CareTeamOrganizer ca
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_NOTE_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_NOTE_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -916,7 +916,7 @@ public static boolean validateCareTeamOrganizerNoteActivity(CareTeamOrganizer ca
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_CARE_TEAM_TYPE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_CARE_TEAM_TYPE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -983,7 +983,7 @@ public static boolean validateCareTeamOrganizerCareTeamTypeObservation(CareTeamO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_CARE_TEAM_MEMBER_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_CARE_TEAM_MEMBER_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1050,7 +1050,7 @@ public static boolean validateCareTeamOrganizerCareTeamMemberAct(CareTeamOrganiz
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_ORGANIZER_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1115,7 +1115,7 @@ public static boolean validateCareTeamOrganizerAuthor(CareTeamOrganizer careTeam
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_TEAM_ORGANIZER_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_TEAM_ORGANIZER_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1188,7 +1188,7 @@ public static boolean validateCareTeamOrganizerIVLTSLow(CareTeamOrganizer careTe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_TEAM_ORGANIZER_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CARE_TEAM_ORGANIZER_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1376,7 +1376,7 @@ public static EList<CareTeamMemberAct> getCareTeamMemberActs(CareTeamOrganizer c
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CARE_TEAM_MEMBER_ACTS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<CareTeamMemberAct> result = (Collection<CareTeamMemberAct>) query.evaluate(careTeamOrganizer);
-		return new BasicEList.UnmodifiableEList<CareTeamMemberAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // CareTeamOrganizerOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamTypeObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamTypeObservationOperations.java
index 06bdd05dbb..c0c2ee7c4d 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamTypeObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamTypeObservationOperations.java
@@ -84,7 +84,7 @@ protected CareTeamTypeObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_TYPE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_TYPE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateCareTeamTypeObservationTemplateId(CareTeamTypeObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_TYPE_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_TYPE_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -200,7 +200,7 @@ public static boolean validateCareTeamTypeObservationCodeP(CareTeamTypeObservati
 					"org.openhealthtools.mdht.uml.cda.consol.CareTeamTypeObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.CareTeamTypeObservationCodeP", passToken);
 				}
 				passToken.add(careTeamTypeObservation);
@@ -232,7 +232,7 @@ public static boolean validateCareTeamTypeObservationCodeP(CareTeamTypeObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_TYPE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_TYPE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -353,7 +353,7 @@ public static boolean validateCareTeamTypeObservationStatusCodeP(CareTeamTypeObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_TYPE_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_TYPE_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateCareTeamTypeObservationStatusCodeP(CareTeamTypeObservation, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Care Team Type Observation Status Code P</em>}' operation.
@@ -374,7 +374,7 @@ public static boolean validateCareTeamTypeObservationStatusCodeP(CareTeamTypeObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_TYPE_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_TYPE_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -443,7 +443,7 @@ public static boolean validateCareTeamTypeObservationStatusCode(CareTeamTypeObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_TYPE_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_TYPE_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -509,7 +509,7 @@ public static boolean validateCareTeamTypeObservationValue(CareTeamTypeObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_TYPE_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_TYPE_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -576,7 +576,7 @@ public static boolean validateCareTeamTypeObservationValueP(CareTeamTypeObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_TYPE_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_TYPE_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -643,7 +643,7 @@ public static boolean validateCareTeamTypeObservationClassCode(CareTeamTypeObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_TYPE_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAM_TYPE_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamsOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamsOperations.java
index 04009c8ca9..fb1456f2c3 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamsOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CareTeamsOperations.java
@@ -87,7 +87,7 @@ protected CareTeamsOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAMS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAMS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -196,7 +196,7 @@ public static boolean validateCareTeamsCodeP(CareTeams careTeams, DiagnosticChai
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAMS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAMS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateCareTeamsCodeP(CareTeams, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Care Teams Code P</em>}' operation.
@@ -217,7 +217,7 @@ public static boolean validateCareTeamsCodeP(CareTeams careTeams, DiagnosticChai
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAMS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAMS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -281,7 +281,7 @@ public static boolean validateCareTeamsCode(CareTeams careTeams, DiagnosticChain
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAMS_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAMS_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -345,7 +345,7 @@ public static boolean validateCareTeamsTitle(CareTeams careTeams, DiagnosticChai
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAMS_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAMS_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -409,7 +409,7 @@ public static boolean validateCareTeamsText(CareTeams careTeams, DiagnosticChain
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAMS_CARE_TEAM_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CARE_TEAMS_CARE_TEAM_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -498,7 +498,7 @@ public static EList<CareTeamOrganizer> getCareTeamOrganizers(CareTeams careTeams
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CARE_TEAM_ORGANIZERS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<CareTeamOrganizer> result = (Collection<CareTeamOrganizer>) query.evaluate(careTeams);
-		return new BasicEList.UnmodifiableEList<CareTeamOrganizer>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // CareTeamsOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CaregiverCharacteristicsOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CaregiverCharacteristicsOperations.java
index 8a37364ac7..49717f20da 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CaregiverCharacteristicsOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CaregiverCharacteristicsOperations.java
@@ -91,7 +91,7 @@ protected CaregiverCharacteristicsOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_VALUE_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_VALUE_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -160,7 +160,7 @@ public static boolean validateCaregiverCharacteristicsValueCodeSystem(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -227,7 +227,7 @@ public static boolean validateCaregiverCharacteristicsTemplateId(CaregiverCharac
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -294,7 +294,7 @@ public static boolean validateCaregiverCharacteristicsClassCode(CaregiverCharact
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -361,7 +361,7 @@ public static boolean validateCaregiverCharacteristicsMoodCode(CaregiverCharacte
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -427,7 +427,7 @@ public static boolean validateCaregiverCharacteristicsId(CaregiverCharacteristic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -494,7 +494,7 @@ public static boolean validateCaregiverCharacteristicsCode(CaregiverCharacterist
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -561,7 +561,7 @@ public static boolean validateCaregiverCharacteristicsStatusCode(CaregiverCharac
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -628,7 +628,7 @@ public static boolean validateCaregiverCharacteristicsStatusCodeP(CaregiverChara
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -694,7 +694,7 @@ public static boolean validateCaregiverCharacteristicsValue(CaregiverCharacteris
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CAREGIVER_CHARACTERISTICS_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -761,7 +761,7 @@ public static boolean validateCaregiverCharacteristicsParticipant(CaregiverChara
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CAREGIVER_CHARACTERISTICS_PARTICIPANT_PARTICIPANT_ROLE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CAREGIVER_CHARACTERISTICS_PARTICIPANT_PARTICIPANT_ROLE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -836,7 +836,7 @@ public static boolean validateCaregiverCharacteristicsParticipantParticipantRole
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CAREGIVER_CHARACTERISTICS_PARTICIPANT_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CAREGIVER_CHARACTERISTICS_PARTICIPANT_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -910,7 +910,7 @@ public static boolean validateCaregiverCharacteristicsParticipantTimeLow(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CAREGIVER_CHARACTERISTICS_PARTICIPANT_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CAREGIVER_CHARACTERISTICS_PARTICIPANT_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -984,7 +984,7 @@ public static boolean validateCaregiverCharacteristicsParticipantTimeHigh(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CAREGIVER_CHARACTERISTICS_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CAREGIVER_CHARACTERISTICS_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1059,7 +1059,7 @@ public static boolean validateCaregiverCharacteristicsParticipantTypeCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CAREGIVER_CHARACTERISTICS_PARTICIPANT_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CAREGIVER_CHARACTERISTICS_PARTICIPANT_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1133,7 +1133,7 @@ public static boolean validateCaregiverCharacteristicsParticipantTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CAREGIVER_CHARACTERISTICS_PARTICIPANT_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CAREGIVER_CHARACTERISTICS_PARTICIPANT_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CatalogNumberObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CatalogNumberObservationOperations.java
index 4597c19075..02197a60c1 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CatalogNumberObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CatalogNumberObservationOperations.java
@@ -81,7 +81,7 @@ protected CatalogNumberObservationOperations() {
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_CATALOG_NUMBER_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CATALOG_NUMBER_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -146,7 +146,7 @@ public static boolean validateCatalogNumberObservationTemplateId(CatalogNumberOb
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_CATALOG_NUMBER_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CATALOG_NUMBER_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -194,7 +194,7 @@ public static boolean validateCatalogNumberObservationCodeP(CatalogNumberObserva
 					"org.openhealthtools.mdht.uml.cda.consol.CatalogNumberObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.CatalogNumberObservationCodeP", passToken);
 				}
 				passToken.add(catalogNumberObservation);
@@ -225,7 +225,7 @@ public static boolean validateCatalogNumberObservationCodeP(CatalogNumberObserva
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_CATALOG_NUMBER_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CATALOG_NUMBER_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -297,7 +297,7 @@ public static boolean validateCatalogNumberObservationCode(CatalogNumberObservat
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_CATALOG_NUMBER_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CATALOG_NUMBER_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CharacteristicsOfHomeEnvironmentOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CharacteristicsOfHomeEnvironmentOperations.java
index ade79824c7..ed5c2039ab 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CharacteristicsOfHomeEnvironmentOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CharacteristicsOfHomeEnvironmentOperations.java
@@ -81,7 +81,7 @@ protected CharacteristicsOfHomeEnvironmentOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateCharacteristicsOfHomeEnvironmentTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateCharacteristicsOfHomeEnvironmentClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -291,7 +291,7 @@ public static boolean validateCharacteristicsOfHomeEnvironmentMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -360,7 +360,7 @@ public static boolean validateCharacteristicsOfHomeEnvironmentId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -413,7 +413,7 @@ public static boolean validateCharacteristicsOfHomeEnvironmentCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.CharacteristicsOfHomeEnvironmentCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.CharacteristicsOfHomeEnvironmentCodeP", passToken);
 				}
@@ -446,7 +446,7 @@ public static boolean validateCharacteristicsOfHomeEnvironmentCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -526,7 +526,7 @@ public static boolean validateCharacteristicsOfHomeEnvironmentCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -596,7 +596,7 @@ public static boolean validateCharacteristicsOfHomeEnvironmentStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -668,7 +668,7 @@ public static boolean validateCharacteristicsOfHomeEnvironmentStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -738,7 +738,7 @@ public static boolean validateCharacteristicsOfHomeEnvironmentValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHARACTERISTICS_OF_HOME_ENVIRONMENT_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ChiefComplaintAndReasonForVisitSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ChiefComplaintAndReasonForVisitSectionOperations.java
index 4e0f9287cd..5552bb35ca 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ChiefComplaintAndReasonForVisitSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ChiefComplaintAndReasonForVisitSectionOperations.java
@@ -79,7 +79,7 @@ protected ChiefComplaintAndReasonForVisitSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateChiefComplaintAndReasonForVisitSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateChiefComplaintAndReasonForVisitSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -291,7 +291,7 @@ public static boolean validateChiefComplaintAndReasonForVisitSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -361,7 +361,7 @@ public static boolean validateChiefComplaintAndReasonForVisitSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ChiefComplaintSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ChiefComplaintSectionOperations.java
index 14f053004f..87ae00481b 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ChiefComplaintSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ChiefComplaintSectionOperations.java
@@ -79,7 +79,7 @@ protected ChiefComplaintSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateChiefComplaintSectionTemplateId(ChiefComplaintSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -213,7 +213,7 @@ public static boolean validateChiefComplaintSectionCode(ChiefComplaintSection ch
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -279,7 +279,7 @@ public static boolean validateChiefComplaintSectionCodeP(ChiefComplaintSection c
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -344,7 +344,7 @@ public static boolean validateChiefComplaintSectionText(ChiefComplaintSection ch
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CHIEF_COMPLAINT_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CodeObservationsOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CodeObservationsOperations.java
index 54d44906ea..7b0143aae3 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CodeObservationsOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CodeObservationsOperations.java
@@ -91,7 +91,7 @@ protected CodeObservationsOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CODE_OBSERVATIONS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CODE_OBSERVATIONS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -156,7 +156,7 @@ public static boolean validateCodeObservationsTemplateId(CodeObservations codeOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CODE_OBSERVATIONS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CODE_OBSERVATIONS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateCodeObservationsClassCode(CodeObservations codeObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CODE_OBSERVATIONS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CODE_OBSERVATIONS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -286,7 +286,7 @@ public static boolean validateCodeObservationsMoodCode(CodeObservations codeObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CODE_OBSERVATIONS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CODE_OBSERVATIONS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -351,7 +351,7 @@ public static boolean validateCodeObservationsCode(CodeObservations codeObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CODE_OBSERVATIONS_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CODE_OBSERVATIONS_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -416,7 +416,7 @@ public static boolean validateCodeObservationsEffectiveTime(CodeObservations cod
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CODE_OBSERVATIONS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CODE_OBSERVATIONS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -481,7 +481,7 @@ public static boolean validateCodeObservationsValue(CodeObservations codeObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CODE_OBSERVATIONS_SOP_INSTANCE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CODE_OBSERVATIONS_SOP_INSTANCE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -548,7 +548,7 @@ public static boolean validateCodeObservationsSOPInstanceObservation(CodeObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CODE_OBSERVATIONS_QUANTITY_MEASUREMENT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CODE_OBSERVATIONS_QUANTITY_MEASUREMENT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -642,7 +642,7 @@ public static EList<SOPInstanceObservation> getSOPInstanceObservations(CodeObser
 		@SuppressWarnings("unchecked")
 		Collection<SOPInstanceObservation> result = (Collection<SOPInstanceObservation>) query.evaluate(
 			codeObservations);
-		return new BasicEList.UnmodifiableEList<SOPInstanceObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -692,7 +692,7 @@ public static EList<QuantityMeasurementObservation> getQuantityMeasurementObserv
 		@SuppressWarnings("unchecked")
 		Collection<QuantityMeasurementObservation> result = (Collection<QuantityMeasurementObservation>) query.evaluate(
 			codeObservations);
-		return new BasicEList.UnmodifiableEList<QuantityMeasurementObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // CodeObservationsOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CognitiveAbilitiesObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CognitiveAbilitiesObservationOperations.java
index e23af8ae61..648d35f828 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CognitiveAbilitiesObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CognitiveAbilitiesObservationOperations.java
@@ -91,7 +91,7 @@ protected CognitiveAbilitiesObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -161,7 +161,7 @@ public static boolean validateCognitiveAbilitiesObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -231,7 +231,7 @@ public static boolean validateCognitiveAbilitiesObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -300,7 +300,7 @@ public static boolean validateCognitiveAbilitiesObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -368,7 +368,7 @@ public static boolean validateCognitiveAbilitiesObservationId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -420,7 +420,7 @@ public static boolean validateCognitiveAbilitiesObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.CognitiveAbilitiesObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.CognitiveAbilitiesObservationCodeP", passToken);
 				}
@@ -453,7 +453,7 @@ public static boolean validateCognitiveAbilitiesObservationCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -531,7 +531,7 @@ public static boolean validateCognitiveAbilitiesObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -601,7 +601,7 @@ public static boolean validateCognitiveAbilitiesObservationText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -671,7 +671,7 @@ public static boolean validateCognitiveAbilitiesObservationStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -741,7 +741,7 @@ public static boolean validateCognitiveAbilitiesObservationStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -813,7 +813,7 @@ public static boolean validateCognitiveAbilitiesObservationEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -882,7 +882,7 @@ public static boolean validateCognitiveAbilitiesObservationValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -951,7 +951,7 @@ public static boolean validateCognitiveAbilitiesObservationValueP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1021,7 +1021,7 @@ public static boolean validateCognitiveAbilitiesObservationAssessmentScaleObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_ABILITIES_OBSERVATION_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1119,7 +1119,7 @@ public static EList<AssessmentScaleObservation> getAssessmentScaleObservations(
 		@SuppressWarnings("unchecked")
 		Collection<AssessmentScaleObservation> result = (Collection<AssessmentScaleObservation>) query.evaluate(
 			cognitiveAbilitiesObservation);
-		return new BasicEList.UnmodifiableEList<AssessmentScaleObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // CognitiveAbilitiesObservationOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CognitiveStatusProblemObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CognitiveStatusProblemObservationOperations.java
index 66f4a63ca8..48e7bfca41 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CognitiveStatusProblemObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CognitiveStatusProblemObservationOperations.java
@@ -100,7 +100,7 @@ protected CognitiveStatusProblemObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_PROBLEM_OBSERVATION_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_PROBLEM_OBSERVATION_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -170,7 +170,7 @@ public static boolean validateCognitiveStatusProblemObservationMethodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_PROBLEM_OBSERVATION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_PROBLEM_OBSERVATION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -241,7 +241,7 @@ public static boolean validateCognitiveStatusProblemObservationNonMedicinalSuppl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_PROBLEM_OBSERVATION_CAREGIVER_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_PROBLEM_OBSERVATION_CAREGIVER_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -312,7 +312,7 @@ public static boolean validateCognitiveStatusProblemObservationCaregiverCharacte
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_PROBLEM_OBSERVATION_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_PROBLEM_OBSERVATION_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -411,7 +411,7 @@ public static EList<NonMedicinalSupplyActivity> getNonMedicinalSupplyActivities(
 		@SuppressWarnings("unchecked")
 		Collection<NonMedicinalSupplyActivity> result = (Collection<NonMedicinalSupplyActivity>) query.evaluate(
 			cognitiveStatusProblemObservation);
-		return new BasicEList.UnmodifiableEList<NonMedicinalSupplyActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -460,7 +460,7 @@ public static EList<CaregiverCharacteristics> getCaregiverCharacteristicss(
 		@SuppressWarnings("unchecked")
 		Collection<CaregiverCharacteristics> result = (Collection<CaregiverCharacteristics>) query.evaluate(
 			cognitiveStatusProblemObservation);
-		return new BasicEList.UnmodifiableEList<CaregiverCharacteristics>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -510,7 +510,7 @@ public static EList<AssessmentScaleObservation> getAssessmentScaleObservations(
 		@SuppressWarnings("unchecked")
 		Collection<AssessmentScaleObservation> result = (Collection<AssessmentScaleObservation>) query.evaluate(
 			cognitiveStatusProblemObservation);
-		return new BasicEList.UnmodifiableEList<AssessmentScaleObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -532,7 +532,7 @@ public static EList<AssessmentScaleObservation> getAssessmentScaleObservations(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -602,7 +602,7 @@ public static boolean validateProblemObservationHasTextReference(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -672,7 +672,7 @@ public static boolean validateProblemObservationHasTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_ONSET_DATE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_ONSET_DATE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -741,7 +741,7 @@ public static boolean validateProblemObservationHasOnsetDate(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_RESOLUTION_DATE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_RESOLUTION_DATE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -811,7 +811,7 @@ public static boolean validateProblemObservationHasResolutionDate(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -879,7 +879,7 @@ public static boolean validateProblemObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -946,7 +946,7 @@ public static boolean validateProblemObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1013,7 +1013,7 @@ public static boolean validateProblemObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_NEGATION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_NEGATION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1081,7 +1081,7 @@ public static boolean validateProblemObservationNegationInd(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1147,7 +1147,7 @@ public static boolean validateProblemObservationId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1197,7 +1197,7 @@ public static boolean validateProblemObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ProblemObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ProblemObservationCodeP", passToken);
 				}
 				passToken.add(cognitiveStatusProblemObservation);
@@ -1229,7 +1229,7 @@ public static boolean validateProblemObservationCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1304,7 +1304,7 @@ public static boolean validateProblemObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1371,7 +1371,7 @@ public static boolean validateProblemObservationText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1439,7 +1439,7 @@ public static boolean validateProblemObservationStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1508,7 +1508,7 @@ public static boolean validateProblemObservationEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1558,7 +1558,7 @@ public static boolean validateProblemObservationValueP(
 					"org.openhealthtools.mdht.uml.cda.consol.ProblemObservationValueP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ProblemObservationValueP", passToken);
 				}
 				passToken.add(cognitiveStatusProblemObservation);
@@ -1590,7 +1590,7 @@ public static boolean validateProblemObservationValueP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CognitiveStatusResultObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CognitiveStatusResultObservationOperations.java
index a84e7110f5..a6f14d5090 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CognitiveStatusResultObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CognitiveStatusResultObservationOperations.java
@@ -106,7 +106,7 @@ protected CognitiveStatusResultObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_VALUE_DATATYPE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_VALUE_DATATYPE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -176,7 +176,7 @@ public static boolean validateCognitiveStatusResultObservationValueDatatype(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -225,7 +225,7 @@ public static boolean validateResultObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ResultObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ResultObservationCodeP", passToken);
 				}
 				passToken.add(cognitiveStatusResultObservation);
@@ -255,7 +255,7 @@ public static boolean validateResultObservationCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -325,7 +325,7 @@ public static boolean validateCognitiveStatusResultObservationAuthor(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -396,7 +396,7 @@ public static boolean validateCognitiveStatusResultObservationNonMedicinalSupply
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_CAREGIVER_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_CAREGIVER_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -467,7 +467,7 @@ public static boolean validateCognitiveStatusResultObservationCaregiverCharacter
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -538,7 +538,7 @@ public static boolean validateCognitiveStatusResultObservationAssessmentScaleObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -608,7 +608,7 @@ public static boolean validateCognitiveStatusResultObservationReferenceRange(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE_NO_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE_NO_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -685,7 +685,7 @@ public static boolean validateCognitiveStatusResultObservationReferenceRangeObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -789,7 +789,7 @@ public static EList<NonMedicinalSupplyActivity> getNonMedicinalSupplyActivities(
 		@SuppressWarnings("unchecked")
 		Collection<NonMedicinalSupplyActivity> result = (Collection<NonMedicinalSupplyActivity>) query.evaluate(
 			cognitiveStatusResultObservation);
-		return new BasicEList.UnmodifiableEList<NonMedicinalSupplyActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -838,7 +838,7 @@ public static EList<CaregiverCharacteristics> getCaregiverCharacteristicss(
 		@SuppressWarnings("unchecked")
 		Collection<CaregiverCharacteristics> result = (Collection<CaregiverCharacteristics>) query.evaluate(
 			cognitiveStatusResultObservation);
-		return new BasicEList.UnmodifiableEList<CaregiverCharacteristics>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -888,7 +888,7 @@ public static EList<AssessmentScaleObservation> getAssessmentScaleObservations(
 		@SuppressWarnings("unchecked")
 		Collection<AssessmentScaleObservation> result = (Collection<AssessmentScaleObservation>) query.evaluate(
 			cognitiveStatusResultObservation);
-		return new BasicEList.UnmodifiableEList<AssessmentScaleObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -910,7 +910,7 @@ public static EList<AssessmentScaleObservation> getAssessmentScaleObservations(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -978,7 +978,7 @@ public static boolean validateResultObservationTextReference(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1048,7 +1048,7 @@ public static boolean validateResultObservationTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1115,7 +1115,7 @@ public static boolean validateResultObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1182,7 +1182,7 @@ public static boolean validateResultObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1249,7 +1249,7 @@ public static boolean validateResultObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1316,7 +1316,7 @@ public static boolean validateResultObservationId(CognitiveStatusResultObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1391,7 +1391,7 @@ public static boolean validateResultObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1457,7 +1457,7 @@ public static boolean validateResultObservationText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1507,7 +1507,7 @@ public static boolean validateResultObservationStatusCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ResultObservationStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ResultObservationStatusCodeP", passToken);
 				}
 				passToken.add(cognitiveStatusResultObservation);
@@ -1538,7 +1538,7 @@ public static boolean validateResultObservationStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1614,7 +1614,7 @@ public static boolean validateResultObservationStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1682,7 +1682,7 @@ public static boolean validateResultObservationEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1748,7 +1748,7 @@ public static boolean validateResultObservationValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_INTERPRETATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_INTERPRETATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1818,7 +1818,7 @@ public static boolean validateResultObservationInterpretationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1885,7 +1885,7 @@ public static boolean validateResultObservationMethodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CognitiveStatusResultOrganizerOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CognitiveStatusResultOrganizerOperations.java
index f8dec718a3..927dc07916 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CognitiveStatusResultOrganizerOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CognitiveStatusResultOrganizerOperations.java
@@ -85,7 +85,7 @@ protected CognitiveStatusResultOrganizerOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_ORGANIZER_CODE_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_ORGANIZER_CODE_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -183,7 +183,7 @@ public static EList<CognitiveStatusResultObservation> getConsolCognitiveStatusRe
 		@SuppressWarnings("unchecked")
 		Collection<CognitiveStatusResultObservation> result = (Collection<CognitiveStatusResultObservation>) query.evaluate(
 			cognitiveStatusResultOrganizer);
-		return new BasicEList.UnmodifiableEList<CognitiveStatusResultObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -205,7 +205,7 @@ public static EList<CognitiveStatusResultObservation> getConsolCognitiveStatusRe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -272,7 +272,7 @@ public static boolean validateResultOrganizerTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -339,7 +339,7 @@ public static boolean validateResultOrganizerClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -405,7 +405,7 @@ public static boolean validateResultOrganizerMoodCode(CognitiveStatusResultOrgan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -470,7 +470,7 @@ public static boolean validateResultOrganizerId(CognitiveStatusResultOrganizer c
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -535,7 +535,7 @@ public static boolean validateResultOrganizerCode(CognitiveStatusResultOrganizer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -585,7 +585,7 @@ public static boolean validateResultOrganizerStatusCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ResultOrganizerStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ResultOrganizerStatusCodeP", passToken);
 				}
 				passToken.add(cognitiveStatusResultOrganizer);
@@ -616,7 +616,7 @@ public static boolean validateResultOrganizerStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -692,7 +692,7 @@ public static boolean validateResultOrganizerStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CommentActivityOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CommentActivityOperations.java
index 8e7b97d502..804a14cdf5 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CommentActivityOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CommentActivityOperations.java
@@ -83,7 +83,7 @@ protected CommentActivityOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMMENT_ACTIVITY_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMMENT_ACTIVITY_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateCommentActivityTextReference(CommentActivity comme
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMMENT_ACTIVITY_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMMENT_ACTIVITY_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -215,7 +215,7 @@ public static boolean validateCommentActivityTextReferenceValue(CommentActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMMENT_ACTIVITY_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMMENT_ACTIVITY_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -280,7 +280,7 @@ public static boolean validateCommentActivityReferenceValue(CommentActivity comm
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMMENT_ACTIVITY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMMENT_ACTIVITY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -345,7 +345,7 @@ public static boolean validateCommentActivityTemplateId(CommentActivity commentA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMMENT_ACTIVITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMMENT_ACTIVITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -410,7 +410,7 @@ public static boolean validateCommentActivityClassCode(CommentActivity commentAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMMENT_ACTIVITY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMMENT_ACTIVITY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -477,7 +477,7 @@ public static boolean validateCommentActivityMoodCode(CommentActivity commentAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMMENT_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMMENT_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -542,7 +542,7 @@ public static boolean validateCommentActivityCode(CommentActivity commentActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMMENT_ACTIVITY_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMMENT_ACTIVITY_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -607,7 +607,7 @@ public static boolean validateCommentActivityText(CommentActivity commentActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMMENT_ACTIVITY_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMMENT_ACTIVITY_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CompanyNameObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CompanyNameObservationOperations.java
index 6ce0c723d7..cad6c9ae73 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CompanyNameObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CompanyNameObservationOperations.java
@@ -81,7 +81,7 @@ protected CompanyNameObservationOperations() {
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_COMPANY_NAME_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMPANY_NAME_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -146,7 +146,7 @@ public static boolean validateCompanyNameObservationTemplateId(CompanyNameObserv
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_COMPANY_NAME_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMPANY_NAME_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -194,7 +194,7 @@ public static boolean validateCompanyNameObservationCodeP(CompanyNameObservation
 					"org.openhealthtools.mdht.uml.cda.consol.CompanyNameObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.CompanyNameObservationCodeP", passToken);
 				}
 				passToken.add(companyNameObservation);
@@ -225,7 +225,7 @@ public static boolean validateCompanyNameObservationCodeP(CompanyNameObservation
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_COMPANY_NAME_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMPANY_NAME_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -297,7 +297,7 @@ public static boolean validateCompanyNameObservationCode(CompanyNameObservation
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_COMPANY_NAME_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMPANY_NAME_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ComplicationsSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ComplicationsSection2Operations.java
index d904dcc396..36b5a43220 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ComplicationsSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ComplicationsSection2Operations.java
@@ -81,7 +81,7 @@ protected ComplicationsSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_EXPLICIT_COMPLICATIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_EXPLICIT_COMPLICATIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -149,7 +149,7 @@ public static boolean validateComplicationsSectionExplicitComplications(Complica
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -244,7 +244,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation2> result = (Collection<ProblemObservation2>) query.evaluate(
 			complicationsSection2);
-		return new BasicEList.UnmodifiableEList<ProblemObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -266,7 +266,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -314,7 +314,7 @@ public static boolean validateComplicationsSectionCodeP(ComplicationsSection2 co
 					"org.openhealthtools.mdht.uml.cda.consol.ComplicationsSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ComplicationsSectionCodeP", passToken);
 				}
 				passToken.add(complicationsSection2);
@@ -346,7 +346,7 @@ public static boolean validateComplicationsSectionCodeP(ComplicationsSection2 co
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -419,7 +419,7 @@ public static boolean validateComplicationsSectionCode(ComplicationsSection2 com
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ComplicationsSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ComplicationsSectionOperations.java
index 857bfa04df..4b63c3ee34 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ComplicationsSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ComplicationsSectionOperations.java
@@ -87,7 +87,7 @@ protected ComplicationsSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -155,7 +155,7 @@ public static boolean validateComplicationsSectionTemplateId(ComplicationsSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -220,7 +220,7 @@ public static boolean validateComplicationsSectionCode(ComplicationsSection comp
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -285,7 +285,7 @@ public static boolean validateComplicationsSectionCodeP(ComplicationsSection com
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -350,7 +350,7 @@ public static boolean validateComplicationsSectionTitle(ComplicationsSection com
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -415,7 +415,7 @@ public static boolean validateComplicationsSectionText(ComplicationsSection comp
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COMPLICATIONS_SECTION_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -507,7 +507,7 @@ public static EList<ProblemObservation> getProblemObservations(ComplicationsSect
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PROBLEM_OBSERVATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation> result = (Collection<ProblemObservation>) query.evaluate(complicationsSection);
-		return new BasicEList.UnmodifiableEList<ProblemObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // ComplicationsSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ConsultationNote2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ConsultationNote2Operations.java
index b21dc9f07a..b1c2c68052 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ConsultationNote2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ConsultationNote2Operations.java
@@ -179,7 +179,7 @@ protected ConsultationNote2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_HAS_AN_ASSEMENT_AND_PLAN_SECTION2_OR_BOTH_ASSEMENT_SECTION_AND_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_HAS_AN_ASSEMENT_AND_PLAN_SECTION2_OR_BOTH_ASSEMENT_SECTION_AND_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -250,7 +250,7 @@ public static boolean validateConsultationNote2HasAnAssementAndPlanSection2OrBot
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_DOES_NOT_HAVE_ASSEMENT_AND_PLAN_SECTION2_WHEN_ASSEMENT_OR_PLAN_OF_TREATMENT2_ARE_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_DOES_NOT_HAVE_ASSEMENT_AND_PLAN_SECTION2_WHEN_ASSEMENT_OR_PLAN_OF_TREATMENT2_ARE_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -321,7 +321,7 @@ public static boolean validateConsultationNote2DoesNotHaveAssementAndPlanSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_DOES_NOT_HAVE_CHIEF_COMPLAINT_WITH_CHIEF_COMPLAINT_OR_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_DOES_NOT_HAVE_CHIEF_COMPLAINT_WITH_CHIEF_COMPLAINT_OR_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -392,7 +392,7 @@ public static boolean validateConsultationNote2DoesNotHaveChiefComplaintWithChie
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_HAS_AN_ASSEMENT_AND_PLAN_SECTION_OR_INDIVIDUAL_ASSEMENT_AND_PLAN_SECTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_HAS_AN_ASSEMENT_AND_PLAN_SECTION_OR_INDIVIDUAL_ASSEMENT_AND_PLAN_SECTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -462,7 +462,7 @@ public static boolean validateConsultationNote2HasAnAssementAndPlanSectionOrIndi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -510,7 +510,7 @@ public static boolean validateConsultationNote2CodeP(ConsultationNote2 consultat
 					"org.openhealthtools.mdht.uml.cda.consol.ConsultationNote2CodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ConsultationNote2CodeP", passToken);
 				}
 				passToken.add(consultationNote2);
@@ -542,7 +542,7 @@ public static boolean validateConsultationNote2CodeP(ConsultationNote2 consultat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -615,7 +615,7 @@ public static boolean validateConsultationNote2Code(ConsultationNote2 consultati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -680,7 +680,7 @@ public static boolean validateConsultationNote2Participant(ConsultationNote2 con
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_IN_FULFILLMENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_IN_FULFILLMENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -747,7 +747,7 @@ public static boolean validateConsultationNote2InFulfillmentOf(ConsultationNote2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -812,7 +812,7 @@ public static boolean validateConsultationNote2ComponentOf(ConsultationNote2 con
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -879,7 +879,7 @@ public static boolean validateConsultationNote2AssessmentSection(ConsultationNot
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_ASSESSMENT_AND_PLAN_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_ASSESSMENT_AND_PLAN_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -946,7 +946,7 @@ public static boolean validateConsultationNote2AssessmentAndPlanSection2(Consult
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1013,7 +1013,7 @@ public static boolean validateConsultationNote2PlanOfTreatmentSection2(Consultat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1080,7 +1080,7 @@ public static boolean validateConsultationNote2ReasonForVisitSection(Consultatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_HISTORY_OF_PRESENT_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_HISTORY_OF_PRESENT_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1148,7 +1148,7 @@ public static boolean validateConsultationNote2HistoryOfPresentIllnessSection(Co
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_PHYSICAL_EXAM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_PHYSICAL_EXAM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1215,7 +1215,7 @@ public static boolean validateConsultationNote2PhysicalExamSection2(Consultation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_ALLERGIES_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_ALLERGIES_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1282,7 +1282,7 @@ public static boolean validateConsultationNote2AllergiesSection2(ConsultationNot
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1349,7 +1349,7 @@ public static boolean validateConsultationNote2ChiefComplaintSection(Consultatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1418,7 +1418,7 @@ public static boolean validateConsultationNote2ChiefComplaintAndReasonForVisitSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_GENERAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_GENERAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1485,7 +1485,7 @@ public static boolean validateConsultationNote2GeneralStatusSection(Consultation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_HISTORY_OF_PAST_ILLNESS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_HISTORY_OF_PAST_ILLNESS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1553,7 +1553,7 @@ public static boolean validateConsultationNote2HistoryOfPastIllnessSection2(Cons
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1622,7 +1622,7 @@ public static boolean validateConsultationNote2ImmunizationsSectionEntriesOption
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_MEDICATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_MEDICATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1689,7 +1689,7 @@ public static boolean validateConsultationNote2MedicationsSection2(ConsultationN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_PROBLEM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_PROBLEM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1756,7 +1756,7 @@ public static boolean validateConsultationNote2ProblemSection2(ConsultationNote2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_PROCEDURES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_PROCEDURES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1824,7 +1824,7 @@ public static boolean validateConsultationNote2ProceduresSectionEntriesOptional2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_RESULTS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_RESULTS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1891,7 +1891,7 @@ public static boolean validateConsultationNote2ResultsSection2(ConsultationNote2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_SOCIAL_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_SOCIAL_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1958,7 +1958,7 @@ public static boolean validateConsultationNote2SocialHistorySection2(Consultatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_VITAL_SIGNS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_VITAL_SIGNS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2025,7 +2025,7 @@ public static boolean validateConsultationNote2VitalSignsSection2(ConsultationNo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2094,7 +2094,7 @@ public static boolean validateConsultationNote2AdvanceDirectivesSectionEntriesOp
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_FUNCTIONAL_STATUS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_FUNCTIONAL_STATUS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2161,7 +2161,7 @@ public static boolean validateConsultationNote2FunctionalStatusSection2(Consulta
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2228,7 +2228,7 @@ public static boolean validateConsultationNote2ReviewOfSystemsSection(Consultati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_MEDICAL_EQUIPMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_MEDICAL_EQUIPMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2295,7 +2295,7 @@ public static boolean validateConsultationNote2MedicalEquipmentSection2(Consulta
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_MENTAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_MENTAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2362,7 +2362,7 @@ public static boolean validateConsultationNote2MentalStatusSection(ConsultationN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_NUTRITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_NUTRITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2429,7 +2429,7 @@ public static boolean validateConsultationNote2NutritionSection(ConsultationNote
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_FAMILY_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE2_FAMILY_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2496,7 +2496,7 @@ public static boolean validateConsultationNote2FamilyHistorySection2(Consultatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2570,7 +2570,7 @@ public static boolean validateConsultationNote2ParticipantAssociatedEntityAssoci
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2644,7 +2644,7 @@ public static boolean validateConsultationNote2ParticipantAssociatedEntityClassC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2717,7 +2717,7 @@ public static boolean validateConsultationNote2ParticipantAssociatedEntityId(Con
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2791,7 +2791,7 @@ public static boolean validateConsultationNote2ParticipantAssociatedEntityAddr(C
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2865,7 +2865,7 @@ public static boolean validateConsultationNote2ParticipantAssociatedEntityTeleco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2939,7 +2939,7 @@ public static boolean validateConsultationNote2ParticipantAssociatedEntityAssoci
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY_SCOPING_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY_SCOPING_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3013,7 +3013,7 @@ public static boolean validateConsultationNote2ParticipantAssociatedEntityScopin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3085,7 +3085,7 @@ public static boolean validateConsultationNote2ParticipantTypeCode(ConsultationN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3158,7 +3158,7 @@ public static boolean validateConsultationNote2ParticipantAssociatedEntity(Consu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_IN_FULFILLMENT_OF_ORDER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_IN_FULFILLMENT_OF_ORDER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3230,7 +3230,7 @@ public static boolean validateConsultationNote2InFulfillmentOfOrderId(Consultati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_IN_FULFILLMENT_OF_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_IN_FULFILLMENT_OF_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3302,7 +3302,7 @@ public static boolean validateConsultationNote2InFulfillmentOfOrder(Consultation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_DAY_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_DAY_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3378,7 +3378,7 @@ public static boolean validateConsultationNote2ComponentOfEncompassingEncounterG
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_MINUTE_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_MINUTE_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3454,7 +3454,7 @@ public static boolean validateConsultationNote2ComponentOfEncompassingEncounterG
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_SECOND_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_SECOND_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3530,7 +3530,7 @@ public static boolean validateConsultationNote2ComponentOfEncompassingEncounterG
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3606,7 +3606,7 @@ public static boolean validateConsultationNote2ComponentOfEncompassingEncounterG
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_HAS_PERSON_ORGANIZATION_OR_BOTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_HAS_PERSON_ORGANIZATION_OR_BOTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3682,7 +3682,7 @@ public static boolean validateConsultationNote2ComponentOfEncompassingEncounterR
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3757,7 +3757,7 @@ public static boolean validateConsultationNote2ComponentOfEncompassingEncounterR
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY_HAS_PERSON_ORGANIZATION_OR_BOTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY_HAS_PERSON_ORGANIZATION_OR_BOTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3833,7 +3833,7 @@ public static boolean validateConsultationNote2ComponentOfEncompassingEncounterE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3909,7 +3909,7 @@ public static boolean validateConsultationNote2ComponentOfEncompassingEncounterE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3983,7 +3983,7 @@ public static boolean validateConsultationNote2ComponentOfEncompassingEncounterI
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4057,7 +4057,7 @@ public static boolean validateConsultationNote2ComponentOfEncompassingEncounterE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4131,7 +4131,7 @@ public static boolean validateConsultationNote2ComponentOfEncompassingEncounterR
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4205,7 +4205,7 @@ public static boolean validateConsultationNote2ComponentOfEncompassingEncounterE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5415,7 +5415,7 @@ public static FamilyHistorySection2 getFamilyHistorySection2(ConsultationNote2 c
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ConsultationNoteOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ConsultationNoteOperations.java
index f509067acb..fa012ff79d 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ConsultationNoteOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ConsultationNoteOperations.java
@@ -165,7 +165,7 @@ protected ConsultationNoteOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_HAS_AN_ASSEMENT_AND_PLAN_SECTION_OR_INDIVIDUAL_ASSEMENT_AND_PLAN_SECTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_HAS_AN_ASSEMENT_AND_PLAN_SECTION_OR_INDIVIDUAL_ASSEMENT_AND_PLAN_SECTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -235,7 +235,7 @@ public static boolean validateConsultationNoteHasAnAssementAndPlanSectionOrIndiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_DOES_NOT_HAVE_INDIVIDUAL_ASSEMENT_AND_PLAN_SECTIONS_WHEN_ASSEMENT_AND_PLAN_SECTION_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_DOES_NOT_HAVE_INDIVIDUAL_ASSEMENT_AND_PLAN_SECTIONS_WHEN_ASSEMENT_AND_PLAN_SECTION_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -306,7 +306,7 @@ public static boolean validateConsultationNoteDoesNotHaveIndividualAssementAndPl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_DOES_NOT_HAVE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_WITH_CHIEF_COMPLAINT_SECTION_OR_REASON_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_DOES_NOT_HAVE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_WITH_CHIEF_COMPLAINT_SECTION_OR_REASON_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -377,7 +377,7 @@ public static boolean validateConsultationNoteDoesNotHaveChiefComplaintAndReason
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_HAS_REASON_FOR_REFERRAL_OR_REASON_FOR_VISIT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_HAS_REASON_FOR_REFERRAL_OR_REASON_FOR_VISIT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -446,7 +446,7 @@ public static boolean validateConsultationNoteHasReasonForReferralOrReasonForVis
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -494,7 +494,7 @@ public static boolean validateGeneralHeaderConstraintsCodeP(ConsultationNote con
 					"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsCodeP", passToken);
 				}
 				passToken.add(consultationNote);
@@ -524,7 +524,7 @@ public static boolean validateGeneralHeaderConstraintsCodeP(ConsultationNote con
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -589,7 +589,7 @@ public static boolean validateConsultationNoteComponentOf(ConsultationNote consu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -656,7 +656,7 @@ public static boolean validateConsultationNoteAssessmentSection(ConsultationNote
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_ASSESSMENT_AND_PLAN_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_ASSESSMENT_AND_PLAN_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -723,7 +723,7 @@ public static boolean validateConsultationNoteAssessmentAndPlanSection(Consultat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_PLAN_OF_CARE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_PLAN_OF_CARE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -790,7 +790,7 @@ public static boolean validateConsultationNotePlanOfCareSection(ConsultationNote
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_HISTORY_OF_PRESENT_ILLNESS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_HISTORY_OF_PRESENT_ILLNESS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -857,7 +857,7 @@ public static boolean validateConsultationNoteHistoryOfPresentIllness(Consultati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_PHYSICAL_EXAM_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_PHYSICAL_EXAM_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -924,7 +924,7 @@ public static boolean validateConsultationNotePhysicalExamSection(ConsultationNo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_REASON_FOR_REFERRAL_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_REASON_FOR_REFERRAL_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -991,7 +991,7 @@ public static boolean validateConsultationNoteReasonForReferralSection(Consultat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1058,7 +1058,7 @@ public static boolean validateConsultationNoteReasonForVisitSection(Consultation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_ALLERGIES_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_ALLERGIES_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1125,7 +1125,7 @@ public static boolean validateConsultationNoteAllergiesSection(ConsultationNote
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1192,7 +1192,7 @@ public static boolean validateConsultationNoteChiefComplaintSection(Consultation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1261,7 +1261,7 @@ public static boolean validateConsultationNoteChiefComplaintAndReasonForVisitSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_FAMILY_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_FAMILY_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1328,7 +1328,7 @@ public static boolean validateConsultationNoteFamilyHistorySection(ConsultationN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_GENERAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_GENERAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1395,7 +1395,7 @@ public static boolean validateConsultationNoteGeneralStatusSection(ConsultationN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_HISTORY_OF_PAST_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_HISTORY_OF_PAST_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1462,7 +1462,7 @@ public static boolean validateConsultationNoteHistoryOfPastIllnessSection(Consul
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_IMMUNIZATIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_IMMUNIZATIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1529,7 +1529,7 @@ public static boolean validateConsultationNoteImmunizationsSection(ConsultationN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1597,7 +1597,7 @@ public static boolean validateConsultationNoteMedicationsSectionEntriesOptional(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_PROBLEM_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_PROBLEM_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1665,7 +1665,7 @@ public static boolean validateConsultationNoteProblemSectionEntriesOptional(Cons
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_PROCEDURES_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_PROCEDURES_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1733,7 +1733,7 @@ public static boolean validateConsultationNoteProceduresSectionEntriesOptional(C
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_RESULTS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_RESULTS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1801,7 +1801,7 @@ public static boolean validateConsultationNoteResultsSectionEntriesOptional(Cons
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1868,7 +1868,7 @@ public static boolean validateConsultationNoteReviewOfSystemsSection(Consultatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_SOCIAL_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_SOCIAL_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1935,7 +1935,7 @@ public static boolean validateConsultationNoteSocialHistorySection(ConsultationN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2003,7 +2003,7 @@ public static boolean validateConsultationNoteVitalSignsSectionEntriesOptional(C
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_IN_FULFILLMENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONSULTATION_NOTE_IN_FULFILLMENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2070,7 +2070,7 @@ public static boolean validateConsultationNoteInFulfillmentOf(ConsultationNote c
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_HAS_PERSON_ORGANIZATION_OR_BOTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_HAS_PERSON_ORGANIZATION_OR_BOTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2146,7 +2146,7 @@ public static boolean validateConsultationNoteComponentOfEncompassingEncounter2R
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_RESPONSIBLE_PARTY_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_RESPONSIBLE_PARTY_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2221,7 +2221,7 @@ public static boolean validateConsultationNoteComponentOfEncompassingEncounter2R
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY_HAS_PERSON_ORGANIZATION_OR_BOTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY_HAS_PERSON_ORGANIZATION_OR_BOTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2297,7 +2297,7 @@ public static boolean validateConsultationNoteComponentOfEncompassingEncounter2E
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2373,7 +2373,7 @@ public static boolean validateConsultationNoteComponentOfEncompassingEncounter2E
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_PRECISE_TO_THE_DAY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_PRECISE_TO_THE_DAY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2447,7 +2447,7 @@ public static boolean validateConsultationNoteComponentOfEncompassingEncounter2P
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_PRECISE_TO_THE_MINUTE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_PRECISE_TO_THE_MINUTE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2521,7 +2521,7 @@ public static boolean validateConsultationNoteComponentOfEncompassingEncounter2P
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_PRECISE_TO_THE_SECOND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_PRECISE_TO_THE_SECOND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2595,7 +2595,7 @@ public static boolean validateConsultationNoteComponentOfEncompassingEncounter2P
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2671,7 +2671,7 @@ public static boolean validateConsultationNoteComponentOfEncompassingEncounter2I
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2745,7 +2745,7 @@ public static boolean validateConsultationNoteComponentOfEncompassingEncounter2E
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2819,7 +2819,7 @@ public static boolean validateConsultationNoteComponentOfEncompassingEncounter2I
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2893,7 +2893,7 @@ public static boolean validateConsultationNoteComponentOfEncompassingEncounter2R
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_ENCOUNTER_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER2_ENCOUNTER_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2967,7 +2967,7 @@ public static boolean validateConsultationNoteComponentOfEncompassingEncounter2E
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3040,7 +3040,7 @@ public static boolean validateConsultationNoteComponentOfEncompassingEncounter(C
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_IN_FULFILLMENT_OF_ORDER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_IN_FULFILLMENT_OF_ORDER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3112,7 +3112,7 @@ public static boolean validateConsultationNoteInFulfillmentOfOrderId(Consultatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_IN_FULFILLMENT_OF_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONSULTATION_NOTE_IN_FULFILLMENT_OF_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4142,7 +4142,7 @@ public static VitalSignsSectionEntriesOptional getVitalSignsSectionEntriesOption
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4211,7 +4211,7 @@ public static boolean validateGeneralHeaderConstraintsTemplateId(ConsultationNot
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ContinuityOfCareDocument2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ContinuityOfCareDocument2Operations.java
index 52f2bf28f2..9747c9d0d5 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ContinuityOfCareDocument2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ContinuityOfCareDocument2Operations.java
@@ -140,7 +140,7 @@ protected ContinuityOfCareDocument2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -190,7 +190,7 @@ public static boolean validateContinuityOfCareDocument2CodeP(ContinuityOfCareDoc
 					"org.openhealthtools.mdht.uml.cda.consol.ContinuityOfCareDocument2CodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ContinuityOfCareDocument2CodeP", passToken);
 				}
 				passToken.add(continuityOfCareDocument2);
@@ -222,7 +222,7 @@ public static boolean validateContinuityOfCareDocument2CodeP(ContinuityOfCareDoc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -296,7 +296,7 @@ public static boolean validateContinuityOfCareDocument2Code(ContinuityOfCareDocu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -363,7 +363,7 @@ public static boolean validateContinuityOfCareDocument2Author(ContinuityOfCareDo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -432,7 +432,7 @@ public static boolean validateContinuityOfCareDocument2DocumentationOf(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_ALLERGIES_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_ALLERGIES_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -502,7 +502,7 @@ public static boolean validateContinuityOfCareDocument2AllergiesSection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_MEDICATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_MEDICATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -572,7 +572,7 @@ public static boolean validateContinuityOfCareDocument2MedicationsSection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_PROBLEM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_PROBLEM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -641,7 +641,7 @@ public static boolean validateContinuityOfCareDocument2ProblemSection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_PROCEDURES_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_PROCEDURES_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -711,7 +711,7 @@ public static boolean validateContinuityOfCareDocument2ProceduresSection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_RESULTS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_RESULTS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -780,7 +780,7 @@ public static boolean validateContinuityOfCareDocument2ResultsSection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -851,7 +851,7 @@ public static boolean validateContinuityOfCareDocument2AdvanceDirectivesSectionE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -921,7 +921,7 @@ public static boolean validateContinuityOfCareDocument2EncountersSectionEntriesO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_FUNCTIONAL_STATUS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_FUNCTIONAL_STATUS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -991,7 +991,7 @@ public static boolean validateContinuityOfCareDocument2FunctionalStatusSection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_IMMUNIZATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_IMMUNIZATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1061,7 +1061,7 @@ public static boolean validateContinuityOfCareDocument2ImmunizationsSection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_MEDICAL_EQUIPMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_MEDICAL_EQUIPMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1131,7 +1131,7 @@ public static boolean validateContinuityOfCareDocument2MedicalEquipmentSection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_PAYERS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_PAYERS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1200,7 +1200,7 @@ public static boolean validateContinuityOfCareDocument2PayersSection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1270,7 +1270,7 @@ public static boolean validateContinuityOfCareDocument2PlanOfTreatmentSection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_SOCIAL_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_SOCIAL_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1340,7 +1340,7 @@ public static boolean validateContinuityOfCareDocument2SocialHistorySection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_VITAL_SIGNS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_VITAL_SIGNS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1410,7 +1410,7 @@ public static boolean validateContinuityOfCareDocument2VitalSignsSection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_MENTAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_MENTAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1480,7 +1480,7 @@ public static boolean validateContinuityOfCareDocument2MentalStatusSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_NUTRITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_NUTRITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1549,7 +1549,7 @@ public static boolean validateContinuityOfCareDocument2NutritionSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_FAMILY_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_FAMILY_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1619,7 +1619,7 @@ public static boolean validateContinuityOfCareDocument2FamilyHistorySection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_AUTHOR_ASSIGNED_AUTHOR_HAS_ASSIGNED_PERSON_OR_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_AUTHOR_ASSIGNED_AUTHOR_HAS_ASSIGNED_PERSON_OR_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1696,7 +1696,7 @@ public static boolean validateContinuityOfCareDocument2AuthorAssignedAuthorHasAs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_AUTHOR_ASSIGNED_AUTHOR_HAS_REPRESENT_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_AUTHOR_ASSIGNED_AUTHOR_HAS_REPRESENT_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1772,7 +1772,7 @@ public static boolean validateContinuityOfCareDocument2AuthorAssignedAuthorHasRe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_AUTHOR_ASSIGNED_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_AUTHOR_ASSIGNED_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1847,7 +1847,7 @@ public static boolean validateContinuityOfCareDocument2AuthorAssignedAuthor(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1922,7 +1922,7 @@ public static boolean validateContinuityOfCareDocument2DocumentationOfServiceEve
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1997,7 +1997,7 @@ public static boolean validateContinuityOfCareDocument2DocumentationOfServiceEve
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2074,7 +2074,7 @@ public static boolean validateContinuityOfCareDocument2DocumentationOfServiceEve
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2151,7 +2151,7 @@ public static boolean validateContinuityOfCareDocument2DocumentationOfServiceEve
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2228,7 +2228,7 @@ public static boolean validateContinuityOfCareDocument2DocumentationOfServiceEve
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2304,7 +2304,7 @@ public static boolean validateContinuityOfCareDocument2DocumentationOfServiceEve
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2381,7 +2381,7 @@ public static boolean validateContinuityOfCareDocument2DocumentationOfServiceEve
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2456,7 +2456,7 @@ public static boolean validateContinuityOfCareDocument2DocumentationOfServiceEve
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2532,7 +2532,7 @@ public static boolean validateContinuityOfCareDocument2DocumentationOfServiceEve
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2608,7 +2608,7 @@ public static boolean validateContinuityOfCareDocument2DocumentationOfServiceEve
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT2_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3455,7 +3455,7 @@ public static FamilyHistorySection2 getFamilyHistorySection2(ContinuityOfCareDoc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ContinuityOfCareDocumentOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ContinuityOfCareDocumentOperations.java
index c024b52594..3fe33a64c2 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ContinuityOfCareDocumentOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ContinuityOfCareDocumentOperations.java
@@ -143,7 +143,7 @@ protected ContinuityOfCareDocumentOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -193,7 +193,7 @@ public static boolean validateContinuityOfCareDocumentCodeP(ContinuityOfCareDocu
 					"org.openhealthtools.mdht.uml.cda.consol.ContinuityOfCareDocumentCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ContinuityOfCareDocumentCodeP", passToken);
 				}
 				passToken.add(continuityOfCareDocument);
@@ -225,7 +225,7 @@ public static boolean validateContinuityOfCareDocumentCodeP(ContinuityOfCareDocu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -299,7 +299,7 @@ public static boolean validateContinuityOfCareDocumentCode(ContinuityOfCareDocum
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_LANGUAGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_LANGUAGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -367,7 +367,7 @@ public static boolean validateContinuityOfCareDocumentLanguageCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -436,7 +436,7 @@ public static boolean validateContinuityOfCareDocumentDocumentationOf(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -503,7 +503,7 @@ public static boolean validateContinuityOfCareDocumentAuthor(ContinuityOfCareDoc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_ALLERGIES_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_ALLERGIES_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -572,7 +572,7 @@ public static boolean validateContinuityOfCareDocumentAllergiesSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_MEDICATIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_MEDICATIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -641,7 +641,7 @@ public static boolean validateContinuityOfCareDocumentMedicationsSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_PROBLEM_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_PROBLEM_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -710,7 +710,7 @@ public static boolean validateContinuityOfCareDocumentProblemSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_PROCEDURES_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_PROCEDURES_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -779,7 +779,7 @@ public static boolean validateContinuityOfCareDocumentProceduresSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_RESULTS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_RESULTS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -848,7 +848,7 @@ public static boolean validateContinuityOfCareDocumentResultsSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_ADVANCE_DIRECTIVES_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_ADVANCE_DIRECTIVES_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -918,7 +918,7 @@ public static boolean validateContinuityOfCareDocumentAdvanceDirectivesSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_ENCOUNTERS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_ENCOUNTERS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -987,7 +987,7 @@ public static boolean validateContinuityOfCareDocumentEncountersSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_FAMILY_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_FAMILY_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1057,7 +1057,7 @@ public static boolean validateContinuityOfCareDocumentFamilyHistorySection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_FUNCTIONAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_FUNCTIONAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1127,7 +1127,7 @@ public static boolean validateContinuityOfCareDocumentFunctionalStatusSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1197,7 +1197,7 @@ public static boolean validateContinuityOfCareDocumentImmunizationsSectionEntrie
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_MEDICAL_EQUIPMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_MEDICAL_EQUIPMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1267,7 +1267,7 @@ public static boolean validateContinuityOfCareDocumentMedicalEquipmentSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_PAYERS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_PAYERS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1336,7 +1336,7 @@ public static boolean validateContinuityOfCareDocumentPayersSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_PLAN_OF_CARE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_PLAN_OF_CARE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1405,7 +1405,7 @@ public static boolean validateContinuityOfCareDocumentPlanOfCareSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_SOCIAL_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_SOCIAL_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1475,7 +1475,7 @@ public static boolean validateContinuityOfCareDocumentSocialHistorySection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1545,7 +1545,7 @@ public static boolean validateContinuityOfCareDocumentVitalSignsSectionEntriesOp
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1621,7 +1621,7 @@ public static boolean validateContinuityOfCareDocumentDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1697,7 +1697,7 @@ public static boolean validateContinuityOfCareDocumentDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1776,7 +1776,7 @@ public static boolean validateContinuityOfCareDocumentDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1853,7 +1853,7 @@ public static boolean validateContinuityOfCareDocumentDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1930,7 +1930,7 @@ public static boolean validateContinuityOfCareDocumentDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2006,7 +2006,7 @@ public static boolean validateContinuityOfCareDocumentDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2083,7 +2083,7 @@ public static boolean validateContinuityOfCareDocumentDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2158,7 +2158,7 @@ public static boolean validateContinuityOfCareDocumentDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2234,7 +2234,7 @@ public static boolean validateContinuityOfCareDocumentDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2309,7 +2309,7 @@ public static boolean validateContinuityOfCareDocumentDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2384,7 +2384,7 @@ public static boolean validateContinuityOfCareDocumentDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR_HAS_ASSIGNED_PERSON_OR_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR_HAS_ASSIGNED_PERSON_OR_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2461,7 +2461,7 @@ public static boolean validateContinuityOfCareDocumentAuthorAssignedAuthorHasAss
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR_HAS_REPRESENT_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR_HAS_REPRESENT_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2537,7 +2537,7 @@ public static boolean validateContinuityOfCareDocumentAuthorAssignedAuthorHasRep
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_CONTINUITY_OF_CARE_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3294,7 +3294,7 @@ public static VitalSignsSectionEntriesOptional getVitalSignsSectionEntriesOption
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CourseOfCareSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CourseOfCareSectionOperations.java
index f13dbae7c4..5a876bafd1 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CourseOfCareSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CourseOfCareSectionOperations.java
@@ -71,7 +71,7 @@ protected CourseOfCareSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COURSE_OF_CARE_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COURSE_OF_CARE_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -140,7 +140,7 @@ public static boolean validateCourseOfCareSectionTemplateId(CourseOfCareSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COURSE_OF_CARE_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COURSE_OF_CARE_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -205,7 +205,7 @@ public static boolean validateCourseOfCareSectionCode(CourseOfCareSection course
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COURSE_OF_CARE_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COURSE_OF_CARE_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -270,7 +270,7 @@ public static boolean validateCourseOfCareSectionCodeP(CourseOfCareSection cours
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COURSE_OF_CARE_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COURSE_OF_CARE_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -335,7 +335,7 @@ public static boolean validateCourseOfCareSectionTitle(CourseOfCareSection cours
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COURSE_OF_CARE_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COURSE_OF_CARE_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CoverageActivity2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CoverageActivity2Operations.java
index a6c5cf8975..055ff6ff51 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CoverageActivity2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CoverageActivity2Operations.java
@@ -88,7 +88,7 @@ protected CoverageActivity2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -180,7 +180,7 @@ public static boolean validateCoverageActivityCodeP(CoverageActivity2 coverageAc
 					"org.openhealthtools.mdht.uml.cda.consol.CoverageActivityCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.CoverageActivityCodeP", passToken);
 				}
 				passToken.add(coverageActivity2);
@@ -469,7 +469,7 @@ public static EList<PolicyActivity2> getConsolPolicyActivity2s(CoverageActivity2
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_POLICY_ACTIVITY2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PolicyActivity2> result = (Collection<PolicyActivity2>) query.evaluate(coverageActivity2);
-		return new BasicEList.UnmodifiableEList<PolicyActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -539,7 +539,7 @@ public static boolean validateCoverageActivityCoverageActivityRelationshipSequen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateCoverageActivity2EntryRelationship(CoverageActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Coverage Activity2 Entry Relationship</em>}' operation.
@@ -560,7 +560,7 @@ public static boolean validateCoverageActivityCoverageActivityRelationshipSequen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY2_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY2_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateCoverageActivity2EntryRelationshipINTValue(CoverageActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Coverage Activity2 Entry Relationship INT Value</em>}' operation.
@@ -581,7 +581,7 @@ public static boolean validateCoverageActivityCoverageActivityRelationshipSequen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_COVERAGE_ACTIVITY2_ENTRY_RELATIONSHIP_INT_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_COVERAGE_ACTIVITY2_ENTRY_RELATIONSHIP_INT_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateCoverageActivity2EntryRelationshipTypeCode(CoverageActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Coverage Activity2 Entry Relationship Type Code</em>}' operation.
@@ -602,7 +602,7 @@ public static boolean validateCoverageActivityCoverageActivityRelationshipSequen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_COVERAGE_ACTIVITY2_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_COVERAGE_ACTIVITY2_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateCoverageActivity2EntryRelationshipSequenceNumber(CoverageActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Coverage Activity2 Entry Relationship Sequence Number</em>}' operation.
@@ -623,7 +623,7 @@ public static boolean validateCoverageActivityCoverageActivityRelationshipSequen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_COVERAGE_ACTIVITY2_ENTRY_RELATIONSHIP_SEQUENCE_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_COVERAGE_ACTIVITY2_ENTRY_RELATIONSHIP_SEQUENCE_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateCoverageActivity2EntryRelationshipPolicyActivity2(CoverageActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Coverage Activity2 Entry Relationship Policy Activity2</em>}' operation.
@@ -644,7 +644,7 @@ public static boolean validateCoverageActivityCoverageActivityRelationshipSequen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_COVERAGE_ACTIVITY2_ENTRY_RELATIONSHIP_POLICY_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_COVERAGE_ACTIVITY2_ENTRY_RELATIONSHIP_POLICY_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #getConsolPolicyActivity2s(CoverageActivity2) <em>Get Consol Policy Activity2s</em>}' operation.
@@ -685,7 +685,7 @@ public static boolean validateCoverageActivityCoverageActivityRelationshipSequen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_COVERAGE_ACTIVITY_RELATIONSHIP_SEQUENCE_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_COVERAGE_ACTIVITY_RELATIONSHIP_SEQUENCE_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateCoverageActivityCode(CoverageActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Coverage Activity Code</em>}' operation.
@@ -708,7 +708,7 @@ public static boolean validateCoverageActivityCoverageActivityRelationshipSequen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -781,7 +781,7 @@ public static boolean validateCoverageActivityCode(CoverageActivity2 coverageAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_POLICY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_POLICY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CoverageActivityOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CoverageActivityOperations.java
index 5493128005..ef728eefba 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CoverageActivityOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CoverageActivityOperations.java
@@ -89,7 +89,7 @@ protected CoverageActivityOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_COVERAGE_ACTIVITY_RELATIONSHIP_SEQUENCE_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_COVERAGE_ACTIVITY_RELATIONSHIP_SEQUENCE_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -158,7 +158,7 @@ public static boolean validateCoverageActivityCoverageActivityRelationshipSequen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -223,7 +223,7 @@ public static boolean validateCoverageActivityTemplateId(CoverageActivity covera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -376,7 +376,7 @@ public static boolean validateCoverageActivityId(CoverageActivity coverageActivi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateCoverageActivityId(CoverageActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Coverage Activity Id</em>}' operation.
@@ -397,7 +397,7 @@ public static boolean validateCoverageActivityId(CoverageActivity coverageActivi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateCoverageActivityCode(CoverageActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Coverage Activity Code</em>}' operation.
@@ -420,7 +420,7 @@ public static boolean validateCoverageActivityId(CoverageActivity coverageActivi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -486,7 +486,7 @@ public static boolean validateCoverageActivityMoodCode(CoverageActivity coverage
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -551,7 +551,7 @@ public static boolean validateCoverageActivityStatusCode(CoverageActivity covera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_POLICY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COVERAGE_ACTIVITY_POLICY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -641,7 +641,7 @@ public static EList<PolicyActivity> getPolicyActivities(CoverageActivity coverag
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_POLICY_ACTIVITIES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PolicyActivity> result = (Collection<PolicyActivity>) query.evaluate(coverageActivity);
-		return new BasicEList.UnmodifiableEList<PolicyActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // CoverageActivityOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CriticalityObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CriticalityObservationOperations.java
index 279ad1bad0..1c208e707b 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CriticalityObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CriticalityObservationOperations.java
@@ -76,7 +76,7 @@ protected CriticalityObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CRITICALITY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CRITICALITY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -143,7 +143,7 @@ public static boolean validateCriticalityObservationTemplateId(CriticalityObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CRITICALITY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CRITICALITY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -210,7 +210,7 @@ public static boolean validateCriticalityObservationClassCode(CriticalityObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CRITICALITY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CRITICALITY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -276,7 +276,7 @@ public static boolean validateCriticalityObservationMoodCode(CriticalityObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CRITICALITY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CRITICALITY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -325,7 +325,7 @@ public static boolean validateCriticalityObservationCodeP(CriticalityObservation
 					"org.openhealthtools.mdht.uml.cda.consol.CriticalityObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.CriticalityObservationCodeP", passToken);
 				}
 				passToken.add(criticalityObservation);
@@ -357,7 +357,7 @@ public static boolean validateCriticalityObservationCodeP(CriticalityObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CRITICALITY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CRITICALITY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -432,7 +432,7 @@ public static boolean validateCriticalityObservationCode(CriticalityObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CRITICALITY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CRITICALITY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -499,7 +499,7 @@ public static boolean validateCriticalityObservationStatusCode(CriticalityObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CRITICALITY_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CRITICALITY_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -568,7 +568,7 @@ public static boolean validateCriticalityObservationStatusCodeP(CriticalityObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CRITICALITY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CRITICALITY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -634,7 +634,7 @@ public static boolean validateCriticalityObservationValue(CriticalityObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CRITICALITY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CRITICALITY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CulturalAndReligiousObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CulturalAndReligiousObservationOperations.java
index 510617eef0..4a98d03695 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CulturalAndReligiousObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/CulturalAndReligiousObservationOperations.java
@@ -81,7 +81,7 @@ protected CulturalAndReligiousObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_VALUE_OF_TYPE_CD_IS_FROM_SNOMED__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_VALUE_OF_TYPE_CD_IS_FROM_SNOMED__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -152,7 +152,7 @@ public static boolean validateCulturalAndReligiousObservationValueOfTypeCDIsFrom
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -222,7 +222,7 @@ public static boolean validateCulturalAndReligiousObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -292,7 +292,7 @@ public static boolean validateCulturalAndReligiousObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -362,7 +362,7 @@ public static boolean validateCulturalAndReligiousObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -431,7 +431,7 @@ public static boolean validateCulturalAndReligiousObservationId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -484,7 +484,7 @@ public static boolean validateCulturalAndReligiousObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.CulturalAndReligiousObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.CulturalAndReligiousObservationCodeP", passToken);
 				}
@@ -517,7 +517,7 @@ public static boolean validateCulturalAndReligiousObservationCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -596,7 +596,7 @@ public static boolean validateCulturalAndReligiousObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -666,7 +666,7 @@ public static boolean validateCulturalAndReligiousObservationStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -736,7 +736,7 @@ public static boolean validateCulturalAndReligiousObservationStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_CULTURAL_AND_RELIGIOUS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DICOMObjectCatalogSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DICOMObjectCatalogSectionOperations.java
index 25b2995030..b3f57d46da 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DICOMObjectCatalogSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DICOMObjectCatalogSectionOperations.java
@@ -85,7 +85,7 @@ protected DICOMObjectCatalogSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DICOM_OBJECT_CATALOG_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DICOM_OBJECT_CATALOG_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -155,7 +155,7 @@ public static boolean validateDICOMObjectCatalogSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DICOM_OBJECT_CATALOG_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DICOM_OBJECT_CATALOG_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateDICOMObjectCatalogSectionCode(DICOMObjectCatalogSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DICOM_OBJECT_CATALOG_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DICOM_OBJECT_CATALOG_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -288,7 +288,7 @@ public static boolean validateDICOMObjectCatalogSectionCodeP(DICOMObjectCatalogS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DICOM_OBJECT_CATALOG_SECTION_STUDY_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DICOM_OBJECT_CATALOG_SECTION_STUDY_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -380,7 +380,7 @@ public static EList<StudyAct> getStudyActs(DICOMObjectCatalogSection dicomObject
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_STUDY_ACTS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<StudyAct> result = (Collection<StudyAct>) query.evaluate(dicomObjectCatalogSection);
-		return new BasicEList.UnmodifiableEList<StudyAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // DICOMObjectCatalogSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DeceasedObservation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DeceasedObservation2Operations.java
index 22cfc8d097..4f628d82fd 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DeceasedObservation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DeceasedObservation2Operations.java
@@ -78,7 +78,7 @@ protected DeceasedObservation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -190,7 +190,7 @@ public static ProblemObservation2 getConsolProblemObservation2(DeceasedObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -238,7 +238,7 @@ public static boolean validateDeceasedObservationCodeP(DeceasedObservation2 dece
 					"org.openhealthtools.mdht.uml.cda.consol.DeceasedObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.DeceasedObservationCodeP", passToken);
 				}
 				passToken.add(deceasedObservation2);
@@ -270,7 +270,7 @@ public static boolean validateDeceasedObservationCodeP(DeceasedObservation2 dece
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -343,7 +343,7 @@ public static boolean validateDeceasedObservationCode(DeceasedObservation2 decea
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DeceasedObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DeceasedObservationOperations.java
index a013065c96..b626314baa 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DeceasedObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DeceasedObservationOperations.java
@@ -88,7 +88,7 @@ protected DeceasedObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -155,7 +155,7 @@ public static boolean validateDeceasedObservationEffectiveTimeLow(DeceasedObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateDeceasedObservationTemplateId(DeceasedObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -287,7 +287,7 @@ public static boolean validateDeceasedObservationClassCode(DeceasedObservation d
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -352,7 +352,7 @@ public static boolean validateDeceasedObservationMoodCode(DeceasedObservation de
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -417,7 +417,7 @@ public static boolean validateDeceasedObservationId(DeceasedObservation deceased
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -465,7 +465,7 @@ public static boolean validateDeceasedObservationCodeP(DeceasedObservation decea
 					"org.openhealthtools.mdht.uml.cda.consol.DeceasedObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.DeceasedObservationCodeP", passToken);
 				}
 				passToken.add(deceasedObservation);
@@ -497,7 +497,7 @@ public static boolean validateDeceasedObservationCodeP(DeceasedObservation decea
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -571,7 +571,7 @@ public static boolean validateDeceasedObservationCode(DeceasedObservation deceas
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -637,7 +637,7 @@ public static boolean validateDeceasedObservationStatusCode(DeceasedObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -704,7 +704,7 @@ public static boolean validateDeceasedObservationStatusCodeP(DeceasedObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -773,7 +773,7 @@ public static boolean validateDeceasedObservationEffectiveTime(DeceasedObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -838,7 +838,7 @@ public static boolean validateDeceasedObservationValue(DeceasedObservation decea
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -903,7 +903,7 @@ public static boolean validateDeceasedObservationValueP(DeceasedObservation dece
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DECEASED_OBSERVATION_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DeviceIdentifierObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DeviceIdentifierObservationOperations.java
index b7241271dc..44d8b41a3e 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DeviceIdentifierObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DeviceIdentifierObservationOperations.java
@@ -85,7 +85,7 @@ protected DeviceIdentifierObservationOperations() {
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_DEVICE_IDENTIFIER_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DEVICE_IDENTIFIER_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -152,7 +152,7 @@ public static boolean validateDeviceIdentifierObservationTemplateId(
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_DEVICE_IDENTIFIER_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DEVICE_IDENTIFIER_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -202,7 +202,7 @@ public static boolean validateDeviceIdentifierObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.DeviceIdentifierObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.DeviceIdentifierObservationCodeP", passToken);
 				}
 				passToken.add(deviceIdentifierObservation);
@@ -233,7 +233,7 @@ public static boolean validateDeviceIdentifierObservationCodeP(
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_DEVICE_IDENTIFIER_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DEVICE_IDENTIFIER_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -307,7 +307,7 @@ public static boolean validateDeviceIdentifierObservationCode(
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_DEVICE_IDENTIFIER_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DEVICE_IDENTIFIER_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -374,7 +374,7 @@ public static boolean validateDeviceIdentifierObservationValue(
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_DEVICE_IDENTIFIER_OBSERVATION_IIUD_IISSUINGAGENCY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DEVICE_IDENTIFIER_OBSERVATION_IIUD_IISSUINGAGENCY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -448,7 +448,7 @@ public static boolean validateDeviceIdentifierObservationIIUDIissuingagency(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DEVICE_IDENTIFIER_OBSERVATION_II_ROOT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DEVICE_IDENTIFIER_OBSERVATION_II_ROOT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -522,7 +522,7 @@ public static boolean validateDeviceIdentifierObservationIIRoot(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DEVICE_IDENTIFIER_OBSERVATION_II_EXTENSION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DEVICE_IDENTIFIER_OBSERVATION_II_EXTENSION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -596,7 +596,7 @@ public static boolean validateDeviceIdentifierObservationIIExtension(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DEVICE_IDENTIFIER_OBSERVATION_II_DISPLAYABLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DEVICE_IDENTIFIER_OBSERVATION_II_DISPLAYABLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DiagnosticImagingReport2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DiagnosticImagingReport2Operations.java
index c9e808c5a5..895c0459f7 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DiagnosticImagingReport2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DiagnosticImagingReport2Operations.java
@@ -140,7 +140,7 @@ protected DiagnosticImagingReport2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -206,7 +206,7 @@ public static boolean validateDiagnosticImagingReport2Id(DiagnosticImagingReport
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -255,7 +255,7 @@ public static boolean validateDiagnosticImagingReport2CodeP(DiagnosticImagingRep
 					"org.openhealthtools.mdht.uml.cda.consol.DiagnosticImagingReport2CodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.DiagnosticImagingReport2CodeP", passToken);
 				}
 				passToken.add(diagnosticImagingReport2);
@@ -287,7 +287,7 @@ public static boolean validateDiagnosticImagingReport2CodeP(DiagnosticImagingRep
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -361,7 +361,7 @@ public static boolean validateDiagnosticImagingReport2Code(DiagnosticImagingRepo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -431,7 +431,7 @@ public static boolean validateDiagnosticImagingReport2InformationRecipient(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -498,7 +498,7 @@ public static boolean validateDiagnosticImagingReport2Participant(DiagnosticImag
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_IN_FULFILLMENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_IN_FULFILLMENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -567,7 +567,7 @@ public static boolean validateDiagnosticImagingReport2InFulfillmentOf(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -636,7 +636,7 @@ public static boolean validateDiagnosticImagingReport2DocumentationOf(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_RELATED_DOCUMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_RELATED_DOCUMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -705,7 +705,7 @@ public static boolean validateDiagnosticImagingReport2RelatedDocument(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -772,7 +772,7 @@ public static boolean validateDiagnosticImagingReport2ComponentOf(DiagnosticImag
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_FINDINGS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_FINDINGS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -841,7 +841,7 @@ public static boolean validateDiagnosticImagingReport2FindingsSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_DICOM_OBJECT_CATALOG_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_DICOM_OBJECT_CATALOG_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -911,7 +911,7 @@ public static boolean validateDiagnosticImagingReport2DICOMObjectCatalogSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -978,7 +978,7 @@ public static boolean validateDiagnosticImagingReport2Component2(DiagnosticImagi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_INFORMANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_INFORMANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1045,7 +1045,7 @@ public static boolean validateDiagnosticImagingReport2Informant(DiagnosticImagin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_II_ROOT_OI_DS_MUST_BE_NO_MORE_THAN64_CHARACTERS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_II_ROOT_OI_DS_MUST_BE_NO_MORE_THAN64_CHARACTERS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1120,7 +1120,7 @@ public static boolean validateDiagnosticImagingReport2IIRootOIDsMustBeNoMoreThan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_II_ROOT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_II_ROOT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1192,7 +1192,7 @@ public static boolean validateDiagnosticImagingReport2IIRoot(DiagnosticImagingRe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_PARTICIPANT_ASSOCIATED_ENTITY_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_PARTICIPANT_ASSOCIATED_ENTITY_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1267,7 +1267,7 @@ public static boolean validateDiagnosticImagingReport2ParticipantAssociatedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_PARTICIPANT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_PARTICIPANT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1343,7 +1343,7 @@ public static boolean validateDiagnosticImagingReport2ParticipantAssociatedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_PARTICIPANT_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_PARTICIPANT_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1418,7 +1418,7 @@ public static boolean validateDiagnosticImagingReport2ParticipantAssociatedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_IN_FULFILLMENT_OF_ORDER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_IN_FULFILLMENT_OF_ORDER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1493,7 +1493,7 @@ public static boolean validateDiagnosticImagingReport2InFulfillmentOfOrderId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_IN_FULFILLMENT_OF_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_IN_FULFILLMENT_OF_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1568,7 +1568,7 @@ public static boolean validateDiagnosticImagingReport2InFulfillmentOfOrder(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_DOCUMENTATION_OF_SERVICE_EVENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_DOCUMENTATION_OF_SERVICE_EVENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1643,7 +1643,7 @@ public static boolean validateDiagnosticImagingReport2DocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_DOCUMENTATION_OF_SERVICE_EVENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_DOCUMENTATION_OF_SERVICE_EVENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1718,7 +1718,7 @@ public static boolean validateDiagnosticImagingReport2DocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_DOCUMENTATION_OF_SERVICE_EVENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_DOCUMENTATION_OF_SERVICE_EVENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1793,7 +1793,7 @@ public static boolean validateDiagnosticImagingReport2DocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_DOCUMENTATION_OF_SERVICE_EVENT_PHYSICIAN_READING_STUDY_PERFORMER2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_DOCUMENTATION_OF_SERVICE_EVENT_PHYSICIAN_READING_STUDY_PERFORMER2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1870,7 +1870,7 @@ public static boolean validateDiagnosticImagingReport2DocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1945,7 +1945,7 @@ public static boolean validateDiagnosticImagingReport2DocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_RELATED_DOCUMENT_PARENT_DOCUMENT_II_OIDS_LENGTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_RELATED_DOCUMENT_PARENT_DOCUMENT_II_OIDS_LENGTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2021,7 +2021,7 @@ public static boolean validateDiagnosticImagingReport2RelatedDocumentParentDocum
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_RELATED_DOCUMENT_PARENT_DOCUMENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_RELATED_DOCUMENT_PARENT_DOCUMENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2096,7 +2096,7 @@ public static boolean validateDiagnosticImagingReport2RelatedDocumentParentDocum
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_RELATED_DOCUMENT_PARENT_DOCUMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_RELATED_DOCUMENT_PARENT_DOCUMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2171,7 +2171,7 @@ public static boolean validateDiagnosticImagingReport2RelatedDocumentParentDocum
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_DAY_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_DAY_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2248,7 +2248,7 @@ public static boolean validateDiagnosticImagingReport2ComponentOfEncompassingEnc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_MINUTE_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_MINUTE_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2325,7 +2325,7 @@ public static boolean validateDiagnosticImagingReport2ComponentOfEncompassingEnc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_SECOND_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_SECOND_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2402,7 +2402,7 @@ public static boolean validateDiagnosticImagingReport2ComponentOfEncompassingEnc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2479,7 +2479,7 @@ public static boolean validateDiagnosticImagingReport2ComponentOfEncompassingEnc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_HAS_ASSIGN_PERSON_OR_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_HAS_ASSIGN_PERSON_OR_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2556,7 +2556,7 @@ public static boolean validateDiagnosticImagingReport2ComponentOfEncompassingEnc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2633,7 +2633,7 @@ public static boolean validateDiagnosticImagingReport2ComponentOfEncompassingEnc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2708,7 +2708,7 @@ public static boolean validateDiagnosticImagingReport2ComponentOfEncompassingEnc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2784,7 +2784,7 @@ public static boolean validateDiagnosticImagingReport2ComponentOfEncompassingEnc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2860,7 +2860,7 @@ public static boolean validateDiagnosticImagingReport2ComponentOfEncompassingEnc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_PHYSICIANOF_RECORD_PARTICIPANT2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_PHYSICIANOF_RECORD_PARTICIPANT2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2937,7 +2937,7 @@ public static boolean validateDiagnosticImagingReport2ComponentOfEncompassingEnc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3012,7 +3012,7 @@ public static boolean validateDiagnosticImagingReport2ComponentOfEncompassingEnc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_SUBJECT_FETUS_SUBJECT_CONTEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_SUBJECT_FETUS_SUBJECT_CONTEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3089,7 +3089,7 @@ public static boolean validateDiagnosticImagingReport2ComponentStructuredBodyCom
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_SECTIONS_HAVE_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_SECTIONS_HAVE_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3168,7 +3168,7 @@ public static boolean validateDiagnosticImagingReport2ComponentStructuredBodyCom
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3244,7 +3244,7 @@ public static boolean validateDiagnosticImagingReport2ComponentStructuredBodyCom
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3320,7 +3320,7 @@ public static boolean validateDiagnosticImagingReport2ComponentStructuredBodyCom
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3396,7 +3396,7 @@ public static boolean validateDiagnosticImagingReport2ComponentStructuredBodyCom
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3472,7 +3472,7 @@ public static boolean validateDiagnosticImagingReport2ComponentStructuredBodyCom
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_SUBJECT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_SUBJECT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3548,7 +3548,7 @@ public static boolean validateDiagnosticImagingReport2ComponentStructuredBodyCom
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3624,7 +3624,7 @@ public static boolean validateDiagnosticImagingReport2ComponentStructuredBodyCom
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_PROCEDURE_CONTEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_PROCEDURE_CONTEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3701,7 +3701,7 @@ public static boolean validateDiagnosticImagingReport2ComponentStructuredBodyCom
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_TEXT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_TEXT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3778,7 +3778,7 @@ public static boolean validateDiagnosticImagingReport2ComponentStructuredBodyCom
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_CODE_OBSERVATIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_CODE_OBSERVATIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3855,7 +3855,7 @@ public static boolean validateDiagnosticImagingReport2ComponentStructuredBodyCom
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_QUANTITY_MEASUREMENT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_QUANTITY_MEASUREMENT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3932,7 +3932,7 @@ public static boolean validateDiagnosticImagingReport2ComponentStructuredBodyCom
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_SOP_INSTANCE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION_SOP_INSTANCE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4009,7 +4009,7 @@ public static boolean validateDiagnosticImagingReport2ComponentStructuredBodyCom
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4085,7 +4085,7 @@ public static boolean validateDiagnosticImagingReport2ComponentStructuredBodyCom
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY_COMPONENT3__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4160,7 +4160,7 @@ public static boolean validateDiagnosticImagingReport2ComponentStructuredBodyCom
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT2_COMPONENT_STRUCTURED_BODY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4327,7 +4327,7 @@ public static DICOMObjectCatalogSection getDICOMObjectCatalogSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DiagnosticImagingReportOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DiagnosticImagingReportOperations.java
index 5a54b7e098..5b0d416c55 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DiagnosticImagingReportOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DiagnosticImagingReportOperations.java
@@ -117,7 +117,7 @@ protected DiagnosticImagingReportOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_USE_DIAGNOSTIC_IMAGING_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_USE_DIAGNOSTIC_IMAGING_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -186,7 +186,7 @@ public static boolean validateDiagnosticImagingReportUseDiagnosticImagingCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_ALL_SECTIONS_HAVE_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_ALL_SECTIONS_HAVE_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -255,7 +255,7 @@ public static boolean validateDiagnosticImagingReportAllSectionsHaveTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_SECTIONS_HAVE_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_SECTIONS_HAVE_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -323,7 +323,7 @@ public static boolean validateDiagnosticImagingReportSectionsHaveText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -372,7 +372,7 @@ public static boolean validateGeneralHeaderConstraintsCodeP(DiagnosticImagingRep
 					"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsCodeP", passToken);
 				}
 				passToken.add(diagnosticImagingReport);
@@ -402,7 +402,7 @@ public static boolean validateGeneralHeaderConstraintsCodeP(DiagnosticImagingRep
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_INFORMANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_INFORMANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -469,7 +469,7 @@ public static boolean validateDiagnosticImagingReportInformant(DiagnosticImaging
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -537,7 +537,7 @@ public static boolean validateDiagnosticImagingReportInformationRecipient(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_PARTICIPANT1__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_PARTICIPANT1__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -604,7 +604,7 @@ public static boolean validateDiagnosticImagingReportParticipant1(DiagnosticImag
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_IN_FULFILLMENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_IN_FULFILLMENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -672,7 +672,7 @@ public static boolean validateDiagnosticImagingReportInFulfillmentOf(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -740,7 +740,7 @@ public static boolean validateDiagnosticImagingReportDocumentationOf(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_RELATED_DOCUMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_RELATED_DOCUMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -808,7 +808,7 @@ public static boolean validateDiagnosticImagingReportRelatedDocument(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -875,7 +875,7 @@ public static boolean validateDiagnosticImagingReportComponentOf(DiagnosticImagi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_FINDINGS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_FINDINGS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -943,7 +943,7 @@ public static boolean validateDiagnosticImagingReportFindingsSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_DICOM_OBJECT_CATALOG_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_DICOM_OBJECT_CATALOG_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1012,7 +1012,7 @@ public static boolean validateDiagnosticImagingReportDICOMObjectCatalogSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_PARTICIPANT_ASSOCIATED_ENTITY_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_PARTICIPANT_ASSOCIATED_ENTITY_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1086,7 +1086,7 @@ public static boolean validateDiagnosticImagingReportParticipantAssociatedEntity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_PARTICIPANT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_PARTICIPANT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1161,7 +1161,7 @@ public static boolean validateDiagnosticImagingReportParticipantAssociatedEntity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_PARTICIPANT_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_PARTICIPANT_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1235,7 +1235,7 @@ public static boolean validateDiagnosticImagingReportParticipantAssociatedEntity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_DOCUMENTATION_OF_SERVICE_EVENT4_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_DOCUMENTATION_OF_SERVICE_EVENT4_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1309,7 +1309,7 @@ public static boolean validateDiagnosticImagingReportDocumentationOfServiceEvent
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_DOCUMENTATION_OF_SERVICE_EVENT4_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_DOCUMENTATION_OF_SERVICE_EVENT4_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1383,7 +1383,7 @@ public static boolean validateDiagnosticImagingReportDocumentationOfServiceEvent
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_DOCUMENTATION_OF_SERVICE_EVENT4_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_DOCUMENTATION_OF_SERVICE_EVENT4_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1457,7 +1457,7 @@ public static boolean validateDiagnosticImagingReportDocumentationOfServiceEvent
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_DOCUMENTATION_OF_SERVICE_EVENT4_PHYSICIAN_READING_STUDY_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_DOCUMENTATION_OF_SERVICE_EVENT4_PHYSICIAN_READING_STUDY_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1533,7 +1533,7 @@ public static boolean validateDiagnosticImagingReportDocumentationOfServiceEvent
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_DOCUMENTATION_OF_SERVICE_EVENT3__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_DOCUMENTATION_OF_SERVICE_EVENT3__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1607,7 +1607,7 @@ public static boolean validateDiagnosticImagingReportDocumentationOfServiceEvent
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_HAS_ASSIGN_PERSON_OR_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_HAS_ASSIGN_PERSON_OR_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1683,7 +1683,7 @@ public static boolean validateDiagnosticImagingReportComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_RESPONSIBLE_PARTY_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_RESPONSIBLE_PARTY_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1759,7 +1759,7 @@ public static boolean validateDiagnosticImagingReportComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_PRECISE_TO_THE_DAY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_PRECISE_TO_THE_DAY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1834,7 +1834,7 @@ public static boolean validateDiagnosticImagingReportComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_PRECISE_TO_THE_MINUTE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_PRECISE_TO_THE_MINUTE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1910,7 +1910,7 @@ public static boolean validateDiagnosticImagingReportComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_PRECISE_TO_THE_SECOND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_PRECISE_TO_THE_SECOND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1986,7 +1986,7 @@ public static boolean validateDiagnosticImagingReportComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2062,7 +2062,7 @@ public static boolean validateDiagnosticImagingReportComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2137,7 +2137,7 @@ public static boolean validateDiagnosticImagingReportComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2211,7 +2211,7 @@ public static boolean validateDiagnosticImagingReportComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_PHYSICIANOF_RECORD_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_PHYSICIANOF_RECORD_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2287,7 +2287,7 @@ public static boolean validateDiagnosticImagingReportComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER7_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2362,7 +2362,7 @@ public static boolean validateDiagnosticImagingReportComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DIAGNOSTIC_IMAGING_REPORT_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2528,7 +2528,7 @@ public static DICOMObjectCatalogSection getDICOMObjectCatalogSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2597,7 +2597,7 @@ public static boolean validateGeneralHeaderConstraintsTemplateId(DiagnosticImagi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2671,7 +2671,7 @@ public static boolean validateGeneralHeaderConstraintsCode(DiagnosticImagingRepo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeDiagnosisSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeDiagnosisSection2Operations.java
index ff50d91d23..2cf59ade1c 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeDiagnosisSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeDiagnosisSection2Operations.java
@@ -78,7 +78,7 @@ protected DischargeDiagnosisSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_DIAGNOSIS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_DIAGNOSIS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -149,7 +149,7 @@ public static boolean validateDischargeDiagnosisSection2TemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_DIAGNOSIS_SECTION2_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_DIAGNOSIS_SECTION2_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -223,7 +223,7 @@ public static boolean validateDischargeDiagnosisSection2CETranslation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_DIAGNOSIS_SECTION2_CE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_DIAGNOSIS_SECTION2_CE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -344,7 +344,7 @@ public static HospitalDischargeDiagnosis2 getConsolHospitalDischargeDiagnosis2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -396,7 +396,7 @@ public static boolean validateHospitalDischargeDiagnosisSectionCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.HospitalDischargeDiagnosisSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.HospitalDischargeDiagnosisSectionCodeP", passToken);
 				}
@@ -429,7 +429,7 @@ public static boolean validateHospitalDischargeDiagnosisSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -506,7 +506,7 @@ public static boolean validateHospitalDischargeDiagnosisSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION_HOSPITAL_DISCHARGE_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION_HOSPITAL_DISCHARGE_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeDietSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeDietSectionOperations.java
index df7b430c98..918d6af10f 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeDietSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeDietSectionOperations.java
@@ -79,7 +79,7 @@ protected DischargeDietSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_DIET_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_DIET_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateDischargeDietSectionTemplateId(DischargeDietSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_DIET_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_DIET_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -213,7 +213,7 @@ public static boolean validateDischargeDietSectionCode(DischargeDietSection disc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_DIET_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_DIET_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -278,7 +278,7 @@ public static boolean validateDischargeDietSectionCodeP(DischargeDietSection dis
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_DIET_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_DIET_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -343,7 +343,7 @@ public static boolean validateDischargeDietSectionTitle(DischargeDietSection dis
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_DIET_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_DIET_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeMedication2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeMedication2Operations.java
index 69fc26abab..5813ffdd54 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeMedication2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeMedication2Operations.java
@@ -86,7 +86,7 @@ protected DischargeMedication2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -179,7 +179,7 @@ public static boolean validateDischargeMedicationCodeP(DischargeMedication2 disc
 					"org.openhealthtools.mdht.uml.cda.consol.DischargeMedicationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.DischargeMedicationCodeP", passToken);
 				}
 				passToken.add(dischargeMedication2);
@@ -408,7 +408,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(Discharge
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_MEDICATION_ACTIVITY2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity2> result = (Collection<MedicationActivity2>) query.evaluate(dischargeMedication2);
-		return new BasicEList.UnmodifiableEList<MedicationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -430,7 +430,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(Discharge
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateDischargeMedication2StatusCode(DischargeMedication2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Discharge Medication2 Status Code</em>}' operation.
@@ -452,7 +452,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(Discharge
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION2_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION2_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateDischargeMedication2StatusCodeP(DischargeMedication2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Discharge Medication2 Status Code P</em>}' operation.
@@ -473,7 +473,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(Discharge
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION2_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION2_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateDischargeMedication2CDTranslation(DischargeMedication2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Discharge Medication2 CD Translation</em>}' operation.
@@ -496,7 +496,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(Discharge
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_MEDICATION2_CD_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_MEDICATION2_CD_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateDischargeMedication2CDTranslationP(DischargeMedication2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Discharge Medication2 CD Translation P</em>}' operation.
@@ -517,7 +517,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(Discharge
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_MEDICATION2_CD_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_MEDICATION2_CD_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #getConsolMedicationActivity2s(DischargeMedication2) <em>Get Consol Medication Activity2s</em>}' operation.
@@ -560,7 +560,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(Discharge
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -633,7 +633,7 @@ public static boolean validateDischargeMedicationCode(DischargeMedication2 disch
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeMedicationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeMedicationOperations.java
index fff12fb2a5..42f1baf5f5 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeMedicationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeMedicationOperations.java
@@ -86,7 +86,7 @@ protected DischargeMedicationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -153,7 +153,7 @@ public static boolean validateDischargeMedicationMedicationActivity(DischargeMed
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -219,7 +219,7 @@ public static boolean validateDischargeMedicationTemplateId(DischargeMedication
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -285,7 +285,7 @@ public static boolean validateDischargeMedicationClassCode(DischargeMedication d
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -352,7 +352,7 @@ public static boolean validateDischargeMedicationMoodCode(DischargeMedication di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -442,7 +442,7 @@ public static EList<MedicationActivity> getMedicationActivities(DischargeMedicat
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_MEDICATION_ACTIVITIES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity> result = (Collection<MedicationActivity>) query.evaluate(dischargeMedication);
-		return new BasicEList.UnmodifiableEList<MedicationActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // DischargeMedicationOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeMedicationsSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeMedicationsSection2Operations.java
index 636c3bda65..ec19d14f8d 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeMedicationsSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeMedicationsSection2Operations.java
@@ -83,7 +83,7 @@ protected DischargeMedicationsSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATIONS_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATIONS_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -152,7 +152,7 @@ public static boolean validateDischargeMedicationsSection2NullFlavor(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATIONS_SECTION2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATIONS_SECTION2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -204,7 +204,7 @@ public static boolean validateDischargeMedicationsSection2CodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.DischargeMedicationsSection2CodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.DischargeMedicationsSection2CodeP", passToken);
 				}
 				passToken.add(dischargeMedicationsSection2);
@@ -236,7 +236,7 @@ public static boolean validateDischargeMedicationsSection2CodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATIONS_SECTION2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATIONS_SECTION2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -313,7 +313,7 @@ public static boolean validateDischargeMedicationsSection2Code(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATIONS_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATIONS_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -382,7 +382,7 @@ public static boolean validateDischargeMedicationsSection2Title(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATIONS_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_MEDICATIONS_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -452,7 +452,7 @@ public static boolean validateDischargeMedicationsSection2Text(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_MEDICATIONS_SECTION2_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_MEDICATIONS_SECTION2_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -527,7 +527,7 @@ public static boolean validateDischargeMedicationsSection2CETranslation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_MEDICATIONS_SECTION2_CE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_MEDICATIONS_SECTION2_CE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -602,7 +602,7 @@ public static boolean validateDischargeMedicationsSection2CETranslationP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -673,7 +673,7 @@ public static boolean validateHospitalDischargeMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_DISCHARGE_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_DISCHARGE_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -773,7 +773,7 @@ public static EList<DischargeMedication2> getConsolDischargeMedication2s(
 		@SuppressWarnings("unchecked")
 		Collection<DischargeMedication2> result = (Collection<DischargeMedication2>) query.evaluate(
 			dischargeMedicationsSection2);
-		return new BasicEList.UnmodifiableEList<DischargeMedication2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // DischargeMedicationsSection2Operations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeMedicationsSectionEntriesOptional2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeMedicationsSectionEntriesOptional2Operations.java
index 8182f9e326..4e496063c0 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeMedicationsSectionEntriesOptional2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeMedicationsSectionEntriesOptional2Operations.java
@@ -83,7 +83,7 @@ protected DischargeMedicationsSectionEntriesOptional2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL2_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL2_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -160,7 +160,7 @@ public static boolean validateDischargeMedicationsSectionEntriesOptional2CETrans
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL2_CE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL2_CE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -265,7 +265,7 @@ public static EList<DischargeMedication2> getConsolDischargeMedication2s(
 		@SuppressWarnings("unchecked")
 		Collection<DischargeMedication2> result = (Collection<DischargeMedication2>) query.evaluate(
 			dischargeMedicationsSectionEntriesOptional2);
-		return new BasicEList.UnmodifiableEList<DischargeMedication2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -287,7 +287,7 @@ public static EList<DischargeMedication2> getConsolDischargeMedication2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -359,7 +359,7 @@ public static boolean validateHospitalDischargeMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -414,7 +414,7 @@ public static boolean validateHospitalDischargeMedicationsSectionEntriesOptional
 					"org.openhealthtools.mdht.uml.cda.consol.HospitalDischargeMedicationsSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.HospitalDischargeMedicationsSectionEntriesOptionalCodeP",
 						passToken);
@@ -448,7 +448,7 @@ public static boolean validateHospitalDischargeMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -530,7 +530,7 @@ public static boolean validateHospitalDischargeMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_DISCHARGE_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_DISCHARGE_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeSummary2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeSummary2Operations.java
index 21ad6a463d..b5c897f6f4 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeSummary2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeSummary2Operations.java
@@ -184,7 +184,7 @@ protected DischargeSummary2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_DOES_NOT_HAVE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_WITH_CHIEF_COMPLAINT_SECTION_OR_REASON_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_DOES_NOT_HAVE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_WITH_CHIEF_COMPLAINT_SECTION_OR_REASON_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -255,7 +255,7 @@ public static boolean validateDischargeSummary2DoesNotHaveChiefComplaintAndReaso
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -303,7 +303,7 @@ public static boolean validateDischargeSummary2CodeP(DischargeSummary2 discharge
 					"org.openhealthtools.mdht.uml.cda.consol.DischargeSummary2CodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.DischargeSummary2CodeP", passToken);
 				}
 				passToken.add(dischargeSummary2);
@@ -335,7 +335,7 @@ public static boolean validateDischargeSummary2CodeP(DischargeSummary2 discharge
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -408,7 +408,7 @@ public static boolean validateDischargeSummary2Code(DischargeSummary2 dischargeS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -473,7 +473,7 @@ public static boolean validateDischargeSummary2Participant(DischargeSummary2 dis
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -538,7 +538,7 @@ public static boolean validateDischargeSummary2ComponentOf(DischargeSummary2 dis
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_ALLERGIES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_ALLERGIES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -606,7 +606,7 @@ public static boolean validateDischargeSummary2AllergiesSectionEntriesOptional2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_HOSPITAL_COURSE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_HOSPITAL_COURSE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -673,7 +673,7 @@ public static boolean validateDischargeSummary2HospitalCourseSection(DischargeSu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -740,7 +740,7 @@ public static boolean validateDischargeSummary2PlanOfTreatmentSection2(Discharge
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -807,7 +807,7 @@ public static boolean validateDischargeSummary2ChiefComplaintSection(DischargeSu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -876,7 +876,7 @@ public static boolean validateDischargeSummary2ChiefComplaintAndReasonForVisitSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_NUTRITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_NUTRITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -943,7 +943,7 @@ public static boolean validateDischargeSummary2NutritionSection(DischargeSummary
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_FUNCTIONAL_STATUS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_FUNCTIONAL_STATUS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1010,7 +1010,7 @@ public static boolean validateDischargeSummary2FunctionalStatusSection2(Discharg
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_HISTORY_OF_PAST_ILLNESS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_HISTORY_OF_PAST_ILLNESS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1078,7 +1078,7 @@ public static boolean validateDischargeSummary2HistoryOfPastIllnessSection2(Disc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_HISTORY_OF_PRESENT_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_HISTORY_OF_PRESENT_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1146,7 +1146,7 @@ public static boolean validateDischargeSummary2HistoryOfPresentIllnessSection(Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_HOSPITAL_CONSULTATIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_HOSPITAL_CONSULTATIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1214,7 +1214,7 @@ public static boolean validateDischargeSummary2HospitalConsultationsSection(Disc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_HOSPITAL_DISCHARGE_INSTRUCTIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_HOSPITAL_DISCHARGE_INSTRUCTIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1283,7 +1283,7 @@ public static boolean validateDischargeSummary2HospitalDischargeInstructionsSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_HOSPITAL_DISCHARGE_PHYSICAL_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_HOSPITAL_DISCHARGE_PHYSICAL_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1351,7 +1351,7 @@ public static boolean validateDischargeSummary2HospitalDischargePhysicalSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_HOSPITAL_DISCHARGE_STUDIES_SUMMARY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_HOSPITAL_DISCHARGE_STUDIES_SUMMARY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1420,7 +1420,7 @@ public static boolean validateDischargeSummary2HospitalDischargeStudiesSummarySe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1489,7 +1489,7 @@ public static boolean validateDischargeSummary2ImmunizationsSectionEntriesOption
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_PROBLEM_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_PROBLEM_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1557,7 +1557,7 @@ public static boolean validateDischargeSummary2ProblemSectionEntriesOptional2(Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_PROCEDURES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_PROCEDURES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1625,7 +1625,7 @@ public static boolean validateDischargeSummary2ProceduresSectionEntriesOptional2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1692,7 +1692,7 @@ public static boolean validateDischargeSummary2ReasonForVisitSection(DischargeSu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1759,7 +1759,7 @@ public static boolean validateDischargeSummary2ReviewOfSystemsSection(DischargeS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_SOCIAL_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_SOCIAL_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1826,7 +1826,7 @@ public static boolean validateDischargeSummary2SocialHistorySection2(DischargeSu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1894,7 +1894,7 @@ public static boolean validateDischargeSummary2VitalSignsSectionEntriesOptional2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_DISCHARGE_DIAGNOSIS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_DISCHARGE_DIAGNOSIS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1961,7 +1961,7 @@ public static boolean validateDischargeSummary2DischargeDiagnosisSection2(Discha
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2030,7 +2030,7 @@ public static boolean validateDischargeSummary2DischargeMedicationsSectionEntrie
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_FAMILY_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_FAMILY_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2097,7 +2097,7 @@ public static boolean validateDischargeSummary2FamilyHistorySection2(DischargeSu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_ADMISSION_DIAGNOSIS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_ADMISSION_DIAGNOSIS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2164,7 +2164,7 @@ public static boolean validateDischargeSummary2AdmissionDiagnosisSection2(Discha
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2233,7 +2233,7 @@ public static boolean validateDischargeSummary2AdmissionMedicationsSectionEntrie
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_DISCHARGE_MEDICATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_DISCHARGE_MEDICATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2301,7 +2301,7 @@ public static boolean validateDischargeSummary2DischargeMedicationsSection2(Disc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_DISCHARGE_DIET_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY2_DISCHARGE_DIET_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2369,7 +2369,7 @@ public static boolean validateDischargeSummary2DischargeDietSection(DischargeSum
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_PARTICIPANT_IF_PAR_TYPE_CODE_IND_THEN_AE_CLASS_CODE_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_PARTICIPANT_IF_PAR_TYPE_CODE_IND_THEN_AE_CLASS_CODE_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2443,7 +2443,7 @@ public static boolean validateDischargeSummary2ParticipantIfParTypeCodeINDThenAE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2517,7 +2517,7 @@ public static boolean validateDischargeSummary2ComponentOfEncompassingEncounterI
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2591,7 +2591,7 @@ public static boolean validateDischargeSummary2ComponentOfEncompassingEncounterI
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2667,7 +2667,7 @@ public static boolean validateDischargeSummary2ComponentOfEncompassingEncounterE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2743,7 +2743,7 @@ public static boolean validateDischargeSummary2ComponentOfEncompassingEncounterE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY_HAS_PERSON_OR_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY_HAS_PERSON_OR_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2819,7 +2819,7 @@ public static boolean validateDischargeSummary2ComponentOfEncompassingEncounterE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2895,7 +2895,7 @@ public static boolean validateDischargeSummary2ComponentOfEncompassingEncounterE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2971,7 +2971,7 @@ public static boolean validateDischargeSummary2ComponentOfEncompassingEncounterR
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3047,7 +3047,7 @@ public static boolean validateDischargeSummary2ComponentOfEncompassingEncounterR
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_HAS_PERSON_OR_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_HAS_PERSON_OR_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3123,7 +3123,7 @@ public static boolean validateDischargeSummary2ComponentOfEncompassingEncounterR
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3198,7 +3198,7 @@ public static boolean validateDischargeSummary2ComponentOfEncompassingEncounterR
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3274,7 +3274,7 @@ public static boolean validateDischargeSummary2ComponentOfEncompassingEncounterE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_DISCHARGE_DISPOSITION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_DISCHARGE_DISPOSITION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3349,7 +3349,7 @@ public static boolean validateDischargeSummary2ComponentOfEncompassingEncounterD
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_DISCHARGE_DISPOSITION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_DISCHARGE_DISPOSITION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3424,7 +3424,7 @@ public static boolean validateDischargeSummary2ComponentOfEncompassingEncounterD
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3498,7 +3498,7 @@ public static boolean validateDischargeSummary2ComponentOfEncompassingEncounterE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3572,7 +3572,7 @@ public static boolean validateDischargeSummary2ComponentOfEncompassingEncounterR
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4889,7 +4889,7 @@ public static DischargeDietSection getDischargeDietSection(DischargeSummary2 dis
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeSummaryOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeSummaryOperations.java
index 2d8c14967b..a458a48e24 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeSummaryOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DischargeSummaryOperations.java
@@ -171,7 +171,7 @@ protected DischargeSummaryOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_DOES_NOT_HAVE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_WITH_CHIEF_COMPLAINT_SECTION_OR_REASON_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_DOES_NOT_HAVE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_WITH_CHIEF_COMPLAINT_SECTION_OR_REASON_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -242,7 +242,7 @@ public static boolean validateDischargeSummaryDoesNotHaveChiefComplaintAndReason
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -290,7 +290,7 @@ public static boolean validateDischargeSummaryCodeP(DischargeSummary dischargeSu
 					"org.openhealthtools.mdht.uml.cda.consol.DischargeSummaryCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.DischargeSummaryCodeP", passToken);
 				}
 				passToken.add(dischargeSummary);
@@ -322,7 +322,7 @@ public static boolean validateDischargeSummaryCodeP(DischargeSummary dischargeSu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -395,7 +395,7 @@ public static boolean validateDischargeSummaryCode(DischargeSummary dischargeSum
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -464,7 +464,7 @@ public static boolean validateDischargeSummaryHospitalAdmissionMedicationsSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -532,7 +532,7 @@ public static boolean validateDischargeSummaryHospitalAdmissionDiagnosisSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -600,7 +600,7 @@ public static boolean validateDischargeSummaryHospitalDischargeDiagnosisSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_DISCHARGE_DIET_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_DISCHARGE_DIET_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -667,7 +667,7 @@ public static boolean validateDischargeSummaryDischargeDietSection(DischargeSumm
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -736,7 +736,7 @@ public static boolean validateDischargeSummaryHospitalDischargeMedicationsSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_FUNCTIONAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_FUNCTIONAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -803,7 +803,7 @@ public static boolean validateDischargeSummaryFunctionalStatusSection(DischargeS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HISTORY_OF_PRESENT_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HISTORY_OF_PRESENT_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -871,7 +871,7 @@ public static boolean validateDischargeSummaryHistoryOfPresentIllnessSection(Dis
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HOSPITAL_COURSE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HOSPITAL_COURSE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -938,7 +938,7 @@ public static boolean validateDischargeSummaryHospitalCourseSection(DischargeSum
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_PLAN_OF_CARE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_PLAN_OF_CARE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1005,7 +1005,7 @@ public static boolean validateDischargeSummaryPlanOfCareSection(DischargeSummary
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HISTORY_OF_PAST_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HISTORY_OF_PAST_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1072,7 +1072,7 @@ public static boolean validateDischargeSummaryHistoryOfPastIllnessSection(Discha
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1137,7 +1137,7 @@ public static boolean validateDischargeSummaryComponentOf(DischargeSummary disch
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1206,7 +1206,7 @@ public static boolean validateDischargeSummaryChiefComplaintAndReasonForVisitSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1273,7 +1273,7 @@ public static boolean validateDischargeSummaryChiefComplaintSection(DischargeSum
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_FAMILY_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_FAMILY_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1340,7 +1340,7 @@ public static boolean validateDischargeSummaryFamilyHistorySection(DischargeSumm
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HOSPITAL_CONSULTATIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HOSPITAL_CONSULTATIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1407,7 +1407,7 @@ public static boolean validateDischargeSummaryHospitalConsultationsSection(Disch
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HOSPITAL_DISCHARGE_INSTRUCTIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HOSPITAL_DISCHARGE_INSTRUCTIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1476,7 +1476,7 @@ public static boolean validateDischargeSummaryHospitalDischargeInstructionsSecti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HOSPITAL_DISCHARGE_PHYSICAL_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HOSPITAL_DISCHARGE_PHYSICAL_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1544,7 +1544,7 @@ public static boolean validateDischargeSummaryHospitalDischargePhysicalSection(D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HOSPITAL_DISCHARGE_STUDIES_SUMMARY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_HOSPITAL_DISCHARGE_STUDIES_SUMMARY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1613,7 +1613,7 @@ public static boolean validateDischargeSummaryHospitalDischargeStudiesSummarySec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1681,7 +1681,7 @@ public static boolean validateDischargeSummaryImmunizationsSectionEntriesOptiona
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_PROBLEM_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_PROBLEM_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1749,7 +1749,7 @@ public static boolean validateDischargeSummaryProblemSectionEntriesOptional(Disc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_PROCEDURES_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_PROCEDURES_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1817,7 +1817,7 @@ public static boolean validateDischargeSummaryProceduresSectionEntriesOptional(D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1884,7 +1884,7 @@ public static boolean validateDischargeSummaryReasonForVisitSection(DischargeSum
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1951,7 +1951,7 @@ public static boolean validateDischargeSummaryReviewOfSystemsSection(DischargeSu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_SOCIAL_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_SOCIAL_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2018,7 +2018,7 @@ public static boolean validateDischargeSummarySocialHistorySection(DischargeSumm
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_ALLERGIES_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_ALLERGIES_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2086,7 +2086,7 @@ public static boolean validateDischargeSummaryAllergiesSectionEntriesOptional(Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISCHARGE_SUMMARY_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2154,7 +2154,7 @@ public static boolean validateDischargeSummaryVitalSignsSectionEntriesOptional(D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_HAS_PERSON_OR_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_HAS_PERSON_OR_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2230,7 +2230,7 @@ public static boolean validateDischargeSummaryComponentOfEncompassingEncounter3R
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_RESPONSIBLE_PARTY_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_RESPONSIBLE_PARTY_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2305,7 +2305,7 @@ public static boolean validateDischargeSummaryComponentOfEncompassingEncounter3R
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY_HAS_PERSON_OR_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY_HAS_PERSON_OR_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2381,7 +2381,7 @@ public static boolean validateDischargeSummaryComponentOfEncompassingEncounter3E
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2457,7 +2457,7 @@ public static boolean validateDischargeSummaryComponentOfEncompassingEncounter3E
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_ENCOMPASSING_ENCOUNTER_HAS_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_ENCOMPASSING_ENCOUNTER_HAS_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2533,7 +2533,7 @@ public static boolean validateDischargeSummaryComponentOfEncompassingEncounter3E
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_ENCOMPASSING_ENCOUNTER_HAS_EFFECTIVE_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_ENCOMPASSING_ENCOUNTER_HAS_EFFECTIVE_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2609,7 +2609,7 @@ public static boolean validateDischargeSummaryComponentOfEncompassingEncounter3E
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_DISCHARGE_DISPOSITION_CODE_VALUE_SET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_DISCHARGE_DISPOSITION_CODE_VALUE_SET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2685,7 +2685,7 @@ public static boolean validateDischargeSummaryComponentOfEncompassingEncounter3D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_DISCHARGE_DISPOSITION_CODE_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_DISCHARGE_DISPOSITION_CODE_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2761,7 +2761,7 @@ public static boolean validateDischargeSummaryComponentOfEncompassingEncounter3D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_DISCHARGE_DISPOSITION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_DISCHARGE_DISPOSITION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2836,7 +2836,7 @@ public static boolean validateDischargeSummaryComponentOfEncompassingEncounter3D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2910,7 +2910,7 @@ public static boolean validateDischargeSummaryComponentOfEncompassingEncounter3E
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2984,7 +2984,7 @@ public static boolean validateDischargeSummaryComponentOfEncompassingEncounter3R
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_ENCOUNTER_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER3_ENCOUNTER_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3058,7 +3058,7 @@ public static boolean validateDischargeSummaryComponentOfEncompassingEncounter3E
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DISCHARGE_SUMMARY_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4286,7 +4286,7 @@ public static VitalSignsSectionEntriesOptional getVitalSignsSectionEntriesOption
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DistinctIdentificationCodeObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DistinctIdentificationCodeObservationOperations.java
index ca38d15cf2..76c6d981f0 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DistinctIdentificationCodeObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DistinctIdentificationCodeObservationOperations.java
@@ -81,7 +81,7 @@ protected DistinctIdentificationCodeObservationOperations() {
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_DISTINCT_IDENTIFICATION_CODE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISTINCT_IDENTIFICATION_CODE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -149,7 +149,7 @@ public static boolean validateDistinctIdentificationCodeObservationTemplateId(
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_DISTINCT_IDENTIFICATION_CODE_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISTINCT_IDENTIFICATION_CODE_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -201,7 +201,7 @@ public static boolean validateDistinctIdentificationCodeObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.DistinctIdentificationCodeObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.DistinctIdentificationCodeObservationCodeP",
 						passToken);
@@ -234,7 +234,7 @@ public static boolean validateDistinctIdentificationCodeObservationCodeP(
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_DISTINCT_IDENTIFICATION_CODE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISTINCT_IDENTIFICATION_CODE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -311,7 +311,7 @@ public static boolean validateDistinctIdentificationCodeObservationCode(
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_DISTINCT_IDENTIFICATION_CODE_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DISTINCT_IDENTIFICATION_CODE_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DrugMonitoringActOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DrugMonitoringActOperations.java
index 74f477e69b..ac0596a1c8 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DrugMonitoringActOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DrugMonitoringActOperations.java
@@ -93,7 +93,7 @@ protected DrugMonitoringActOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -158,7 +158,7 @@ public static boolean validateDrugMonitoringActTemplateId(DrugMonitoringAct drug
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -223,7 +223,7 @@ public static boolean validateDrugMonitoringActClassCode(DrugMonitoringAct drugM
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -288,7 +288,7 @@ public static boolean validateDrugMonitoringActMoodCode(DrugMonitoringAct drugMo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -353,7 +353,7 @@ public static boolean validateDrugMonitoringActId(DrugMonitoringAct drugMonitori
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -401,7 +401,7 @@ public static boolean validateDrugMonitoringActCodeP(DrugMonitoringAct drugMonit
 					"org.openhealthtools.mdht.uml.cda.consol.DrugMonitoringActCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.DrugMonitoringActCodeP", passToken);
 				}
 				passToken.add(drugMonitoringAct);
@@ -433,7 +433,7 @@ public static boolean validateDrugMonitoringActCodeP(DrugMonitoringAct drugMonit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -508,7 +508,7 @@ public static boolean validateDrugMonitoringActCode(DrugMonitoringAct drugMonito
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -573,7 +573,7 @@ public static boolean validateDrugMonitoringActStatusCode(DrugMonitoringAct drug
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -639,7 +639,7 @@ public static boolean validateDrugMonitoringActStatusCodeP(DrugMonitoringAct dru
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -706,7 +706,7 @@ public static boolean validateDrugMonitoringActEffectiveTime(DrugMonitoringAct d
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DRUG_MONITORING_ACT_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -771,7 +771,7 @@ public static boolean validateDrugMonitoringActParticipant(DrugMonitoringAct dru
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DRUG_MONITORING_ACT_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DRUG_MONITORING_ACT_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -847,7 +847,7 @@ public static boolean validateDrugMonitoringActParticipantParticipantRolePlaying
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DRUG_MONITORING_ACT_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DRUG_MONITORING_ACT_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -921,7 +921,7 @@ public static boolean validateDrugMonitoringActParticipantParticipantRolePlaying
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DRUG_MONITORING_ACT_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DRUG_MONITORING_ACT_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -995,7 +995,7 @@ public static boolean validateDrugMonitoringActParticipantParticipantRolePlaying
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DRUG_MONITORING_ACT_PARTICIPANT_PARTICIPANT_ROLE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DRUG_MONITORING_ACT_PARTICIPANT_PARTICIPANT_ROLE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1069,7 +1069,7 @@ public static boolean validateDrugMonitoringActParticipantParticipantRoleClassCo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DRUG_MONITORING_ACT_PARTICIPANT_PARTICIPANT_ROLE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DRUG_MONITORING_ACT_PARTICIPANT_PARTICIPANT_ROLE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1142,7 +1142,7 @@ public static boolean validateDrugMonitoringActParticipantParticipantRoleId(Drug
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DRUG_MONITORING_ACT_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DRUG_MONITORING_ACT_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1216,7 +1216,7 @@ public static boolean validateDrugMonitoringActParticipantParticipantRolePlaying
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DRUG_MONITORING_ACT_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DRUG_MONITORING_ACT_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1288,7 +1288,7 @@ public static boolean validateDrugMonitoringActParticipantTypeCode(DrugMonitorin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DRUG_MONITORING_ACT_PARTICIPANT_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_DRUG_MONITORING_ACT_PARTICIPANT_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DrugVehicleOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DrugVehicleOperations.java
index 22486b9ff5..0da97998a8 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DrugVehicleOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/DrugVehicleOperations.java
@@ -80,7 +80,7 @@ protected DrugVehicleOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DRUG_VEHICLE_PLAYING_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DRUG_VEHICLE_PLAYING_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -145,7 +145,7 @@ public static boolean validateDrugVehiclePlayingEntityCode(DrugVehicle drugVehic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DRUG_VEHICLE_PLAYING_ENTITY_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DRUG_VEHICLE_PLAYING_ENTITY_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -210,7 +210,7 @@ public static boolean validateDrugVehiclePlayingEntityName(DrugVehicle drugVehic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DRUG_VEHICLE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DRUG_VEHICLE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -275,7 +275,7 @@ public static boolean validateDrugVehicleTemplateId(DrugVehicle drugVehicle, Dia
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DRUG_VEHICLE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DRUG_VEHICLE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -342,7 +342,7 @@ public static boolean validateDrugVehicleClassCode(DrugVehicle drugVehicle, Diag
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DRUG_VEHICLE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DRUG_VEHICLE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -406,7 +406,7 @@ public static boolean validateDrugVehicleCode(DrugVehicle drugVehicle, Diagnosti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_DRUG_VEHICLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_DRUG_VEHICLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncounterActivitiesOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncounterActivitiesOperations.java
index 31efa9bc76..91261d3b92 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncounterActivitiesOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncounterActivitiesOperations.java
@@ -106,7 +106,7 @@ protected EncounterActivitiesOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_CODE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_CODE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -173,7 +173,7 @@ public static boolean validateEncounterActivitiesCodeOriginalText(EncounterActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_CODE_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_CODE_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -241,7 +241,7 @@ public static boolean validateEncounterActivitiesCodeOriginalTextReference(Encou
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -308,7 +308,7 @@ public static boolean validateEncounterActivitiesReferenceValue(EncounterActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_CODE_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_CODE_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -377,7 +377,7 @@ public static boolean validateEncounterActivitiesCodeOriginalTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_SERVICE_DELIVERY_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_SERVICE_DELIVERY_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -445,7 +445,7 @@ public static boolean validateEncounterActivitiesServiceDeliveryTypeCode(Encount
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_SDTC_DDC_FROM_NUBC_OR_DD__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_SDTC_DDC_FROM_NUBC_OR_DD__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -512,7 +512,7 @@ public static boolean validateEncounterActivitiesSdtcDDCFromNUBCOrDD(EncounterAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -578,7 +578,7 @@ public static boolean validateEncounterActivitiesTemplateId(EncounterActivities
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -644,7 +644,7 @@ public static boolean validateEncounterActivitiesClassCode(EncounterActivities e
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -709,7 +709,7 @@ public static boolean validateEncounterActivitiesMoodCode(EncounterActivities en
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -776,7 +776,7 @@ public static boolean validateEncounterActivitiesId(EncounterActivities encounte
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -841,7 +841,7 @@ public static boolean validateEncounterActivitiesCode(EncounterActivities encoun
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -908,7 +908,7 @@ public static boolean validateEncounterActivitiesEffectiveTime(EncounterActiviti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_SDTC_DISCHARGE_DISPOSITION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_SDTC_DISCHARGE_DISPOSITION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -976,7 +976,7 @@ public static boolean validateEncounterActivitiesSDTCDischargeDispositionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_SERVICE_DELIVERY_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_SERVICE_DELIVERY_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1044,7 +1044,7 @@ public static boolean validateEncounterActivitiesServiceDeliveryLocation(Encount
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1110,7 +1110,7 @@ public static boolean validateEncounterActivitiesIndication(EncounterActivities
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_ENCOUNTER_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_ENCOUNTER_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1177,7 +1177,7 @@ public static boolean validateEncounterActivitiesEncounterPerformer(EncounterAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_ENCOUNTER_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_ENCOUNTER_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1244,7 +1244,7 @@ public static boolean validateEncounterActivitiesEncounterDiagnosis(EncounterAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ENCOUNTER_ACTIVITIES_ENCOUNTER_PERFORMER_ENCOUNTER_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ENCOUNTER_ACTIVITIES_ENCOUNTER_PERFORMER_ENCOUNTER_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1319,7 +1319,7 @@ public static boolean validateEncounterActivitiesEncounterPerformerEncounterPerf
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ENCOUNTER_ACTIVITIES_ENCOUNTER_PERFORMER_ENCOUNTER_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ENCOUNTER_ACTIVITIES_ENCOUNTER_PERFORMER_ENCOUNTER_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1420,7 +1420,7 @@ public static EList<ServiceDeliveryLocation> getServiceDeliveryLocations(Encount
 		@SuppressWarnings("unchecked")
 		Collection<ServiceDeliveryLocation> result = (Collection<ServiceDeliveryLocation>) query.evaluate(
 			encounterActivities);
-		return new BasicEList.UnmodifiableEList<ServiceDeliveryLocation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1467,7 +1467,7 @@ public static EList<Indication> getIndications(EncounterActivities encounterActi
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INDICATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication> result = (Collection<Indication>) query.evaluate(encounterActivities);
-		return new BasicEList.UnmodifiableEList<Indication>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1514,7 +1514,7 @@ public static EList<EncounterDiagnosis> getEncounterDiagnosiss(EncounterActiviti
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_ENCOUNTER_DIAGNOSISS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EncounterDiagnosis> result = (Collection<EncounterDiagnosis>) query.evaluate(encounterActivities);
-		return new BasicEList.UnmodifiableEList<EncounterDiagnosis>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // EncounterActivitiesOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncounterActivity2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncounterActivity2Operations.java
index 91a19b7c57..befbed1077 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncounterActivity2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncounterActivity2Operations.java
@@ -96,7 +96,7 @@ protected EncounterActivity2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITY2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITY2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -291,7 +291,7 @@ public static boolean validateEncounterActivitiesEncounterPerformerEncounterPerf
 						"org.openhealthtools.mdht.uml.cda.consol.EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.EncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCodeP",
 							passToken);
@@ -329,7 +329,7 @@ public static EList<Indication2> getConsolIndication2s(EncounterActivity2 encoun
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_INDICATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication2> result = (Collection<Indication2>) query.evaluate(encounterActivity2);
-		return new BasicEList.UnmodifiableEList<Indication2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -357,7 +357,7 @@ public static EList<EncounterDiagnosis2> getConsolEncounterDiagnosis2s(Encounter
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_ENCOUNTER_DIAGNOSIS2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EncounterDiagnosis2> result = (Collection<EncounterDiagnosis2>) query.evaluate(encounterActivity2);
-		return new BasicEList.UnmodifiableEList<EncounterDiagnosis2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -387,7 +387,7 @@ public static EList<ServiceDeliveryLocation> getConsolServiceDeliveryLocations(
 		@SuppressWarnings("unchecked")
 		Collection<ServiceDeliveryLocation> result = (Collection<ServiceDeliveryLocation>) query.evaluate(
 			encounterActivity2);
-		return new BasicEList.UnmodifiableEList<ServiceDeliveryLocation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -455,7 +455,7 @@ public static boolean validateEncounterActivitiesSdtcDDCFromNUBCOrDD(EncounterAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateEncounterActivity2CDTranslation(EncounterActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Encounter Activity2 CD Translation</em>}' operation.
@@ -476,7 +476,7 @@ public static boolean validateEncounterActivitiesSdtcDDCFromNUBCOrDD(EncounterAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ENCOUNTER_ACTIVITY2_CD_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ENCOUNTER_ACTIVITY2_CD_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateEncounterActivitiesEncounterPerformerEncounterPerformerAssignedEntityCodeP(EncounterActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Encounter Activities Encounter Performer Encounter Performer Assigned Entity Code P</em>}' operation.
@@ -497,7 +497,7 @@ public static boolean validateEncounterActivitiesSdtcDDCFromNUBCOrDD(EncounterAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ENCOUNTER_ACTIVITIES_ENCOUNTER_PERFORMER_ENCOUNTER_PERFORMER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ENCOUNTER_ACTIVITIES_ENCOUNTER_PERFORMER_ENCOUNTER_PERFORMER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #getConsolIndication2s(EncounterActivity2) <em>Get Consol Indication2s</em>}' operation.
@@ -578,7 +578,7 @@ public static boolean validateEncounterActivitiesSdtcDDCFromNUBCOrDD(EncounterAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_SDTC_DDC_FROM_NUBC_OR_DD__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_SDTC_DDC_FROM_NUBC_OR_DD__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateEncounterActivitiesCode(EncounterActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Encounter Activities Code</em>}' operation.
@@ -601,7 +601,7 @@ public static boolean validateEncounterActivitiesSdtcDDCFromNUBCOrDD(EncounterAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -666,7 +666,7 @@ public static boolean validateEncounterActivitiesCode(EncounterActivity2 encount
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_SDTC_DISCHARGE_DISPOSITION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_SDTC_DISCHARGE_DISPOSITION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -734,7 +734,7 @@ public static boolean validateEncounterActivitiesSDTCDischargeDispositionCode(En
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -799,7 +799,7 @@ public static boolean validateEncounterActivitiesIndication(EncounterActivity2 e
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_ENCOUNTER_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_ENCOUNTER_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -866,7 +866,7 @@ public static boolean validateEncounterActivitiesEncounterDiagnosis(EncounterAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_SERVICE_DELIVERY_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_SERVICE_DELIVERY_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -933,7 +933,7 @@ public static boolean validateEncounterActivitiesServiceDeliveryLocation(Encount
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_ENCOUNTER_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_ACTIVITIES_ENCOUNTER_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1002,7 +1002,7 @@ public static boolean validateEncounterActivitiesEncounterPerformer(EncounterAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ENCOUNTER_ACTIVITIES_ENCOUNTER_PERFORMER_ENCOUNTER_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ENCOUNTER_ACTIVITIES_ENCOUNTER_PERFORMER_ENCOUNTER_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1087,7 +1087,7 @@ public static boolean validateEncounterActivitiesEncounterPerformerEncounterPerf
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ENCOUNTER_ACTIVITIES_ENCOUNTER_PERFORMER_ENCOUNTER_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ENCOUNTER_ACTIVITIES_ENCOUNTER_PERFORMER_ENCOUNTER_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncounterDiagnosis2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncounterDiagnosis2Operations.java
index f15f622c82..33c83448d0 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncounterDiagnosis2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncounterDiagnosis2Operations.java
@@ -80,7 +80,7 @@ protected EncounterDiagnosis2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -172,7 +172,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(Encounter
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_PROBLEM_OBSERVATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation2> result = (Collection<ProblemObservation2>) query.evaluate(encounterDiagnosis2);
-		return new BasicEList.UnmodifiableEList<ProblemObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -194,7 +194,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(Encounter
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -242,7 +242,7 @@ public static boolean validateEncounterDiagnosisCodeP(EncounterDiagnosis2 encoun
 					"org.openhealthtools.mdht.uml.cda.consol.EncounterDiagnosisCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.EncounterDiagnosisCodeP", passToken);
 				}
 				passToken.add(encounterDiagnosis2);
@@ -274,7 +274,7 @@ public static boolean validateEncounterDiagnosisCodeP(EncounterDiagnosis2 encoun
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -347,7 +347,7 @@ public static boolean validateEncounterDiagnosisCode(EncounterDiagnosis2 encount
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncounterDiagnosisOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncounterDiagnosisOperations.java
index e867f7cef0..927b1fc68c 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncounterDiagnosisOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncounterDiagnosisOperations.java
@@ -83,7 +83,7 @@ protected EncounterDiagnosisOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateEncounterDiagnosisTemplateId(EncounterDiagnosis en
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -213,7 +213,7 @@ public static boolean validateEncounterDiagnosisClassCode(EncounterDiagnosis enc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -278,7 +278,7 @@ public static boolean validateEncounterDiagnosisMoodCode(EncounterDiagnosis enco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -326,7 +326,7 @@ public static boolean validateEncounterDiagnosisCodeP(EncounterDiagnosis encount
 					"org.openhealthtools.mdht.uml.cda.consol.EncounterDiagnosisCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.EncounterDiagnosisCodeP", passToken);
 				}
 				passToken.add(encounterDiagnosis);
@@ -358,7 +358,7 @@ public static boolean validateEncounterDiagnosisCodeP(EncounterDiagnosis encount
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -431,7 +431,7 @@ public static boolean validateEncounterDiagnosisCode(EncounterDiagnosis encounte
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTER_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -523,7 +523,7 @@ public static EList<ProblemObservation> getProblemObservations(EncounterDiagnosi
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PROBLEM_OBSERVATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation> result = (Collection<ProblemObservation>) query.evaluate(encounterDiagnosis);
-		return new BasicEList.UnmodifiableEList<ProblemObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // EncounterDiagnosisOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncountersSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncountersSection2Operations.java
index 8c3b6a0626..960c187597 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncountersSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncountersSection2Operations.java
@@ -83,7 +83,7 @@ protected EncountersSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateEncountersSection2NullFlavor(EncountersSection2 en
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -213,7 +213,7 @@ public static boolean validateEncountersSection2Text(EncountersSection2 encounte
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -278,7 +278,7 @@ public static boolean validateEncountersSection2Title(EncountersSection2 encount
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -345,7 +345,7 @@ public static boolean validateEncountersSectionEntriesOptionalTemplateId(Encount
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -395,7 +395,7 @@ public static boolean validateEncountersSectionEntriesOptionalCodeP(EncountersSe
 					"org.openhealthtools.mdht.uml.cda.consol.EncountersSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.EncountersSectionEntriesOptionalCodeP", passToken);
 				}
@@ -428,7 +428,7 @@ public static boolean validateEncountersSectionEntriesOptionalCodeP(EncountersSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -503,7 +503,7 @@ public static boolean validateEncountersSectionEntriesOptionalCode(EncountersSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_ENCOUNTER_ACTIVITIES__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_ENCOUNTER_ACTIVITIES__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -598,7 +598,7 @@ public static EList<EncounterActivity2> getConsolEncounterActivity2s(EncountersS
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_ENCOUNTER_ACTIVITY2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EncounterActivity2> result = (Collection<EncounterActivity2>) query.evaluate(encountersSection2);
-		return new BasicEList.UnmodifiableEList<EncounterActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // EncountersSection2Operations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncountersSectionEntriesOptional2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncountersSectionEntriesOptional2Operations.java
index fbe7726f1b..c8c1d3193f 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncountersSectionEntriesOptional2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncountersSectionEntriesOptional2Operations.java
@@ -108,7 +108,7 @@ public static EList<EncounterActivity2> getConsolEncounterActivity2s(
 		@SuppressWarnings("unchecked")
 		Collection<EncounterActivity2> result = (Collection<EncounterActivity2>) query.evaluate(
 			encountersSectionEntriesOptional2);
-		return new BasicEList.UnmodifiableEList<EncounterActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -130,7 +130,7 @@ public static EList<EncounterActivity2> getConsolEncounterActivity2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -200,7 +200,7 @@ public static boolean validateEncountersSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -253,7 +253,7 @@ public static boolean validateEncountersSectionEntriesOptionalCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.EncountersSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.EncountersSectionEntriesOptionalCodeP", passToken);
 				}
@@ -286,7 +286,7 @@ public static boolean validateEncountersSectionEntriesOptionalCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -365,7 +365,7 @@ public static boolean validateEncountersSectionEntriesOptionalCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_ENCOUNTER_ACTIVITIES__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_ENCOUNTER_ACTIVITIES__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncountersSectionEntriesOptionalOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncountersSectionEntriesOptionalOperations.java
index e22d66350a..4e88a251cb 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncountersSectionEntriesOptionalOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncountersSectionEntriesOptionalOperations.java
@@ -87,7 +87,7 @@ protected EncountersSectionEntriesOptionalOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -159,7 +159,7 @@ public static boolean validateEncountersSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -229,7 +229,7 @@ public static boolean validateEncountersSectionEntriesOptionalCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -299,7 +299,7 @@ public static boolean validateEncountersSectionEntriesOptionalCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -369,7 +369,7 @@ public static boolean validateEncountersSectionEntriesOptionalTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -439,7 +439,7 @@ public static boolean validateEncountersSectionEntriesOptionalText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_ENCOUNTER_ACTIVITIES__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_ENCOUNTER_ACTIVITIES__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -536,7 +536,7 @@ public static EList<EncounterActivities> getEncounterActivitiess(
 		@SuppressWarnings("unchecked")
 		Collection<EncounterActivities> result = (Collection<EncounterActivities>) query.evaluate(
 			encountersSectionEntriesOptional);
-		return new BasicEList.UnmodifiableEList<EncounterActivities>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // EncountersSectionEntriesOptionalOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncountersSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncountersSectionOperations.java
index c8ef445f97..20ee07ad8c 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncountersSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EncountersSectionOperations.java
@@ -86,7 +86,7 @@ protected EncountersSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENCOUNTER_ACTIVITIES__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENCOUNTER_ACTIVITIES__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -179,7 +179,7 @@ public static EList<EncounterActivities> getConsolEncounterActivitiess(Encounter
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_ENCOUNTER_ACTIVITIESS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EncounterActivities> result = (Collection<EncounterActivities>) query.evaluate(encountersSection);
-		return new BasicEList.UnmodifiableEList<EncounterActivities>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -201,7 +201,7 @@ public static EList<EncounterActivities> getConsolEncounterActivitiess(Encounter
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -268,7 +268,7 @@ public static boolean validateEncountersSectionEntriesOptionalTemplateId(Encount
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -318,7 +318,7 @@ public static boolean validateEncountersSectionEntriesOptionalCodeP(EncountersSe
 					"org.openhealthtools.mdht.uml.cda.consol.EncountersSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.EncountersSectionEntriesOptionalCodeP", passToken);
 				}
@@ -351,7 +351,7 @@ public static boolean validateEncountersSectionEntriesOptionalCodeP(EncountersSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -426,7 +426,7 @@ public static boolean validateEncountersSectionEntriesOptionalCode(EncountersSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -493,7 +493,7 @@ public static boolean validateEncountersSectionEntriesOptionalText(EncountersSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENCOUNTERS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EntryReferenceOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EntryReferenceOperations.java
index c71ef41d66..14be86b60b 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EntryReferenceOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EntryReferenceOperations.java
@@ -91,7 +91,7 @@ protected EntryReferenceOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENTRY_REFERENCE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENTRY_REFERENCE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -156,7 +156,7 @@ public static boolean validateEntryReferenceTemplateId(EntryReference entryRefer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENTRY_REFERENCE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENTRY_REFERENCE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateEntryReferenceClassCode(EntryReference entryRefere
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENTRY_REFERENCE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENTRY_REFERENCE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -286,7 +286,7 @@ public static boolean validateEntryReferenceMoodCode(EntryReference entryReferen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENTRY_REFERENCE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENTRY_REFERENCE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -351,7 +351,7 @@ public static boolean validateEntryReferenceId(EntryReference entryReference, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENTRY_REFERENCE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENTRY_REFERENCE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -418,7 +418,7 @@ public static boolean validateEntryReferenceCode(EntryReference entryReference,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENTRY_REFERENCE_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENTRY_REFERENCE_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -483,7 +483,7 @@ public static boolean validateEntryReferenceStatusCode(EntryReference entryRefer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ENTRY_REFERENCE_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ENTRY_REFERENCE_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -552,7 +552,7 @@ public static boolean validateEntryReferenceStatusCodeP(EntryReference entryRefe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ENTRY_REFERENCE_II_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ENTRY_REFERENCE_II_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -626,7 +626,7 @@ public static boolean validateEntryReferenceIINullFlavor(EntryReference entryRef
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ENTRY_REFERENCE_CD_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ENTRY_REFERENCE_CD_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -698,7 +698,7 @@ public static boolean validateEntryReferenceCDNullFlavor(EntryReference entryRef
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ENTRY_REFERENCE_CD_NULL_FLAVOR_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_ENTRY_REFERENCE_CD_NULL_FLAVOR_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EstimatedDateOfDeliveryOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EstimatedDateOfDeliveryOperations.java
index 7af6bb4c37..f63979d793 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EstimatedDateOfDeliveryOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/EstimatedDateOfDeliveryOperations.java
@@ -80,7 +80,7 @@ protected EstimatedDateOfDeliveryOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ESTIMATED_DATE_OF_DELIVERY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ESTIMATED_DATE_OF_DELIVERY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -147,7 +147,7 @@ public static boolean validateEstimatedDateOfDeliveryTemplateId(EstimatedDateOfD
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ESTIMATED_DATE_OF_DELIVERY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ESTIMATED_DATE_OF_DELIVERY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -216,7 +216,7 @@ public static boolean validateEstimatedDateOfDeliveryClassCode(EstimatedDateOfDe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ESTIMATED_DATE_OF_DELIVERY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ESTIMATED_DATE_OF_DELIVERY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -282,7 +282,7 @@ public static boolean validateEstimatedDateOfDeliveryCode(EstimatedDateOfDeliver
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ESTIMATED_DATE_OF_DELIVERY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ESTIMATED_DATE_OF_DELIVERY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -350,7 +350,7 @@ public static boolean validateEstimatedDateOfDeliveryMoodCode(EstimatedDateOfDel
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ESTIMATED_DATE_OF_DELIVERY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ESTIMATED_DATE_OF_DELIVERY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -417,7 +417,7 @@ public static boolean validateEstimatedDateOfDeliveryStatusCode(EstimatedDateOfD
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_ESTIMATED_DATE_OF_DELIVERY_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_ESTIMATED_DATE_OF_DELIVERY_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ExpirationDateObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ExpirationDateObservationOperations.java
index a71c890150..6eeaa6d9d8 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ExpirationDateObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ExpirationDateObservationOperations.java
@@ -82,7 +82,7 @@ protected ExpirationDateObservationOperations() {
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_EXPIRATION_DATE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_EXPIRATION_DATE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateExpirationDateObservationTemplateId(
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_EXPIRATION_DATE_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_EXPIRATION_DATE_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -197,7 +197,7 @@ public static boolean validateExpirationDateObservationCodeP(ExpirationDateObser
 					"org.openhealthtools.mdht.uml.cda.consol.ExpirationDateObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ExpirationDateObservationCodeP", passToken);
 				}
 				passToken.add(expirationDateObservation);
@@ -228,7 +228,7 @@ public static boolean validateExpirationDateObservationCodeP(ExpirationDateObser
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_EXPIRATION_DATE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_EXPIRATION_DATE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -300,7 +300,7 @@ public static boolean validateExpirationDateObservationCode(ExpirationDateObserv
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_EXPIRATION_DATE_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_EXPIRATION_DATE_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -365,7 +365,7 @@ public static boolean validateExpirationDateObservationValue(ExpirationDateObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_EXPIRATION_DATE_OBSERVATION_TS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_EXPIRATION_DATE_OBSERVATION_TS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ExternalDocumentReferenceOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ExternalDocumentReferenceOperations.java
index 4b844d42af..8dfc49458e 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ExternalDocumentReferenceOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ExternalDocumentReferenceOperations.java
@@ -77,7 +77,7 @@ protected ExternalDocumentReferenceOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_EXTERNAL_DOCUMENT_REFERENCE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_EXTERNAL_DOCUMENT_REFERENCE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -145,7 +145,7 @@ public static boolean validateExternalDocumentReferenceTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_EXTERNAL_DOCUMENT_REFERENCE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_EXTERNAL_DOCUMENT_REFERENCE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -213,7 +213,7 @@ public static boolean validateExternalDocumentReferenceClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_EXTERNAL_DOCUMENT_REFERENCE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_EXTERNAL_DOCUMENT_REFERENCE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -280,7 +280,7 @@ public static boolean validateExternalDocumentReferenceMoodCode(ExternalDocument
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_EXTERNAL_DOCUMENT_REFERENCE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_EXTERNAL_DOCUMENT_REFERENCE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -346,7 +346,7 @@ public static boolean validateExternalDocumentReferenceId(ExternalDocumentRefere
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_EXTERNAL_DOCUMENT_REFERENCE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_EXTERNAL_DOCUMENT_REFERENCE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -412,7 +412,7 @@ public static boolean validateExternalDocumentReferenceCode(ExternalDocumentRefe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_EXTERNAL_DOCUMENT_REFERENCE_SET_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_EXTERNAL_DOCUMENT_REFERENCE_SET_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -479,7 +479,7 @@ public static boolean validateExternalDocumentReferenceSetId(ExternalDocumentRef
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_EXTERNAL_DOCUMENT_REFERENCE_VERSION_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_EXTERNAL_DOCUMENT_REFERENCE_VERSION_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryDeathObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryDeathObservationOperations.java
index 8a9e382a92..c1e1ca6599 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryDeathObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryDeathObservationOperations.java
@@ -81,7 +81,7 @@ protected FamilyHistoryDeathObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_DEATH_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_DEATH_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateFamilyHistoryDeathObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_DEATH_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_DEATH_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateFamilyHistoryDeathObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_DEATH_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_DEATH_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -292,7 +292,7 @@ public static boolean validateFamilyHistoryDeathObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_DEATH_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_DEATH_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -362,7 +362,7 @@ public static boolean validateFamilyHistoryDeathObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_DEATH_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_DEATH_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -434,7 +434,7 @@ public static boolean validateFamilyHistoryDeathObservationStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_DEATH_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_DEATH_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -503,7 +503,7 @@ public static boolean validateFamilyHistoryDeathObservationValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_DEATH_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_DEATH_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryObservation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryObservation2Operations.java
index aff210e91b..4d8bd43f42 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryObservation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryObservation2Operations.java
@@ -75,7 +75,7 @@ protected FamilyHistoryObservation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -145,7 +145,7 @@ public static boolean validateFamilyHistoryObservation2TemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_OBSERVATION2_CD_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_OBSERVATION2_CD_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -219,7 +219,7 @@ public static boolean validateFamilyHistoryObservation2CDTranslation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_OBSERVATION2_CD_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_OBSERVATION2_CD_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -293,7 +293,7 @@ public static boolean validateFamilyHistoryObservation2CDTranslationP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -342,7 +342,7 @@ public static boolean validateFamilyHistoryObservationCodeP(FamilyHistoryObserva
 					"org.openhealthtools.mdht.uml.cda.consol.FamilyHistoryObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.FamilyHistoryObservationCodeP", passToken);
 				}
 				passToken.add(familyHistoryObservation2);
@@ -374,7 +374,7 @@ public static boolean validateFamilyHistoryObservationCodeP(FamilyHistoryObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryObservationOperations.java
index e07611eae5..8560fb9bc4 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryObservationOperations.java
@@ -94,7 +94,7 @@ protected FamilyHistoryObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_AGE_OBSERVATION_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_AGE_OBSERVATION_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -164,7 +164,7 @@ public static boolean validateFamilyHistoryObservationAgeObservationInversion(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -231,7 +231,7 @@ public static boolean validateFamilyHistoryObservationTemplateId(FamilyHistoryOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -298,7 +298,7 @@ public static boolean validateFamilyHistoryObservationClassCode(FamilyHistoryObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -365,7 +365,7 @@ public static boolean validateFamilyHistoryObservationMoodCode(FamilyHistoryObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -431,7 +431,7 @@ public static boolean validateFamilyHistoryObservationId(FamilyHistoryObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -480,7 +480,7 @@ public static boolean validateFamilyHistoryObservationCodeP(FamilyHistoryObserva
 					"org.openhealthtools.mdht.uml.cda.consol.FamilyHistoryObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.FamilyHistoryObservationCodeP", passToken);
 				}
 				passToken.add(familyHistoryObservation);
@@ -512,7 +512,7 @@ public static boolean validateFamilyHistoryObservationCodeP(FamilyHistoryObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -587,7 +587,7 @@ public static boolean validateFamilyHistoryObservationCode(FamilyHistoryObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -654,7 +654,7 @@ public static boolean validateFamilyHistoryObservationStatusCode(FamilyHistoryOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -721,7 +721,7 @@ public static boolean validateFamilyHistoryObservationStatusCodeP(FamilyHistoryO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -792,7 +792,7 @@ public static boolean validateFamilyHistoryObservationEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -858,7 +858,7 @@ public static boolean validateFamilyHistoryObservationValue(FamilyHistoryObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_AGE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_AGE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -927,7 +927,7 @@ public static boolean validateFamilyHistoryObservationAgeObservation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_FAMILY_HISTORY_DEATH_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_OBSERVATION_FAMILY_HISTORY_DEATH_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryOrganizer2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryOrganizer2Operations.java
index 35c632cf1c..b85ce4a70e 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryOrganizer2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryOrganizer2Operations.java
@@ -75,7 +75,7 @@ protected FamilyHistoryOrganizer2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -142,7 +142,7 @@ public static boolean validateFamilyHistoryOrganizer2TemplateId(FamilyHistoryOrg
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER2_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER2_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -236,7 +236,7 @@ public static EList<FamilyHistoryObservation2> getConsolFamilyHistoryObservation
 		@SuppressWarnings("unchecked")
 		Collection<FamilyHistoryObservation2> result = (Collection<FamilyHistoryObservation2>) query.evaluate(
 			familyHistoryOrganizer2);
-		return new BasicEList.UnmodifiableEList<FamilyHistoryObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -258,7 +258,7 @@ public static EList<FamilyHistoryObservation2> getConsolFamilyHistoryObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER_FAMILY_HISTORY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER_FAMILY_HISTORY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryOrganizerOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryOrganizerOperations.java
index 68350727f5..ca8b20844f 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryOrganizerOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistoryOrganizerOperations.java
@@ -101,7 +101,7 @@ protected FamilyHistoryOrganizerOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -168,7 +168,7 @@ public static boolean validateFamilyHistoryOrganizerTemplateId(FamilyHistoryOrga
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -235,7 +235,7 @@ public static boolean validateFamilyHistoryOrganizerClassCode(FamilyHistoryOrgan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -302,7 +302,7 @@ public static boolean validateFamilyHistoryOrganizerMoodCode(FamilyHistoryOrgani
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -352,7 +352,7 @@ public static boolean validateFamilyHistoryOrganizerStatusCodeP(FamilyHistoryOrg
 					"org.openhealthtools.mdht.uml.cda.consol.FamilyHistoryOrganizerStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.FamilyHistoryOrganizerStatusCodeP", passToken);
 				}
 				passToken.add(familyHistoryOrganizer);
@@ -383,7 +383,7 @@ public static boolean validateFamilyHistoryOrganizerStatusCodeP(FamilyHistoryOrg
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -458,7 +458,7 @@ public static boolean validateFamilyHistoryOrganizerStatusCode(FamilyHistoryOrga
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER_FAMILY_HISTORY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER_FAMILY_HISTORY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -527,7 +527,7 @@ public static boolean validateFamilyHistoryOrganizerFamilyHistoryObservation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -595,7 +595,7 @@ public static boolean validateFamilyHistoryOrganizerSubject(FamilyHistoryOrganiz
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_SUBJECT_PERSON_ADMINISTRATIVE_GENDER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_SUBJECT_PERSON_ADMINISTRATIVE_GENDER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -671,7 +671,7 @@ public static boolean validateFamilyHistoryOrganizerSubjectRelatedSubjectSubject
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_SUBJECT_PERSON_ADMINISTRATIVE_GENDER_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_SUBJECT_PERSON_ADMINISTRATIVE_GENDER_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -747,7 +747,7 @@ public static boolean validateFamilyHistoryOrganizerSubjectRelatedSubjectSubject
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_SUBJECT_PERSON_BIRTH_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_SUBJECT_PERSON_BIRTH_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -822,7 +822,7 @@ public static boolean validateFamilyHistoryOrganizerSubjectRelatedSubjectSubject
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_SUBJECT_PERSON_SDTC_DECEASED_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_SUBJECT_PERSON_SDTC_DECEASED_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -897,7 +897,7 @@ public static boolean validateFamilyHistoryOrganizerSubjectRelatedSubjectSubject
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_SUBJECT_PERSON_SDTC_DECEASED_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_SUBJECT_PERSON_SDTC_DECEASED_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -972,7 +972,7 @@ public static boolean validateFamilyHistoryOrganizerSubjectRelatedSubjectSubject
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_SUBJECT_PERSON_SDTC_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_SUBJECT_PERSON_SDTC_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1046,7 +1046,7 @@ public static boolean validateFamilyHistoryOrganizerSubjectRelatedSubjectSubject
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1122,7 +1122,7 @@ public static boolean validateFamilyHistoryOrganizerSubjectRelatedSubjectClassCo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1196,7 +1196,7 @@ public static boolean validateFamilyHistoryOrganizerSubjectRelatedSubjectCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1270,7 +1270,7 @@ public static boolean validateFamilyHistoryOrganizerSubjectRelatedSubjectCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_SUBJECT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT_SUBJECT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1344,7 +1344,7 @@ public static boolean validateFamilyHistoryOrganizerSubjectRelatedSubjectSubject
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FAMILY_HISTORY_ORGANIZER_SUBJECT_RELATED_SUBJECT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1445,7 +1445,7 @@ public static EList<FamilyHistoryObservation> getFamilyHistoryObservations(
 		@SuppressWarnings("unchecked")
 		Collection<FamilyHistoryObservation> result = (Collection<FamilyHistoryObservation>) query.evaluate(
 			familyHistoryOrganizer);
-		return new BasicEList.UnmodifiableEList<FamilyHistoryObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // FamilyHistoryOrganizerOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistorySection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistorySection2Operations.java
index 7e5249efc3..fbd8443b83 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistorySection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistorySection2Operations.java
@@ -74,7 +74,7 @@ protected FamilyHistorySection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -169,7 +169,7 @@ public static EList<FamilyHistoryOrganizer2> getConsolFamilyHistoryOrganizer2s(
 		@SuppressWarnings("unchecked")
 		Collection<FamilyHistoryOrganizer2> result = (Collection<FamilyHistoryOrganizer2>) query.evaluate(
 			familyHistorySection2);
-		return new BasicEList.UnmodifiableEList<FamilyHistoryOrganizer2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -191,7 +191,7 @@ public static EList<FamilyHistoryOrganizer2> getConsolFamilyHistoryOrganizer2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_SECTION_FAMILY_HISTORY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_SECTION_FAMILY_HISTORY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistorySectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistorySectionOperations.java
index 32634ed737..c2502b8a25 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistorySectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FamilyHistorySectionOperations.java
@@ -87,7 +87,7 @@ protected FamilyHistorySectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -156,7 +156,7 @@ public static boolean validateFamilyHistorySectionTemplateId(FamilyHistorySectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateFamilyHistorySectionCode(FamilyHistorySection fami
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -286,7 +286,7 @@ public static boolean validateFamilyHistorySectionCodeP(FamilyHistorySection fam
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -351,7 +351,7 @@ public static boolean validateFamilyHistorySectionTitle(FamilyHistorySection fam
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -416,7 +416,7 @@ public static boolean validateFamilyHistorySectionText(FamilyHistorySection fami
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_SECTION_FAMILY_HISTORY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FAMILY_HISTORY_SECTION_FAMILY_HISTORY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -509,7 +509,7 @@ public static EList<FamilyHistoryOrganizer> getFamilyHistories(FamilyHistorySect
 		@SuppressWarnings("unchecked")
 		Collection<FamilyHistoryOrganizer> result = (Collection<FamilyHistoryOrganizer>) query.evaluate(
 			familyHistorySection);
-		return new BasicEList.UnmodifiableEList<FamilyHistoryOrganizer>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // FamilyHistorySectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FetusSubjectContextOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FetusSubjectContextOperations.java
index 8da5afc9d9..53381ec850 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FetusSubjectContextOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FetusSubjectContextOperations.java
@@ -73,7 +73,7 @@ protected FetusSubjectContextOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FETUS_SUBJECT_CONTEXT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FETUS_SUBJECT_CONTEXT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -141,7 +141,7 @@ public static boolean validateFetusSubjectContextTemplateId(FetusSubjectContext
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FETUS_SUBJECT_CONTEXT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FETUS_SUBJECT_CONTEXT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -206,7 +206,7 @@ public static boolean validateFetusSubjectContextCode(FetusSubjectContext fetusS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FETUS_SUBJECT_CONTEXT_SUBJECT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FETUS_SUBJECT_CONTEXT_SUBJECT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FindingsSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FindingsSectionOperations.java
index f52f6844bc..2d47aed789 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FindingsSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FindingsSectionOperations.java
@@ -75,7 +75,7 @@ protected FindingsSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FINDINGS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FINDINGS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusObservation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusObservation2Operations.java
index 5a7ee7c142..bdefd22e81 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusObservation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusObservation2Operations.java
@@ -91,7 +91,7 @@ protected FunctionalStatusObservation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -330,7 +330,7 @@ public static boolean validateResultObservationTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #getConsolNonMedicinalSupplyActivity2(FunctionalStatusObservation2) <em>Get Consol Non Medicinal Supply Activity2</em>}' operation.
@@ -371,7 +371,7 @@ public static boolean validateResultObservationTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateResultObservationTextReferenceValue(FunctionalStatusObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Result Observation Text Reference Value</em>}' operation.
@@ -392,7 +392,7 @@ public static boolean validateResultObservationTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateResultObservationCodeP(FunctionalStatusObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Result Observation Code P</em>}' operation.
@@ -413,7 +413,7 @@ public static boolean validateResultObservationTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -461,7 +461,7 @@ public static boolean validateResultObservationCodeP(FunctionalStatusObservation
 					"org.openhealthtools.mdht.uml.cda.consol.ResultObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ResultObservationCodeP", passToken);
 				}
 				passToken.add(functionalStatusObservation2);
@@ -493,7 +493,7 @@ public static boolean validateResultObservationCodeP(FunctionalStatusObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -567,7 +567,7 @@ public static boolean validateResultObservationCode(FunctionalStatusObservation2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -632,7 +632,7 @@ public static boolean validateResultObservationText(FunctionalStatusObservation2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_INTERPRETATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_INTERPRETATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -701,7 +701,7 @@ public static boolean validateResultObservationInterpretationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -767,7 +767,7 @@ public static boolean validateResultObservationMethodCode(FunctionalStatusObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -835,7 +835,7 @@ public static boolean validateResultObservationTargetSiteCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -905,7 +905,7 @@ public static boolean validateFunctionalStatusResultObservationReferenceRange(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -975,7 +975,7 @@ public static boolean validateFunctionalStatusResultObservationAuthor(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1045,7 +1045,7 @@ public static boolean validateFunctionalStatusResultObservationNonMedicinalSuppl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE_NO_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE_NO_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1122,7 +1122,7 @@ public static boolean validateFunctionalStatusResultObservationReferenceRangeObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusOrganizer2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusOrganizer2Operations.java
index 595c9f0de7..7f29e3acea 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusOrganizer2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusOrganizer2Operations.java
@@ -86,7 +86,7 @@ protected FunctionalStatusOrganizer2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_ORGANIZER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_ORGANIZER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -155,7 +155,7 @@ public static boolean validateFunctionalStatusOrganizer2TemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_ORGANIZER2_SELF_CARE_ACTIVITIES__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_ORGANIZER2_SELF_CARE_ACTIVITIES__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -225,7 +225,7 @@ public static boolean validateFunctionalStatusOrganizer2SelfCareActivities(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_ORGANIZER2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_ORGANIZER2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -323,7 +323,7 @@ public static EList<FunctionalStatusObservation2> getConsolFunctionalStatusObser
 		@SuppressWarnings("unchecked")
 		Collection<FunctionalStatusObservation2> result = (Collection<FunctionalStatusObservation2>) query.evaluate(
 			functionalStatusOrganizer2);
-		return new BasicEList.UnmodifiableEList<FunctionalStatusObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -372,7 +372,7 @@ public static EList<SelfCareActivities> getSelfCareActivitiess(
 		@SuppressWarnings("unchecked")
 		Collection<SelfCareActivities> result = (Collection<SelfCareActivities>) query.evaluate(
 			functionalStatusOrganizer2);
-		return new BasicEList.UnmodifiableEList<SelfCareActivities>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -394,7 +394,7 @@ public static EList<SelfCareActivities> getSelfCareActivitiess(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CODE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CODE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -460,7 +460,7 @@ public static boolean validateResultOrganizerCodeValue(FunctionalStatusOrganizer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -525,7 +525,7 @@ public static boolean validateResultOrganizerCode(FunctionalStatusOrganizer2 fun
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -574,7 +574,7 @@ public static boolean validateResultOrganizerStatusCodeP(FunctionalStatusOrganiz
 					"org.openhealthtools.mdht.uml.cda.consol.ResultOrganizerStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ResultOrganizerStatusCodeP", passToken);
 				}
 				passToken.add(functionalStatusOrganizer2);
@@ -605,7 +605,7 @@ public static boolean validateResultOrganizerStatusCodeP(FunctionalStatusOrganiz
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -679,7 +679,7 @@ public static boolean validateResultOrganizerStatusCode(FunctionalStatusOrganize
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_ORGANIZER_FUNCTIONAL_STATUS_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_ORGANIZER_FUNCTIONAL_STATUS_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusProblemObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusProblemObservationOperations.java
index d5f9d73022..5d79c87732 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusProblemObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusProblemObservationOperations.java
@@ -102,7 +102,7 @@ protected FunctionalStatusProblemObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_PROBLEM_OBSERVATION_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_PROBLEM_OBSERVATION_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -172,7 +172,7 @@ public static boolean validateFunctionalStatusProblemObservationMethodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_PROBLEM_OBSERVATION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_PROBLEM_OBSERVATION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -243,7 +243,7 @@ public static boolean validateFunctionalStatusProblemObservationNonMedicinalSupp
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_PROBLEM_OBSERVATION_CAREGIVER_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_PROBLEM_OBSERVATION_CAREGIVER_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -314,7 +314,7 @@ public static boolean validateFunctionalStatusProblemObservationCaregiverCharact
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_PROBLEM_OBSERVATION_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_PROBLEM_OBSERVATION_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -413,7 +413,7 @@ public static EList<NonMedicinalSupplyActivity> getNonMedicinalSupplyActivities(
 		@SuppressWarnings("unchecked")
 		Collection<NonMedicinalSupplyActivity> result = (Collection<NonMedicinalSupplyActivity>) query.evaluate(
 			functionalStatusProblemObservation);
-		return new BasicEList.UnmodifiableEList<NonMedicinalSupplyActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -462,7 +462,7 @@ public static EList<CaregiverCharacteristics> getCaregiverCharacteristicss(
 		@SuppressWarnings("unchecked")
 		Collection<CaregiverCharacteristics> result = (Collection<CaregiverCharacteristics>) query.evaluate(
 			functionalStatusProblemObservation);
-		return new BasicEList.UnmodifiableEList<CaregiverCharacteristics>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -512,7 +512,7 @@ public static EList<AssessmentScaleObservation> getAssessmentScaleObservations(
 		@SuppressWarnings("unchecked")
 		Collection<AssessmentScaleObservation> result = (Collection<AssessmentScaleObservation>) query.evaluate(
 			functionalStatusProblemObservation);
-		return new BasicEList.UnmodifiableEList<AssessmentScaleObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -534,7 +534,7 @@ public static EList<AssessmentScaleObservation> getAssessmentScaleObservations(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -604,7 +604,7 @@ public static boolean validateProblemObservationHasTextReference(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -674,7 +674,7 @@ public static boolean validateProblemObservationTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -744,7 +744,7 @@ public static boolean validateProblemObservationHasTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_ONSET_DATE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_ONSET_DATE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -813,7 +813,7 @@ public static boolean validateProblemObservationHasOnsetDate(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_RESOLUTION_DATE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_RESOLUTION_DATE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -883,7 +883,7 @@ public static boolean validateProblemObservationHasResolutionDate(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -952,7 +952,7 @@ public static boolean validateProblemObservationValueNullFlavor(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1020,7 +1020,7 @@ public static boolean validateProblemObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1088,7 +1088,7 @@ public static boolean validateProblemObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1155,7 +1155,7 @@ public static boolean validateProblemObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_NEGATION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_NEGATION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1223,7 +1223,7 @@ public static boolean validateProblemObservationNegationInd(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1289,7 +1289,7 @@ public static boolean validateProblemObservationId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1339,7 +1339,7 @@ public static boolean validateProblemObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ProblemObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ProblemObservationCodeP", passToken);
 				}
 				passToken.add(functionalStatusProblemObservation);
@@ -1371,7 +1371,7 @@ public static boolean validateProblemObservationCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1446,7 +1446,7 @@ public static boolean validateProblemObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1513,7 +1513,7 @@ public static boolean validateProblemObservationText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1581,7 +1581,7 @@ public static boolean validateProblemObservationStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1651,7 +1651,7 @@ public static boolean validateProblemObservationEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1701,7 +1701,7 @@ public static boolean validateProblemObservationValueP(
 					"org.openhealthtools.mdht.uml.cda.consol.ProblemObservationValueP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ProblemObservationValueP", passToken);
 				}
 				passToken.add(functionalStatusProblemObservation);
@@ -1733,7 +1733,7 @@ public static boolean validateProblemObservationValueP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusResultObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusResultObservationOperations.java
index cf77f29d5d..cd77d1a38f 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusResultObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusResultObservationOperations.java
@@ -104,7 +104,7 @@ protected FunctionalStatusResultObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_VALUE_DATATYPE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_VALUE_DATATYPE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -174,7 +174,7 @@ public static boolean validateFunctionalStatusResultObservationValueDatatype(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -223,7 +223,7 @@ public static boolean validateResultObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ResultObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ResultObservationCodeP", passToken);
 				}
 				passToken.add(functionalStatusResultObservation);
@@ -253,7 +253,7 @@ public static boolean validateResultObservationCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -323,7 +323,7 @@ public static boolean validateFunctionalStatusResultObservationAuthor(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -394,7 +394,7 @@ public static boolean validateFunctionalStatusResultObservationNonMedicinalSuppl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_CAREGIVER_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_CAREGIVER_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -465,7 +465,7 @@ public static boolean validateFunctionalStatusResultObservationCaregiverCharacte
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -536,7 +536,7 @@ public static boolean validateFunctionalStatusResultObservationAssessmentScaleOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -606,7 +606,7 @@ public static boolean validateFunctionalStatusResultObservationReferenceRange(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE_NO_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE_NO_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -683,7 +683,7 @@ public static boolean validateFunctionalStatusResultObservationReferenceRangeObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_FUNCTIONAL_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -899,7 +899,7 @@ public static AssessmentScaleObservation getAssessmentScaleObservation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -967,7 +967,7 @@ public static boolean validateResultObservationTextReference(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1037,7 +1037,7 @@ public static boolean validateResultObservationTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1104,7 +1104,7 @@ public static boolean validateResultObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1171,7 +1171,7 @@ public static boolean validateResultObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1238,7 +1238,7 @@ public static boolean validateResultObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1306,7 +1306,7 @@ public static boolean validateResultObservationId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1381,7 +1381,7 @@ public static boolean validateResultObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1447,7 +1447,7 @@ public static boolean validateResultObservationText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1498,7 +1498,7 @@ public static boolean validateResultObservationStatusCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ResultObservationStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ResultObservationStatusCodeP", passToken);
 				}
 				passToken.add(functionalStatusResultObservation);
@@ -1529,7 +1529,7 @@ public static boolean validateResultObservationStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1605,7 +1605,7 @@ public static boolean validateResultObservationStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1673,7 +1673,7 @@ public static boolean validateResultObservationEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1739,7 +1739,7 @@ public static boolean validateResultObservationValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_INTERPRETATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_INTERPRETATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1809,7 +1809,7 @@ public static boolean validateResultObservationInterpretationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1876,7 +1876,7 @@ public static boolean validateResultObservationMethodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusResultOrganizerOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusResultOrganizerOperations.java
index 75233f7257..4a0edaff5d 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusResultOrganizerOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusResultOrganizerOperations.java
@@ -85,7 +85,7 @@ protected FunctionalStatusResultOrganizerOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_ORGANIZER_FUNCTIONAL_STATUS_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_RESULT_ORGANIZER_FUNCTIONAL_STATUS_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -184,7 +184,7 @@ public static EList<FunctionalStatusResultObservation> getFunctionalStatusResult
 		@SuppressWarnings("unchecked")
 		Collection<FunctionalStatusResultObservation> result = (Collection<FunctionalStatusResultObservation>) query.evaluate(
 			functionalStatusResultOrganizer);
-		return new BasicEList.UnmodifiableEList<FunctionalStatusResultObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -206,7 +206,7 @@ public static EList<FunctionalStatusResultObservation> getFunctionalStatusResult
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CODE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CODE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -273,7 +273,7 @@ public static boolean validateResultOrganizerCodeValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -340,7 +340,7 @@ public static boolean validateResultOrganizerTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -407,7 +407,7 @@ public static boolean validateResultOrganizerClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -474,7 +474,7 @@ public static boolean validateResultOrganizerMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -539,7 +539,7 @@ public static boolean validateResultOrganizerId(FunctionalStatusResultOrganizer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -604,7 +604,7 @@ public static boolean validateResultOrganizerCode(FunctionalStatusResultOrganize
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -654,7 +654,7 @@ public static boolean validateResultOrganizerStatusCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ResultOrganizerStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ResultOrganizerStatusCodeP", passToken);
 				}
 				passToken.add(functionalStatusResultOrganizer);
@@ -685,7 +685,7 @@ public static boolean validateResultOrganizerStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusSection2Operations.java
index 310feec79a..ae9f14d285 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusSection2Operations.java
@@ -104,7 +104,7 @@ protected FunctionalStatusSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -199,7 +199,7 @@ public static boolean validateFunctionalStatusSectionCodeP(FunctionalStatusSecti
 					"org.openhealthtools.mdht.uml.cda.consol.FunctionalStatusSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.FunctionalStatusSectionCodeP", passToken);
 				}
 				passToken.add(functionalStatusSection2);
@@ -334,7 +334,7 @@ public static EList<FunctionalStatusOrganizer2> getConsolFunctionalStatusOrganiz
 		@SuppressWarnings("unchecked")
 		Collection<FunctionalStatusOrganizer2> result = (Collection<FunctionalStatusOrganizer2>) query.evaluate(
 			functionalStatusSection2);
-		return new BasicEList.UnmodifiableEList<FunctionalStatusOrganizer2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -364,7 +364,7 @@ public static EList<FunctionalStatusObservation2> getConsolFunctionalStatusObser
 		@SuppressWarnings("unchecked")
 		Collection<FunctionalStatusObservation2> result = (Collection<FunctionalStatusObservation2>) query.evaluate(
 			functionalStatusSection2);
-		return new BasicEList.UnmodifiableEList<FunctionalStatusObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -394,7 +394,7 @@ public static EList<CognitiveStatusResultOrganizer> getConsolCognitiveStatusResu
 		@SuppressWarnings("unchecked")
 		Collection<CognitiveStatusResultOrganizer> result = (Collection<CognitiveStatusResultOrganizer>) query.evaluate(
 			functionalStatusSection2);
-		return new BasicEList.UnmodifiableEList<CognitiveStatusResultOrganizer>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -424,7 +424,7 @@ public static EList<CognitiveStatusResultObservation> getConsolCognitiveStatusRe
 		@SuppressWarnings("unchecked")
 		Collection<CognitiveStatusResultObservation> result = (Collection<CognitiveStatusResultObservation>) query.evaluate(
 			functionalStatusSection2);
-		return new BasicEList.UnmodifiableEList<CognitiveStatusResultObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -454,7 +454,7 @@ public static EList<NonMedicinalSupplyActivity2> getConsolNonMedicinalSupplyActi
 		@SuppressWarnings("unchecked")
 		Collection<NonMedicinalSupplyActivity2> result = (Collection<NonMedicinalSupplyActivity2>) query.evaluate(
 			functionalStatusSection2);
-		return new BasicEList.UnmodifiableEList<NonMedicinalSupplyActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -484,7 +484,7 @@ public static EList<NumberOfPressureUlcersObservation> getConsolNumberOfPressure
 		@SuppressWarnings("unchecked")
 		Collection<NumberOfPressureUlcersObservation> result = (Collection<NumberOfPressureUlcersObservation>) query.evaluate(
 			functionalStatusSection2);
-		return new BasicEList.UnmodifiableEList<NumberOfPressureUlcersObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -514,7 +514,7 @@ public static EList<HighestPressureUlcerStage> getConsolHighestPressureUlcerStag
 		@SuppressWarnings("unchecked")
 		Collection<HighestPressureUlcerStage> result = (Collection<HighestPressureUlcerStage>) query.evaluate(
 			functionalStatusSection2);
-		return new BasicEList.UnmodifiableEList<HighestPressureUlcerStage>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -542,7 +542,7 @@ public static EList<SelfCareActivities> getSelfCareActivitiess(FunctionalStatusS
 		@SuppressWarnings("unchecked")
 		Collection<SelfCareActivities> result = (Collection<SelfCareActivities>) query.evaluate(
 			functionalStatusSection2);
-		return new BasicEList.UnmodifiableEList<SelfCareActivities>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -569,7 +569,7 @@ public static EList<SensoryStatus> getSensoryAndSpeechStatuss(FunctionalStatusSe
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_SENSORY_AND_SPEECH_STATUSS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<SensoryStatus> result = (Collection<SensoryStatus>) query.evaluate(functionalStatusSection2);
-		return new BasicEList.UnmodifiableEList<SensoryStatus>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -591,7 +591,7 @@ public static EList<SensoryStatus> getSensoryAndSpeechStatuss(FunctionalStatusSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateFunctionalStatusSection2SelfCareActivities(FunctionalStatusSection2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Functional Status Section2 Self Care Activities</em>}' operation.
@@ -612,7 +612,7 @@ public static EList<SensoryStatus> getSensoryAndSpeechStatuss(FunctionalStatusSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION2_SELF_CARE_ACTIVITIES__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION2_SELF_CARE_ACTIVITIES__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateFunctionalStatusSection2SensoryAndSpeechStatus(FunctionalStatusSection2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Functional Status Section2 Sensory And Speech Status</em>}' operation.
@@ -633,7 +633,7 @@ public static EList<SensoryStatus> getSensoryAndSpeechStatuss(FunctionalStatusSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION2_SENSORY_AND_SPEECH_STATUS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION2_SENSORY_AND_SPEECH_STATUS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #getConsolFunctionalStatusOrganizer2s(FunctionalStatusSection2) <em>Get Consol Functional Status Organizer2s</em>}' operation.
@@ -836,7 +836,7 @@ public static EList<SensoryStatus> getSensoryAndSpeechStatuss(FunctionalStatusSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -910,7 +910,7 @@ public static boolean validateFunctionalStatusSectionCode(FunctionalStatusSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_FUNCTIONAL_STATUS_RESULT_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_FUNCTIONAL_STATUS_RESULT_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -980,7 +980,7 @@ public static boolean validateFunctionalStatusSectionFunctionalStatusResultOrgan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_FUNCTIONAL_STATUS_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_FUNCTIONAL_STATUS_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1050,7 +1050,7 @@ public static boolean validateFunctionalStatusSectionFunctionalStatusResultObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_COGNITIVE_STATUS_RESULT_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_COGNITIVE_STATUS_RESULT_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1120,7 +1120,7 @@ public static boolean validateFunctionalStatusSectionCognitiveStatusResultOrgani
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_COGNITIVE_STATUS_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_COGNITIVE_STATUS_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1190,7 +1190,7 @@ public static boolean validateFunctionalStatusSectionCognitiveStatusResultObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1260,7 +1260,7 @@ public static boolean validateFunctionalStatusSectionNonMedicinalSupplyActivity(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1330,7 +1330,7 @@ public static boolean validateFunctionalStatusSectionNumberOfPressureUlcersObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_HIGHEST_PRESSURE_ULCER_STAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_HIGHEST_PRESSURE_ULCER_STAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusSectionOperations.java
index 0ef402dd51..45e3c1b36f 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/FunctionalStatusSectionOperations.java
@@ -119,7 +119,7 @@ protected FunctionalStatusSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -188,7 +188,7 @@ public static boolean validateFunctionalStatusSectionTemplateId(FunctionalStatus
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -254,7 +254,7 @@ public static boolean validateFunctionalStatusSectionCode(FunctionalStatusSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -320,7 +320,7 @@ public static boolean validateFunctionalStatusSectionTitle(FunctionalStatusSecti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -386,7 +386,7 @@ public static boolean validateFunctionalStatusSectionText(FunctionalStatusSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_FUNCTIONAL_STATUS_RESULT_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_FUNCTIONAL_STATUS_RESULT_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -455,7 +455,7 @@ public static boolean validateFunctionalStatusSectionFunctionalStatusResultOrgan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_COGNITIVE_STATUS_RESULT_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_COGNITIVE_STATUS_RESULT_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -524,7 +524,7 @@ public static boolean validateFunctionalStatusSectionCognitiveStatusResultOrgani
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_FUNCTIONAL_STATUS_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_FUNCTIONAL_STATUS_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -593,7 +593,7 @@ public static boolean validateFunctionalStatusSectionFunctionalStatusResultObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_COGNITIVE_STATUS_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_COGNITIVE_STATUS_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -662,7 +662,7 @@ public static boolean validateFunctionalStatusSectionCognitiveStatusResultObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_FUNCTIONAL_STATUS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_FUNCTIONAL_STATUS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -731,7 +731,7 @@ public static boolean validateFunctionalStatusSectionFunctionalStatusProblemObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_COGNITIVE_STATUS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_COGNITIVE_STATUS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -800,7 +800,7 @@ public static boolean validateFunctionalStatusSectionCognitiveStatusProblemObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_CAREGIVER_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_CAREGIVER_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -869,7 +869,7 @@ public static boolean validateFunctionalStatusSectionCaregiverCharacteristics(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -938,7 +938,7 @@ public static boolean validateFunctionalStatusSectionAssessmentScaleObservation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1007,7 +1007,7 @@ public static boolean validateFunctionalStatusSectionNonMedicinalSupplyActivity(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_PRESSURE_ULCER_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_PRESSURE_ULCER_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1076,7 +1076,7 @@ public static boolean validateFunctionalStatusSectionPressureUlcerObservation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1145,7 +1145,7 @@ public static boolean validateFunctionalStatusSectionNumberOfPressureUlcersObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_HIGHEST_PRESSURE_ULCER_STAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_FUNCTIONAL_STATUS_SECTION_HIGHEST_PRESSURE_ULCER_STAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1242,7 +1242,7 @@ public static EList<FunctionalStatusResultOrganizer> getFunctionalStatusResultOr
 		@SuppressWarnings("unchecked")
 		Collection<FunctionalStatusResultOrganizer> result = (Collection<FunctionalStatusResultOrganizer>) query.evaluate(
 			functionalStatusSection);
-		return new BasicEList.UnmodifiableEList<FunctionalStatusResultOrganizer>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1292,7 +1292,7 @@ public static EList<CognitiveStatusResultOrganizer> getCognitiveStatusResultOrga
 		@SuppressWarnings("unchecked")
 		Collection<CognitiveStatusResultOrganizer> result = (Collection<CognitiveStatusResultOrganizer>) query.evaluate(
 			functionalStatusSection);
-		return new BasicEList.UnmodifiableEList<CognitiveStatusResultOrganizer>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1342,7 +1342,7 @@ public static EList<FunctionalStatusResultObservation> getFunctionalStatusResult
 		@SuppressWarnings("unchecked")
 		Collection<FunctionalStatusResultObservation> result = (Collection<FunctionalStatusResultObservation>) query.evaluate(
 			functionalStatusSection);
-		return new BasicEList.UnmodifiableEList<FunctionalStatusResultObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1392,7 +1392,7 @@ public static EList<CognitiveStatusResultObservation> getCognitiveStatusResultOb
 		@SuppressWarnings("unchecked")
 		Collection<CognitiveStatusResultObservation> result = (Collection<CognitiveStatusResultObservation>) query.evaluate(
 			functionalStatusSection);
-		return new BasicEList.UnmodifiableEList<CognitiveStatusResultObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1442,7 +1442,7 @@ public static EList<FunctionalStatusProblemObservation> getFunctionalStatusProbl
 		@SuppressWarnings("unchecked")
 		Collection<FunctionalStatusProblemObservation> result = (Collection<FunctionalStatusProblemObservation>) query.evaluate(
 			functionalStatusSection);
-		return new BasicEList.UnmodifiableEList<FunctionalStatusProblemObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1492,7 +1492,7 @@ public static EList<CognitiveStatusProblemObservation> getCognitiveStatusProblem
 		@SuppressWarnings("unchecked")
 		Collection<CognitiveStatusProblemObservation> result = (Collection<CognitiveStatusProblemObservation>) query.evaluate(
 			functionalStatusSection);
-		return new BasicEList.UnmodifiableEList<CognitiveStatusProblemObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1541,7 +1541,7 @@ public static EList<CaregiverCharacteristics> getCaregiverCharacteristicss(
 		@SuppressWarnings("unchecked")
 		Collection<CaregiverCharacteristics> result = (Collection<CaregiverCharacteristics>) query.evaluate(
 			functionalStatusSection);
-		return new BasicEList.UnmodifiableEList<CaregiverCharacteristics>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1591,7 +1591,7 @@ public static EList<AssessmentScaleObservation> getAssessmentScaleObservations(
 		@SuppressWarnings("unchecked")
 		Collection<AssessmentScaleObservation> result = (Collection<AssessmentScaleObservation>) query.evaluate(
 			functionalStatusSection);
-		return new BasicEList.UnmodifiableEList<AssessmentScaleObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1641,7 +1641,7 @@ public static EList<NonMedicinalSupplyActivity> getNonMedicinalSupplyActivities(
 		@SuppressWarnings("unchecked")
 		Collection<NonMedicinalSupplyActivity> result = (Collection<NonMedicinalSupplyActivity>) query.evaluate(
 			functionalStatusSection);
-		return new BasicEList.UnmodifiableEList<NonMedicinalSupplyActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1691,7 +1691,7 @@ public static EList<PressureUlcerObservation> getPressureUlcerObservations(
 		@SuppressWarnings("unchecked")
 		Collection<PressureUlcerObservation> result = (Collection<PressureUlcerObservation>) query.evaluate(
 			functionalStatusSection);
-		return new BasicEList.UnmodifiableEList<PressureUlcerObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1741,7 +1741,7 @@ public static EList<NumberOfPressureUlcersObservation> getNumberOfPressureUlcers
 		@SuppressWarnings("unchecked")
 		Collection<NumberOfPressureUlcersObservation> result = (Collection<NumberOfPressureUlcersObservation>) query.evaluate(
 			functionalStatusSection);
-		return new BasicEList.UnmodifiableEList<NumberOfPressureUlcersObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1791,7 +1791,7 @@ public static EList<HighestPressureUlcerStage> getHighestPressureUlcerStages(
 		@SuppressWarnings("unchecked")
 		Collection<HighestPressureUlcerStage> result = (Collection<HighestPressureUlcerStage>) query.evaluate(
 			functionalStatusSection);
-		return new BasicEList.UnmodifiableEList<HighestPressureUlcerStage>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // FunctionalStatusSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/GeneralHeaderConstraintsOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/GeneralHeaderConstraintsOperations.java
index ade01f8b62..d698c58ad1 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/GeneralHeaderConstraintsOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/GeneralHeaderConstraintsOperations.java
@@ -379,7 +379,7 @@ protected GeneralHeaderConstraintsOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TYPE_ID_ROOT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TYPE_ID_ROOT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -446,7 +446,7 @@ public static boolean validateGeneralHeaderConstraintsTypeIdRoot(GeneralHeaderCo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TYPE_ID_EXTENSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TYPE_ID_EXTENSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -515,7 +515,7 @@ public static boolean validateGeneralHeaderConstraintsTypeIdExtension(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_SET_ID_VERSION_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_SET_ID_VERSION_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -584,7 +584,7 @@ public static boolean validateGeneralHeaderConstraintsSetIdVersionNumber(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_VERSION_NUMBER_SET_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_VERSION_NUMBER_SET_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -653,7 +653,7 @@ public static boolean validateGeneralHeaderConstraintsVersionNumberSetId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -721,7 +721,7 @@ public static boolean validateGeneralHeaderConstraintsTemplateId(GeneralHeaderCo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_REALM_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_REALM_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -788,7 +788,7 @@ public static boolean validateGeneralHeaderConstraintsRealmCode(GeneralHeaderCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TYPE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TYPE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -855,7 +855,7 @@ public static boolean validateGeneralHeaderConstraintsTypeId(GeneralHeaderConstr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -921,7 +921,7 @@ public static boolean validateGeneralHeaderConstraintsId(GeneralHeaderConstraint
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -987,7 +987,7 @@ public static boolean validateGeneralHeaderConstraintsCode(GeneralHeaderConstrai
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1053,7 +1053,7 @@ public static boolean validateGeneralHeaderConstraintsTitle(GeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1122,7 +1122,7 @@ public static boolean validateGeneralHeaderConstraintsEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CONFIDENTIALITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CONFIDENTIALITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1175,7 +1175,7 @@ public static boolean validateGeneralHeaderConstraintsConfidentialityCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsConfidentialityCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsConfidentialityCodeP",
 						passToken);
@@ -1209,7 +1209,7 @@ public static boolean validateGeneralHeaderConstraintsConfidentialityCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CONFIDENTIALITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CONFIDENTIALITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1289,7 +1289,7 @@ public static boolean validateGeneralHeaderConstraintsConfidentialityCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LANGUAGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LANGUAGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1357,7 +1357,7 @@ public static boolean validateGeneralHeaderConstraintsLanguageCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LANGUAGE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LANGUAGE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1426,7 +1426,7 @@ public static boolean validateGeneralHeaderConstraintsLanguageCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_SET_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_SET_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1492,7 +1492,7 @@ public static boolean validateGeneralHeaderConstraintsSetId(GeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_VERSION_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_VERSION_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1561,7 +1561,7 @@ public static boolean validateGeneralHeaderConstraintsVersionNumber(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1627,7 +1627,7 @@ public static boolean validateGeneralHeaderConstraintsAuthor(GeneralHeaderConstr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1694,7 +1694,7 @@ public static boolean validateGeneralHeaderConstraintsDataEnterer(GeneralHeaderC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1761,7 +1761,7 @@ public static boolean validateGeneralHeaderConstraintsCustodian(GeneralHeaderCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1831,7 +1831,7 @@ public static boolean validateGeneralHeaderConstraintsInformationRecipient(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1901,7 +1901,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticator(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1970,7 +1970,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticator(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2038,7 +2038,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTarget(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2105,7 +2105,7 @@ public static boolean validateGeneralHeaderConstraintsComponentOf(GeneralHeaderC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2172,7 +2172,7 @@ public static boolean validateGeneralHeaderConstraintsInformant(GeneralHeaderCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_SUPPORT_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_SUPPORT_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2241,7 +2241,7 @@ public static boolean validateGeneralHeaderConstraintsSupportParticipant(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_IN_FULFILLMENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_IN_FULFILLMENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2310,7 +2310,7 @@ public static boolean validateGeneralHeaderConstraintsInFulfillmentOf(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2379,7 +2379,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOf(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHORIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHORIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2448,7 +2448,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorization(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DTM_PRECISE_TO_THE_DAY_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DTM_PRECISE_TO_THE_DAY_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2523,7 +2523,7 @@ public static boolean validateGeneralHeaderConstraintsUSRealmDateAndTimeDTMPreci
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DTM_PRECISE_TO_THE_MINUTE_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DTM_PRECISE_TO_THE_MINUTE_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2599,7 +2599,7 @@ public static boolean validateGeneralHeaderConstraintsUSRealmDateAndTimeDTMPreci
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DTM_PRECISE_TO_THE_SECOND_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DTM_PRECISE_TO_THE_SECOND_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2675,7 +2675,7 @@ public static boolean validateGeneralHeaderConstraintsUSRealmDateAndTimeDTMPreci
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DTM_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DTM_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2752,7 +2752,7 @@ public static boolean validateGeneralHeaderConstraintsUSRealmDateAndTimeDTMIfMor
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2829,7 +2829,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRoleGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2906,7 +2906,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRoleGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3041,7 +3041,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRoleGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRoleGeneralHeaderConstraintsUSRealmAddressUseP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role General Header Constraints US Realm Address Use P</em>}' operation.
@@ -3062,7 +3062,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRoleGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3139,7 +3139,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRoleGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3216,7 +3216,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRoleGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3293,7 +3293,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRoleGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3370,7 +3370,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRoleGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3447,7 +3447,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRoleGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3524,7 +3524,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRoleGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_TEL_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_TEL_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3765,7 +3765,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GENERAL_HEADER_CONSTRAINTS_US_REALM_PATIENT_NAME_US_REALM_PATIENT_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GENERAL_HEADER_CONSTRAINTS_US_REALM_PATIENT_NAME_US_REALM_PATIENT_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4124,7 +4124,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GENERAL_HEADER_CONSTRAINTS_US_REALM_PATIENT_NAME_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GENERAL_HEADER_CONSTRAINTS_US_REALM_PATIENT_NAME_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameUseP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient General Header Constraints US Realm Patient Name Use P</em>}' operation.
@@ -4145,7 +4145,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GENERAL_HEADER_CONSTRAINTS_US_REALM_PATIENT_NAME_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GENERAL_HEADER_CONSTRAINTS_US_REALM_PATIENT_NAME_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameFamily(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient General Header Constraints US Realm Patient Name Family</em>}' operation.
@@ -4166,7 +4166,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GENERAL_HEADER_CONSTRAINTS_US_REALM_PATIENT_NAME_FAMILY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GENERAL_HEADER_CONSTRAINTS_US_REALM_PATIENT_NAME_FAMILY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameGiven(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient General Header Constraints US Realm Patient Name Given</em>}' operation.
@@ -4187,7 +4187,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GENERAL_HEADER_CONSTRAINTS_US_REALM_PATIENT_NAME_GIVEN__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GENERAL_HEADER_CONSTRAINTS_US_REALM_PATIENT_NAME_GIVEN__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNamePrefix(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient General Header Constraints US Realm Patient Name Prefix</em>}' operation.
@@ -4208,7 +4208,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GENERAL_HEADER_CONSTRAINTS_US_REALM_PATIENT_NAME_PREFIX__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GENERAL_HEADER_CONSTRAINTS_US_REALM_PATIENT_NAME_PREFIX__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientGeneralHeaderConstraintsUSRealmPatientNameSuffix(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient General Header Constraints US Realm Patient Name Suffix</em>}' operation.
@@ -4229,7 +4229,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GENERAL_HEADER_CONSTRAINTS_US_REALM_PATIENT_NAME_SUFFIX__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GENERAL_HEADER_CONSTRAINTS_US_REALM_PATIENT_NAME_SUFFIX__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToYear(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient TS Birth Time Precise To Year</em>}' operation.
@@ -4250,7 +4250,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_TS_BIRTH_TIME_PRECISE_TO_YEAR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_TS_BIRTH_TIME_PRECISE_TO_YEAR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToDay(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient TS Birth Time Precise To Day</em>}' operation.
@@ -4271,7 +4271,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_TS_BIRTH_TIME_PRECISE_TO_DAY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_TS_BIRTH_TIME_PRECISE_TO_DAY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientTSValue(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient TS Value</em>}' operation.
@@ -4292,7 +4292,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_TS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_TS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4369,7 +4369,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4446,7 +4446,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4523,7 +4523,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4658,7 +4658,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianGeneralHeaderConstraintsUSRealmAddressUseP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Guardian General Header Constraints US Realm Address Use P</em>}' operation.
@@ -4679,7 +4679,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4756,7 +4756,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4833,7 +4833,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4910,7 +4910,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4987,7 +4987,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5064,7 +5064,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5141,7 +5141,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_TEL_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_TEL_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5217,7 +5217,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5294,7 +5294,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5372,7 +5372,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_CODE_FROM_PERSONAL_RELATIONSHIP_OR_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_CODE_FROM_PERSONAL_RELATIONSHIP_OR_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5504,7 +5504,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianAddr(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Guardian Addr</em>}' operation.
@@ -5525,7 +5525,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5601,7 +5601,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5677,7 +5677,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GUARDIAN_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_GUARDIAN_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5754,7 +5754,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_BIRTHPLACE_PLACE_HAS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_BIRTHPLACE_PLACE_HAS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5831,7 +5831,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_BIRTHPLACE_PLACE_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_BIRTHPLACE_PLACE_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5908,7 +5908,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_BIRTHPLACE_PLACE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_BIRTHPLACE_PLACE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6077,7 +6077,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationProficiencyLevelCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationProficiencyLevelCodeP",
 							passToken);
@@ -6213,7 +6213,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationModeCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationModeCodeP",
 							passToken);
@@ -6314,7 +6314,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_LANGUAGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_LANGUAGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6391,7 +6391,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_LANGUAGE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_LANGUAGE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationModeCodeP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Language Communication Mode Code P</em>}' operation.
@@ -6412,7 +6412,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_MODE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_MODE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationModeCode(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Language Communication Mode Code</em>}' operation.
@@ -6435,7 +6435,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_MODE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_MODE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationProficiencyLevelCodeP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Language Communication Proficiency Level Code P</em>}' operation.
@@ -6456,7 +6456,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_PROFICIENCY_LEVEL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_PROFICIENCY_LEVEL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationProficiencyLevelCode(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Language Communication Proficiency Level Code</em>}' operation.
@@ -6479,7 +6479,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_PROFICIENCY_LEVEL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_PROFICIENCY_LEVEL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationPreferenceInd(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Language Communication Preference Ind</em>}' operation.
@@ -6500,7 +6500,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_PREFERENCE_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_PREFERENCE_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6577,7 +6577,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_IF_SDTC_ENFORCE_RACE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_IF_SDTC_ENFORCE_RACE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6801,7 +6801,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCodeP",
 							passToken);
@@ -6935,7 +6935,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsRecordTargetPatientRolePatientMaritalStatusCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsRecordTargetPatientRolePatientMaritalStatusCodeP",
 							passToken);
@@ -7033,7 +7033,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -7110,7 +7110,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_ADMINISTRATIVE_GENDER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_ADMINISTRATIVE_GENDER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientBirthTime(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Birth Time</em>}' operation.
@@ -7131,7 +7131,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_BIRTH_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_BIRTH_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientMaritalStatusCodeP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Marital Status Code P</em>}' operation.
@@ -7152,7 +7152,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_MARITAL_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_MARITAL_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientMaritalStatusCode(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Marital Status Code</em>}' operation.
@@ -7175,7 +7175,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_MARITAL_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_MARITAL_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -7232,7 +7232,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCodeP",
 							passToken);
@@ -7329,7 +7329,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_RELIGIOUS_AFFILIATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_RELIGIOUS_AFFILIATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -7387,7 +7387,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsRecordTargetPatientRolePatientReligiousAffiliationCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsRecordTargetPatientRolePatientReligiousAffiliationCodeP",
 							passToken);
@@ -7422,7 +7422,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_RELIGIOUS_AFFILIATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_RELIGIOUS_AFFILIATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCodeP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Race Code P</em>}' operation.
@@ -7443,7 +7443,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_RACE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_RACE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCode(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Race Code</em>}' operation.
@@ -7466,7 +7466,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_RACE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_RACE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -7553,7 +7553,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_SDTC_RACE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_SDTC_RACE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -7610,7 +7610,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsRecordTargetPatientRolePatientSDTCRaceCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsRecordTargetPatientRolePatientSDTCRaceCodeP",
 							passToken);
@@ -7645,7 +7645,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_SDTC_RACE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_SDTC_RACE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCodeP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Ethnic Group Code P</em>}' operation.
@@ -7666,7 +7666,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_ETHNIC_GROUP_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_ETHNIC_GROUP_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCode(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Ethnic Group Code</em>}' operation.
@@ -7689,7 +7689,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_ETHNIC_GROUP_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_ETHNIC_GROUP_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -7775,7 +7775,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -7850,7 +7850,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_BIRTHPLACE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_BIRTHPLACE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -7926,7 +7926,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -8563,7 +8563,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_TEL_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_TEL_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Provider Organization General Header Constraints US Realm Address US Realm Address Street</em>}' operation.
@@ -8584,7 +8584,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Provider Organization General Header Constraints US Realm Address If Country Is Us Require State Element</em>}' operation.
@@ -8605,7 +8605,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Provider Organization General Header Constraints US Realm Address If Country Is Us Require Postal Code Element</em>}' operation.
@@ -8626,7 +8626,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressUse(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Provider Organization General Header Constraints US Realm Address Use</em>}' operation.
@@ -8649,7 +8649,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressUseP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Provider Organization General Header Constraints US Realm Address Use P</em>}' operation.
@@ -8670,7 +8670,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressCountry(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Provider Organization General Header Constraints US Realm Address Country</em>}' operation.
@@ -8691,7 +8691,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressState(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Provider Organization General Header Constraints US Realm Address State</em>}' operation.
@@ -8712,7 +8712,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressCity(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Provider Organization General Header Constraints US Realm Address City</em>}' operation.
@@ -8733,7 +8733,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressPostalCode(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Provider Organization General Header Constraints US Realm Address Postal Code</em>}' operation.
@@ -8754,7 +8754,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationGeneralHeaderConstraintsUSRealmAddressStreetAddressLine(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Provider Organization General Header Constraints US Realm Address Street Address Line</em>}' operation.
@@ -8775,7 +8775,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -8852,7 +8852,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -8984,7 +8984,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -9060,7 +9060,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -9136,7 +9136,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRoleProviderOrganizationAddr(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Provider Organization Addr</em>}' operation.
@@ -9157,7 +9157,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -9288,7 +9288,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRoleAdd
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRoleAddr(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Addr</em>}' operation.
@@ -9309,7 +9309,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRoleAdd
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -9384,7 +9384,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRoleId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -9459,7 +9459,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRoleTel
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -9534,7 +9534,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -9610,7 +9610,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -9740,7 +9740,7 @@ public static boolean validateGeneralHeaderConstraintsComponentOfEncompassingEnc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsComponentOfEncompassingEncounterEffectiveTime(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Component Of Encompassing Encounter Effective Time</em>}' operation.
@@ -9761,7 +9761,7 @@ public static boolean validateGeneralHeaderConstraintsComponentOfEncompassingEnc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -9836,7 +9836,7 @@ public static boolean validateGeneralHeaderConstraintsComponentOfEncompassingEnc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -9911,7 +9911,7 @@ public static boolean validateGeneralHeaderConstraintsComponentOfEncompassingEnc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DTM_PRECISE_TO_THE_DAY_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DTM_PRECISE_TO_THE_DAY_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -9988,7 +9988,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorGeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DTM_PRECISE_TO_THE_MINUTE_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DTM_PRECISE_TO_THE_MINUTE_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -10065,7 +10065,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorGeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DTM_PRECISE_TO_THE_SECOND_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DTM_PRECISE_TO_THE_SECOND_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -10142,7 +10142,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorGeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DTM_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DTM_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -10219,7 +10219,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorGeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -10296,7 +10296,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorGenera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -10373,7 +10373,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorGenera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -10508,7 +10508,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorGenera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsAuthorAssignedAuthorGeneralHeaderConstraintsUSRealmAddressUseP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Author Assigned Author General Header Constraints US Realm Address Use P</em>}' operation.
@@ -10529,7 +10529,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorGenera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -10606,7 +10606,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorGenera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -10683,7 +10683,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorGenera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -10760,7 +10760,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorGenera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -10837,7 +10837,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorGenera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -10914,7 +10914,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorGenera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -10991,7 +10991,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorGenera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_TEL_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_TEL_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -11066,7 +11066,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorTELUse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_AUTHORING_DEVICE_MANUFACTURER_MODEL_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_AUTHORING_DEVICE_MANUFACTURER_MODEL_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -11143,7 +11143,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorAuthor
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_AUTHORING_DEVICE_SOFTWARE_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_AUTHORING_DEVICE_SOFTWARE_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -11219,7 +11219,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorAuthor
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -11296,7 +11296,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorPerson
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -11371,7 +11371,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorPerson
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_HAS_ONE_ASSIGNED_PERSON_OR_ONE_ASSIGNED_AUTHORING_DEVICE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_HAS_ONE_ASSIGNED_PERSON_OR_ONE_ASSIGNED_AUTHORING_DEVICE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -11448,7 +11448,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorHasOne
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -11614,7 +11614,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorCodeP(
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsAuthorAssignedAuthorCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsAuthorAssignedAuthorCodeP",
 							passToken);
@@ -11711,7 +11711,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsAuthorAssignedAuthorCodeP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Author Assigned Author Code P</em>}' operation.
@@ -11732,7 +11732,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsAuthorAssignedAuthorCode(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Author Assigned Author Code</em>}' operation.
@@ -11755,7 +11755,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsAuthorAssignedAuthorAddr(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Author Assigned Author Addr</em>}' operation.
@@ -11776,7 +11776,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -11851,7 +11851,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -11926,7 +11926,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorTeleco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -11999,7 +11999,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorTime(GeneralHeaderCo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -12074,7 +12074,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthor(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -12151,7 +12151,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityG
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -12228,7 +12228,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityG
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -12363,7 +12363,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityG
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsDataEntererAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Data Enterer Assigned Entity General Header Constraints US Realm Address Use P</em>}' operation.
@@ -12384,7 +12384,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityG
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -12461,7 +12461,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityG
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -12538,7 +12538,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityG
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -12615,7 +12615,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityG
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -12692,7 +12692,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityG
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -12769,7 +12769,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityG
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -12846,7 +12846,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityG
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_TEL_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_TEL_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -12921,7 +12921,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -12998,7 +12998,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -13073,7 +13073,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -13268,7 +13268,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -13343,7 +13343,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityI
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsDataEntererAssignedEntityCode(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Data Enterer Assigned Entity Code</em>}' operation.
@@ -13366,7 +13366,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityI
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsDataEntererAssignedEntityAddr(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Data Enterer Assigned Entity Addr</em>}' operation.
@@ -13387,7 +13387,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityI
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -13443,7 +13443,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityC
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsDataEntererAssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsDataEntererAssignedEntityCodeP",
 							passToken);
@@ -13476,7 +13476,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -13551,7 +13551,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -13627,7 +13627,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -14262,7 +14262,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_TEL_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_TEL_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Custodian Assigned Custodian Custodian Organization General Header Constraints US Realm Address US Realm Address Street</em>}' operation.
@@ -14283,7 +14283,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Custodian Assigned Custodian Custodian Organization General Header Constraints US Realm Address If Country Is Us Require State Element</em>}' operation.
@@ -14304,7 +14304,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Custodian Assigned Custodian Custodian Organization General Header Constraints US Realm Address If Country Is Us Require Postal Code Element</em>}' operation.
@@ -14325,7 +14325,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressUse(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Custodian Assigned Custodian Custodian Organization General Header Constraints US Realm Address Use</em>}' operation.
@@ -14348,7 +14348,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressUseP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Custodian Assigned Custodian Custodian Organization General Header Constraints US Realm Address Use P</em>}' operation.
@@ -14369,7 +14369,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressCountry(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Custodian Assigned Custodian Custodian Organization General Header Constraints US Realm Address Country</em>}' operation.
@@ -14390,7 +14390,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressState(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Custodian Assigned Custodian Custodian Organization General Header Constraints US Realm Address State</em>}' operation.
@@ -14411,7 +14411,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressCity(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Custodian Assigned Custodian Custodian Organization General Header Constraints US Realm Address City</em>}' operation.
@@ -14432,7 +14432,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressPostalCode(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Custodian Assigned Custodian Custodian Organization General Header Constraints US Realm Address Postal Code</em>}' operation.
@@ -14453,7 +14453,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationGeneralHeaderConstraintsUSRealmAddressStreetAddressLine(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Custodian Assigned Custodian Custodian Organization General Header Constraints US Realm Address Street Address Line</em>}' operation.
@@ -14474,7 +14474,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -14551,7 +14551,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -14684,7 +14684,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -14761,7 +14761,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -14838,7 +14838,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsCustodianAssignedCustodianCustodianOrganizationAddr(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Custodian Assigned Custodian Custodian Organization Addr</em>}' operation.
@@ -14859,7 +14859,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_CUSTODIAN_ORGANIZATION_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -14936,7 +14936,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_REPRESENTED_CUSTODIAN_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN_REPRESENTED_CUSTODIAN_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -15013,7 +15013,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN_ASSIGNED_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -15088,7 +15088,7 @@ public static boolean validateGeneralHeaderConstraintsCustodianAssignedCustodian
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -15165,7 +15165,7 @@ public static boolean validateGeneralHeaderConstraintsInformationRecipientIntend
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -15241,7 +15241,7 @@ public static boolean validateGeneralHeaderConstraintsInformationRecipientIntend
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -15318,7 +15318,7 @@ public static boolean validateGeneralHeaderConstraintsInformationRecipientIntend
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -15395,7 +15395,7 @@ public static boolean validateGeneralHeaderConstraintsInformationRecipientIntend
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_RECIEVED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_RECIEVED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -15472,7 +15472,7 @@ public static boolean validateGeneralHeaderConstraintsInformationRecipientIntend
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMATION_RECIPIENT_INTENDED_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMATION_RECIPIENT_INTENDED_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -15547,7 +15547,7 @@ public static boolean validateGeneralHeaderConstraintsInformationRecipientIntend
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -15624,7 +15624,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -15701,7 +15701,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -15836,7 +15836,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsLegalAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Legal Authenticator Assigned Entity General Header Constraints US Realm Address Use P</em>}' operation.
@@ -15857,7 +15857,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -15934,7 +15934,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -16011,7 +16011,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -16088,7 +16088,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -16165,7 +16165,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -16242,7 +16242,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -16319,7 +16319,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_TEL_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_TEL_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -16395,7 +16395,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -16472,7 +16472,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -16548,7 +16548,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -16714,7 +16714,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsLegalAuthenticatorAssignedEntityCodeP",
 							passToken);
@@ -16811,7 +16811,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsLegalAuthenticatorAssignedEntityCodeP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Legal Authenticator Assigned Entity Code P</em>}' operation.
@@ -16832,7 +16832,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsLegalAuthenticatorAssignedEntityCode(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Legal Authenticator Assigned Entity Code</em>}' operation.
@@ -16855,7 +16855,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsLegalAuthenticatorAssignedEntityAddr(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Legal Authenticator Assigned Entity Addr</em>}' operation.
@@ -16876,7 +16876,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -16951,7 +16951,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -17027,7 +17027,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -17103,7 +17103,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -17178,7 +17178,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_SIGNATURE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_SIGNATURE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -17234,7 +17234,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorSignatur
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsLegalAuthenticatorSignatureCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsLegalAuthenticatorSignatureCodeP",
 							passToken);
@@ -17268,7 +17268,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorSignatur
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_SIGNATURE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_SIGNATURE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -17353,7 +17353,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorSignatur
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -17428,7 +17428,7 @@ public static boolean validateGeneralHeaderConstraintsLegalAuthenticatorAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -17505,7 +17505,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -17582,7 +17582,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -17717,7 +17717,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsAuthenticatorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Authenticator Assigned Entity General Header Constraints US Realm Address Use P</em>}' operation.
@@ -17738,7 +17738,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -17815,7 +17815,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -17892,7 +17892,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -17969,7 +17969,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -18046,7 +18046,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -18123,7 +18123,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -18200,7 +18200,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_TEL_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_TEL_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -18275,7 +18275,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -18352,7 +18352,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -18427,7 +18427,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -18593,7 +18593,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsAuthenticatorAssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsAuthenticatorAssignedEntityCodeP",
 							passToken);
@@ -18690,7 +18690,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsAuthenticatorAssignedEntityCodeP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Authenticator Assigned Entity Code P</em>}' operation.
@@ -18711,7 +18711,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsAuthenticatorAssignedEntityCode(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Authenticator Assigned Entity Code</em>}' operation.
@@ -18734,7 +18734,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsAuthenticatorAssignedEntityAddr(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Authenticator Assigned Entity Addr</em>}' operation.
@@ -18755,7 +18755,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -18830,7 +18830,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -18905,7 +18905,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -18981,7 +18981,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -19055,7 +19055,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_SIGNATURE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_SIGNATURE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -19111,7 +19111,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorSignatureCode
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsAuthenticatorSignatureCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsAuthenticatorSignatureCodeP",
 							passToken);
@@ -19145,7 +19145,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorSignatureCode
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_SIGNATURE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_SIGNATURE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -19230,7 +19230,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorSignatureCode
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -19305,7 +19305,7 @@ public static boolean validateGeneralHeaderConstraintsAuthenticatorAssignedEntit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -19382,7 +19382,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -19459,7 +19459,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -19594,7 +19594,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsInformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Informant Assigned Entity General Header Constraints US Realm Address Use P</em>}' operation.
@@ -19615,7 +19615,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -19692,7 +19692,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -19769,7 +19769,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -19846,7 +19846,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -19923,7 +19923,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -20000,7 +20000,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -20077,7 +20077,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityGen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -20154,7 +20154,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityPer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -20229,7 +20229,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityPer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -20424,7 +20424,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityCod
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -20499,7 +20499,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsInformantAssignedEntityCode(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Informant Assigned Entity Code</em>}' operation.
@@ -20522,7 +20522,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsInformantAssignedEntityAddr(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Informant Assigned Entity Addr</em>}' operation.
@@ -20543,7 +20543,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -20599,7 +20599,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityCod
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsInformantAssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsInformantAssignedEntityCodeP",
 							passToken);
@@ -20632,7 +20632,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityCod
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -20707,7 +20707,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityAss
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -20784,7 +20784,7 @@ public static boolean validateGeneralHeaderConstraintsInformantRelatedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -20861,7 +20861,7 @@ public static boolean validateGeneralHeaderConstraintsInformantRelatedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -20996,7 +20996,7 @@ public static boolean validateGeneralHeaderConstraintsInformantRelatedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsInformantRelatedEntityGeneralHeaderConstraintsUSRealmAddressUseP(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Informant Related Entity General Header Constraints US Realm Address Use P</em>}' operation.
@@ -21017,7 +21017,7 @@ public static boolean validateGeneralHeaderConstraintsInformantRelatedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -21094,7 +21094,7 @@ public static boolean validateGeneralHeaderConstraintsInformantRelatedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -21171,7 +21171,7 @@ public static boolean validateGeneralHeaderConstraintsInformantRelatedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -21248,7 +21248,7 @@ public static boolean validateGeneralHeaderConstraintsInformantRelatedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -21325,7 +21325,7 @@ public static boolean validateGeneralHeaderConstraintsInformantRelatedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -21402,7 +21402,7 @@ public static boolean validateGeneralHeaderConstraintsInformantRelatedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -21479,7 +21479,7 @@ public static boolean validateGeneralHeaderConstraintsInformantRelatedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -21556,7 +21556,7 @@ public static boolean validateGeneralHeaderConstraintsInformantRelatedEntityPers
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -21631,7 +21631,7 @@ public static boolean validateGeneralHeaderConstraintsInformantRelatedEntityAddr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -21706,7 +21706,7 @@ public static boolean validateGeneralHeaderConstraintsInformantRelatedEntityPers
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_HAS_ASSIGNED_ENTITY_OR_RELATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_HAS_ASSIGNED_ENTITY_OR_RELATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -21782,7 +21782,7 @@ public static boolean validateGeneralHeaderConstraintsInformantHasAssignedEntity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_PARTICIPANT_SUPPORT_ASSOCIATED_ENTITY_HAS_ASSOCIATED_PERSON_OR_SCOPING_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_PARTICIPANT_SUPPORT_ASSOCIATED_ENTITY_HAS_ASSOCIATED_PERSON_OR_SCOPING_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -21859,7 +21859,7 @@ public static boolean validateGeneralHeaderConstraintsParticipantSupportAssociat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_PARTICIPANT_SUPPORT_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_PARTICIPANT_SUPPORT_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -21934,7 +21934,7 @@ public static boolean validateGeneralHeaderConstraintsParticipantSupportTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_IN_FULFILLMENT_OF_ORDER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_IN_FULFILLMENT_OF_ORDER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -22009,7 +22009,7 @@ public static boolean validateGeneralHeaderConstraintsInFulfillmentOfOrderId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_IN_FULFILLMENT_OF_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_IN_FULFILLMENT_OF_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -22084,7 +22084,7 @@ public static boolean validateGeneralHeaderConstraintsInFulfillmentOfOrder(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_IDENTIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -22227,7 +22227,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -22304,7 +22304,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCode(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Documentation Of Service Event Performer1 Assigned Entity Code</em>}' operation.
@@ -22327,7 +22327,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -22385,7 +22385,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCodeP",
 							passToken);
@@ -22484,7 +22484,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -22560,7 +22560,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_FUNCTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_FUNCTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCode(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Documentation Of Service Event Performer1 Function Code</em>}' operation.
@@ -22583,7 +22583,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_FUNCTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_FUNCTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -22641,7 +22641,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCodeP",
 							passToken);
@@ -22674,7 +22674,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -22751,7 +22751,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -22827,7 +22827,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -22903,7 +22903,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -22978,7 +22978,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -23107,7 +23107,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorizationConsentCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHORIZATION_CONSENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHORIZATION_CONSENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsAuthorizationConsentCode(GeneralHeaderConstraints, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Authorization Consent Code</em>}' operation.
@@ -23128,7 +23128,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorizationConsentCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHORIZATION_CONSENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHORIZATION_CONSENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -23203,7 +23203,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorizationConsentId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHORIZATION_CONSENT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHORIZATION_CONSENT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -23259,7 +23259,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorizationConsentStatus
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsAuthorizationConsentStatusCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsAuthorizationConsentStatusCodeP",
 							passToken);
@@ -23293,7 +23293,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorizationConsentStatus
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHORIZATION_CONSENT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHORIZATION_CONSENT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -23378,7 +23378,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorizationConsentStatus
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHORIZATION_CONSENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHORIZATION_CONSENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/GeneralStatusSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/GeneralStatusSectionOperations.java
index 0d991b1fe3..54d585b4aa 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/GeneralStatusSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/GeneralStatusSectionOperations.java
@@ -79,7 +79,7 @@ protected GeneralStatusSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_STATUS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_STATUS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateGeneralStatusSectionTemplateId(GeneralStatusSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_STATUS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_STATUS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -213,7 +213,7 @@ public static boolean validateGeneralStatusSectionCode(GeneralStatusSection gene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_STATUS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_STATUS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -278,7 +278,7 @@ public static boolean validateGeneralStatusSectionCodeP(GeneralStatusSection gen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_STATUS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_STATUS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -343,7 +343,7 @@ public static boolean validateGeneralStatusSectionTitle(GeneralStatusSection gen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_STATUS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_STATUS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/GoalObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/GoalObservationOperations.java
index 248907966c..aa798d6f3b 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/GoalObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/GoalObservationOperations.java
@@ -103,7 +103,7 @@ protected GoalObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -168,7 +168,7 @@ public static boolean validateGoalObservationTemplateId(GoalObservation goalObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -233,7 +233,7 @@ public static boolean validateGoalObservationClassCode(GoalObservation goalObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -298,7 +298,7 @@ public static boolean validateGoalObservationMoodCode(GoalObservation goalObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -363,7 +363,7 @@ public static boolean validateGoalObservationId(GoalObservation goalObservation,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -411,7 +411,7 @@ public static boolean validateGoalObservationCodeP(GoalObservation goalObservati
 					"org.openhealthtools.mdht.uml.cda.consol.GoalObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.GoalObservationCodeP", passToken);
 				}
 				passToken.add(goalObservation);
@@ -443,7 +443,7 @@ public static boolean validateGoalObservationCodeP(GoalObservation goalObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -517,7 +517,7 @@ public static boolean validateGoalObservationCode(GoalObservation goalObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -582,7 +582,7 @@ public static boolean validateGoalObservationStatusCode(GoalObservation goalObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -647,7 +647,7 @@ public static boolean validateGoalObservationStatusCodeP(GoalObservation goalObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -712,7 +712,7 @@ public static boolean validateGoalObservationEffectiveTime(GoalObservation goalO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -777,7 +777,7 @@ public static boolean validateGoalObservationValue(GoalObservation goalObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_GOAL_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_GOAL_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -842,7 +842,7 @@ public static boolean validateGoalObservationGoalObservation(GoalObservation goa
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_ACT_REFERENCE_ER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_ACT_REFERENCE_ER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -907,7 +907,7 @@ public static boolean validateGoalObservationActReferenceER(GoalObservation goal
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -974,7 +974,7 @@ public static boolean validateGoalObservationAuthorParticipation(GoalObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_HEALTH_CONCERN_ACT_ER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_HEALTH_CONCERN_ACT_ER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1041,7 +1041,7 @@ public static boolean validateGoalObservationHealthConcernActER(GoalObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1108,7 +1108,7 @@ public static boolean validateGoalObservationPriorityPreference(GoalObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_PLANNED_ERS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_PLANNED_ERS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1173,7 +1173,7 @@ public static boolean validateGoalObservationPlannedERs(GoalObservation goalObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOAL_OBSERVATION_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1238,7 +1238,7 @@ public static boolean validateGoalObservationReference(GoalObservation goalObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GOAL_OBSERVATION_REFERENCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GOAL_OBSERVATION_REFERENCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1310,7 +1310,7 @@ public static boolean validateGoalObservationReferenceTypeCode(GoalObservation g
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GOAL_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GOAL_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1408,7 +1408,7 @@ public static EList<GoalObservation> getGoalObservations(GoalObservation goalObs
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_GOAL_OBSERVATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<GoalObservation> result = (Collection<GoalObservation>) query.evaluate(goalObservation);
-		return new BasicEList.UnmodifiableEList<GoalObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1455,7 +1455,7 @@ public static EList<EntryReference> getActReferenceERs(GoalObservation goalObser
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_ACT_REFERENCE_ERS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EntryReference> result = (Collection<EntryReference>) query.evaluate(goalObservation);
-		return new BasicEList.UnmodifiableEList<EntryReference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1502,7 +1502,7 @@ public static EList<EntryReference> getHealthConcernActERs(GoalObservation goalO
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_HEALTH_CONCERN_ACT_ERS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EntryReference> result = (Collection<EntryReference>) query.evaluate(goalObservation);
-		return new BasicEList.UnmodifiableEList<EntryReference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1594,7 +1594,7 @@ public static EList<EntryReference> getPlannedERss(GoalObservation goalObservati
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PLANNED_ERSS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EntryReference> result = (Collection<EntryReference>) query.evaluate(goalObservation);
-		return new BasicEList.UnmodifiableEList<EntryReference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // GoalObservationOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/GoalsSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/GoalsSectionOperations.java
index f652de6b61..2d334821b7 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/GoalsSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/GoalsSectionOperations.java
@@ -84,7 +84,7 @@ protected GoalsSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOALS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOALS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -149,7 +149,7 @@ public static boolean validateGoalsSectionTemplateId(GoalsSection goalsSection,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOALS_SECTION_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOALS_SECTION_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -216,7 +216,7 @@ public static boolean validateGoalsSectionNullFlavor(GoalsSection goalsSection,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOALS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOALS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -281,7 +281,7 @@ public static boolean validateGoalsSectionCode(GoalsSection goalsSection, Diagno
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOALS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOALS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -346,7 +346,7 @@ public static boolean validateGoalsSectionCodeP(GoalsSection goalsSection, Diagn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOALS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOALS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -411,7 +411,7 @@ public static boolean validateGoalsSectionTitle(GoalsSection goalsSection, Diagn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOALS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOALS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -476,7 +476,7 @@ public static boolean validateGoalsSectionText(GoalsSection goalsSection, Diagno
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GOALS_SECTION_GOAL_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GOALS_SECTION_GOAL_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -565,7 +565,7 @@ public static EList<GoalObservation> getGoalObservations(GoalsSection goalsSecti
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_GOAL_OBSERVATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<GoalObservation> result = (Collection<GoalObservation>) query.evaluate(goalsSection);
-		return new BasicEList.UnmodifiableEList<GoalObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // GoalsSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HandoffCommunicationParticipantsOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HandoffCommunicationParticipantsOperations.java
index e67b6985d5..984cf36304 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HandoffCommunicationParticipantsOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HandoffCommunicationParticipantsOperations.java
@@ -90,7 +90,7 @@ protected HandoffCommunicationParticipantsOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -160,7 +160,7 @@ public static boolean validateHandoffCommunicationParticipantsTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -230,7 +230,7 @@ public static boolean validateHandoffCommunicationParticipantsClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -300,7 +300,7 @@ public static boolean validateHandoffCommunicationParticipantsMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -353,7 +353,7 @@ public static boolean validateHandoffCommunicationParticipantsCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.HandoffCommunicationParticipantsCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.HandoffCommunicationParticipantsCodeP", passToken);
 				}
@@ -386,7 +386,7 @@ public static boolean validateHandoffCommunicationParticipantsCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -466,7 +466,7 @@ public static boolean validateHandoffCommunicationParticipantsCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -536,7 +536,7 @@ public static boolean validateHandoffCommunicationParticipantsStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -606,7 +606,7 @@ public static boolean validateHandoffCommunicationParticipantsStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -676,7 +676,7 @@ public static boolean validateHandoffCommunicationParticipantsEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -746,7 +746,7 @@ public static boolean validateHandoffCommunicationParticipantsParticipant(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -816,7 +816,7 @@ public static boolean validateHandoffCommunicationParticipantsAuthorParticipatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -893,7 +893,7 @@ public static boolean validateHandoffCommunicationParticipantsParticipantPartici
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_PARTICIPANT_PARTICIPANT_ROLE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_PARTICIPANT_PARTICIPANT_ROLE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -969,7 +969,7 @@ public static boolean validateHandoffCommunicationParticipantsParticipantPartici
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_PARTICIPANT_PARTICIPANT_ROLE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_PARTICIPANT_PARTICIPANT_ROLE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1026,7 +1026,7 @@ public static boolean validateHandoffCommunicationParticipantsParticipantPartici
 						"org.openhealthtools.mdht.uml.cda.consol.HandoffCommunicationParticipantsParticipantParticipantRoleCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.HandoffCommunicationParticipantsParticipantParticipantRoleCodeP",
 							passToken);
@@ -1061,7 +1061,7 @@ public static boolean validateHandoffCommunicationParticipantsParticipantPartici
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_PARTICIPANT_PARTICIPANT_ROLE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_PARTICIPANT_PARTICIPANT_ROLE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1147,7 +1147,7 @@ public static boolean validateHandoffCommunicationParticipantsParticipantPartici
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_PARTICIPANT_PARTICIPANT_ROLE_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_PARTICIPANT_PARTICIPANT_ROLE_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1223,7 +1223,7 @@ public static boolean validateHandoffCommunicationParticipantsParticipantPartici
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1300,7 +1300,7 @@ public static boolean validateHandoffCommunicationParticipantsParticipantPartici
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1375,7 +1375,7 @@ public static boolean validateHandoffCommunicationParticipantsParticipantTypeCod
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_PARTICIPANT_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HANDOFF_COMMUNICATION_PARTICIPANTS_PARTICIPANT_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthConcernActOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthConcernActOperations.java
index 8f59320777..fcefa4c9a5 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthConcernActOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthConcernActOperations.java
@@ -184,7 +184,7 @@ protected HealthConcernActOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -249,7 +249,7 @@ public static boolean validateHealthConcernActTemplateId(HealthConcernAct health
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -314,7 +314,7 @@ public static boolean validateHealthConcernActClassCode(HealthConcernAct healthC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -379,7 +379,7 @@ public static boolean validateHealthConcernActMoodCode(HealthConcernAct healthCo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -444,7 +444,7 @@ public static boolean validateHealthConcernActId(HealthConcernAct healthConcernA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -492,7 +492,7 @@ public static boolean validateHealthConcernActCodeP(HealthConcernAct healthConce
 					"org.openhealthtools.mdht.uml.cda.consol.HealthConcernActCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.HealthConcernActCodeP", passToken);
 				}
 				passToken.add(healthConcernAct);
@@ -524,7 +524,7 @@ public static boolean validateHealthConcernActCodeP(HealthConcernAct healthConce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -599,7 +599,7 @@ public static boolean validateHealthConcernActCode(HealthConcernAct healthConcer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -664,7 +664,7 @@ public static boolean validateHealthConcernActStatusCode(HealthConcernAct health
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -729,7 +729,7 @@ public static boolean validateHealthConcernActStatusCodeP(HealthConcernAct healt
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -794,7 +794,7 @@ public static boolean validateHealthConcernActEffectiveTime(HealthConcernAct hea
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_HEALTH_CONCERN_ACT_ER_REFR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_HEALTH_CONCERN_ACT_ER_REFR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -861,7 +861,7 @@ public static boolean validateHealthConcernActHealthConcernActErRefr(HealthConce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_HEALTH_CONCERN_ACT_ER_COMP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_HEALTH_CONCERN_ACT_ER_COMP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -928,7 +928,7 @@ public static boolean validateHealthConcernActHealthConcernActErComp(HealthConce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -995,7 +995,7 @@ public static boolean validateHealthConcernActAssessmentScaleObservation(HealthC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_FAMILY_HISTORY_ORGANIZER2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_FAMILY_HISTORY_ORGANIZER2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1062,7 +1062,7 @@ public static boolean validateHealthConcernActFamilyHistoryOrganizer2(HealthConc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_NUTRITION_ASSESSMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_NUTRITION_ASSESSMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1129,7 +1129,7 @@ public static boolean validateHealthConcernActNutritionAssessment(HealthConcernA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_PREGNANCY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_PREGNANCY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1196,7 +1196,7 @@ public static boolean validateHealthConcernActPregnancyObservation(HealthConcern
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_CAREGIVER_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_CAREGIVER_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1263,7 +1263,7 @@ public static boolean validateHealthConcernActCaregiverCharacteristics(HealthCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_CULTURAL_AND_RELIGIOUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_CULTURAL_AND_RELIGIOUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1331,7 +1331,7 @@ public static boolean validateHealthConcernActCulturalAndReligiousObservation(He
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_CHARACTERISTICS_OF_HOME_ENVIRONMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_CHARACTERISTICS_OF_HOME_ENVIRONMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1399,7 +1399,7 @@ public static boolean validateHealthConcernActCharacteristicsOfHomeEnvironment(H
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_NUTRITIONAL_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_NUTRITIONAL_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1466,7 +1466,7 @@ public static boolean validateHealthConcernActNutritionalStatusObservation(Healt
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_ENTRY_REFERENCE_GENERAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_ENTRY_REFERENCE_GENERAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1533,7 +1533,7 @@ public static boolean validateHealthConcernActEntryReferenceGeneral(HealthConcer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1600,7 +1600,7 @@ public static boolean validateHealthConcernActAuthorParticipation(HealthConcernA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_SELF_CARE_ACTIVITIES__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_SELF_CARE_ACTIVITIES__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1667,7 +1667,7 @@ public static boolean validateHealthConcernActSelfCareActivities(HealthConcernAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_SENSORY_STATUS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_SENSORY_STATUS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1732,7 +1732,7 @@ public static boolean validateHealthConcernActSensoryStatus(HealthConcernAct hea
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_LONGITUDINAL_CARE_WOUND_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_LONGITUDINAL_CARE_WOUND_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1800,7 +1800,7 @@ public static boolean validateHealthConcernActLongitudinalCareWoundObservation(H
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1867,7 +1867,7 @@ public static boolean validateHealthConcernActPriorityPreference(HealthConcernAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_PROBLEM_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_PROBLEM_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1934,7 +1934,7 @@ public static boolean validateHealthConcernActProblemObservation2(HealthConcernA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_ALLERGY_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_ALLERGY_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2001,7 +2001,7 @@ public static boolean validateHealthConcernActAllergyObservation2(HealthConcernA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_MENTAL_STATUS_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_MENTAL_STATUS_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2068,7 +2068,7 @@ public static boolean validateHealthConcernActMentalStatusObservation2(HealthCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_SMOKING_STATUS_MEANINGFUL_USE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_SMOKING_STATUS_MEANINGFUL_USE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2135,7 +2135,7 @@ public static boolean validateHealthConcernActSmokingStatusMeaningfulUse2(Health
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_ENCOUNTER_DIAGNOSIS2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_ENCOUNTER_DIAGNOSIS2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2202,7 +2202,7 @@ public static boolean validateHealthConcernActEncounterDiagnosis2(HealthConcernA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_FUNCTIONAL_STATUS_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_FUNCTIONAL_STATUS_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2269,7 +2269,7 @@ public static boolean validateHealthConcernActFunctionalStatusObservation2(Healt
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_HOSPITAL_ADMISSION_DIAGNOSIS2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_HOSPITAL_ADMISSION_DIAGNOSIS2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2336,7 +2336,7 @@ public static boolean validateHealthConcernActHospitalAdmissionDiagnosis2(Health
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_POSTPROCEDURE_DIAGNOSIS2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_POSTPROCEDURE_DIAGNOSIS2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2403,7 +2403,7 @@ public static boolean validateHealthConcernActPostprocedureDiagnosis2(HealthConc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_PREOPERATIVE_DIAGNOSIS2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_PREOPERATIVE_DIAGNOSIS2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2470,7 +2470,7 @@ public static boolean validateHealthConcernActPreoperativeDiagnosis2(HealthConce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_REACTION_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_REACTION_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2537,7 +2537,7 @@ public static boolean validateHealthConcernActReactionObservation2(HealthConcern
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_RESULT_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_RESULT_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2604,7 +2604,7 @@ public static boolean validateHealthConcernActResultObservation2(HealthConcernAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_SOCIAL_HISTORY_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_SOCIAL_HISTORY_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2671,7 +2671,7 @@ public static boolean validateHealthConcernActSocialHistoryObservation2(HealthCo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2740,7 +2740,7 @@ public static boolean validateHealthConcernActSubstanceOrDeviceAllergyObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_TOBACCO_USE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_TOBACCO_USE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2805,7 +2805,7 @@ public static boolean validateHealthConcernActTobaccoUse2(HealthConcernAct healt
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_VITAL_SIGN_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_VITAL_SIGN_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2872,7 +2872,7 @@ public static boolean validateHealthConcernActVitalSignObservation2(HealthConcer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_PROBLEM_OBSERVATION2_SUPPORT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_PROBLEM_OBSERVATION2_SUPPORT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2939,7 +2939,7 @@ public static boolean validateHealthConcernActProblemObservation2Support(HealthC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_RESULT_ORGANIZER2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_RESULT_ORGANIZER2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3006,7 +3006,7 @@ public static boolean validateHealthConcernActResultOrganizer2(HealthConcernAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_PROBLEM_CONCERN_ACT2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_PROBLEM_CONCERN_ACT2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3073,7 +3073,7 @@ public static boolean validateHealthConcernActProblemConcernAct2(HealthConcernAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERN_ACT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3138,7 +3138,7 @@ public static boolean validateHealthConcernActReference(HealthConcernAct healthC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HEALTH_CONCERN_ACT_REFERENCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HEALTH_CONCERN_ACT_REFERENCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3210,7 +3210,7 @@ public static boolean validateHealthConcernActReferenceTypeCode(HealthConcernAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HEALTH_CONCERN_ACT_REFERENCE_EXTERNAL_DOCUMENT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HEALTH_CONCERN_ACT_REFERENCE_EXTERNAL_DOCUMENT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3310,7 +3310,7 @@ public static EList<AssessmentScaleObservation> getAssessmentScaleObservations(H
 		@SuppressWarnings("unchecked")
 		Collection<AssessmentScaleObservation> result = (Collection<AssessmentScaleObservation>) query.evaluate(
 			healthConcernAct);
-		return new BasicEList.UnmodifiableEList<AssessmentScaleObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3358,7 +3358,7 @@ public static EList<FamilyHistoryOrganizer2> getFamilyHistoryOrganizer2s(HealthC
 		@SuppressWarnings("unchecked")
 		Collection<FamilyHistoryOrganizer2> result = (Collection<FamilyHistoryOrganizer2>) query.evaluate(
 			healthConcernAct);
-		return new BasicEList.UnmodifiableEList<FamilyHistoryOrganizer2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3405,7 +3405,7 @@ public static EList<NutritionAssessment> getNutritionAssessments(HealthConcernAc
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_NUTRITION_ASSESSMENTS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<NutritionAssessment> result = (Collection<NutritionAssessment>) query.evaluate(healthConcernAct);
-		return new BasicEList.UnmodifiableEList<NutritionAssessment>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3452,7 +3452,7 @@ public static EList<PregnancyObservation> getPregnancyObservations(HealthConcern
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PREGNANCY_OBSERVATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PregnancyObservation> result = (Collection<PregnancyObservation>) query.evaluate(healthConcernAct);
-		return new BasicEList.UnmodifiableEList<PregnancyObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3500,7 +3500,7 @@ public static EList<CaregiverCharacteristics> getCaregiverCharacteristicss(Healt
 		@SuppressWarnings("unchecked")
 		Collection<CaregiverCharacteristics> result = (Collection<CaregiverCharacteristics>) query.evaluate(
 			healthConcernAct);
-		return new BasicEList.UnmodifiableEList<CaregiverCharacteristics>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3550,7 +3550,7 @@ public static EList<CulturalAndReligiousObservation> getCulturalAndReligiousObse
 		@SuppressWarnings("unchecked")
 		Collection<CulturalAndReligiousObservation> result = (Collection<CulturalAndReligiousObservation>) query.evaluate(
 			healthConcernAct);
-		return new BasicEList.UnmodifiableEList<CulturalAndReligiousObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3600,7 +3600,7 @@ public static EList<CharacteristicsOfHomeEnvironment> getCharacteristicsOfHomeEn
 		@SuppressWarnings("unchecked")
 		Collection<CharacteristicsOfHomeEnvironment> result = (Collection<CharacteristicsOfHomeEnvironment>) query.evaluate(
 			healthConcernAct);
-		return new BasicEList.UnmodifiableEList<CharacteristicsOfHomeEnvironment>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3650,7 +3650,7 @@ public static EList<NutritionalStatusObservation> getNutritionalStatusObservatio
 		@SuppressWarnings("unchecked")
 		Collection<NutritionalStatusObservation> result = (Collection<NutritionalStatusObservation>) query.evaluate(
 			healthConcernAct);
-		return new BasicEList.UnmodifiableEList<NutritionalStatusObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3697,7 +3697,7 @@ public static EList<EntryReference> getEntryReferenceGenerals(HealthConcernAct h
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_ENTRY_REFERENCE_GENERALS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EntryReference> result = (Collection<EntryReference>) query.evaluate(healthConcernAct);
-		return new BasicEList.UnmodifiableEList<EntryReference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3744,7 +3744,7 @@ public static EList<SelfCareActivities> getSelfCareActivitiess(HealthConcernAct
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_SELF_CARE_ACTIVITIESS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<SelfCareActivities> result = (Collection<SelfCareActivities>) query.evaluate(healthConcernAct);
-		return new BasicEList.UnmodifiableEList<SelfCareActivities>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3791,7 +3791,7 @@ public static EList<SensoryStatus> getSensoryStatuss(HealthConcernAct healthConc
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_SENSORY_STATUSS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<SensoryStatus> result = (Collection<SensoryStatus>) query.evaluate(healthConcernAct);
-		return new BasicEList.UnmodifiableEList<SensoryStatus>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3841,7 +3841,7 @@ public static EList<LongitudinalCareWoundObservation> getLongitudinalCareWoundOb
 		@SuppressWarnings("unchecked")
 		Collection<LongitudinalCareWoundObservation> result = (Collection<LongitudinalCareWoundObservation>) query.evaluate(
 			healthConcernAct);
-		return new BasicEList.UnmodifiableEList<LongitudinalCareWoundObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3888,7 +3888,7 @@ public static EList<PriorityPreference> getPriorityPreferences(HealthConcernAct
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PRIORITY_PREFERENCES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PriorityPreference> result = (Collection<PriorityPreference>) query.evaluate(healthConcernAct);
-		return new BasicEList.UnmodifiableEList<PriorityPreference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3935,7 +3935,7 @@ public static EList<ProblemObservation2> getProblemObservation2s(HealthConcernAc
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PROBLEM_OBSERVATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation2> result = (Collection<ProblemObservation2>) query.evaluate(healthConcernAct);
-		return new BasicEList.UnmodifiableEList<ProblemObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3982,7 +3982,7 @@ public static EList<AllergyObservation2> getAllergyObservation2s(HealthConcernAc
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_ALLERGY_OBSERVATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<AllergyObservation2> result = (Collection<AllergyObservation2>) query.evaluate(healthConcernAct);
-		return new BasicEList.UnmodifiableEList<AllergyObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4031,7 +4031,7 @@ public static EList<MentalStatusObservation2> getMentalStatusObservation2s(Healt
 		@SuppressWarnings("unchecked")
 		Collection<MentalStatusObservation2> result = (Collection<MentalStatusObservation2>) query.evaluate(
 			healthConcernAct);
-		return new BasicEList.UnmodifiableEList<MentalStatusObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4081,7 +4081,7 @@ public static EList<SmokingStatusMeaningfulUse2> getSmokingStatusMeaningfulUse2s
 		@SuppressWarnings("unchecked")
 		Collection<SmokingStatusMeaningfulUse2> result = (Collection<SmokingStatusMeaningfulUse2>) query.evaluate(
 			healthConcernAct);
-		return new BasicEList.UnmodifiableEList<SmokingStatusMeaningfulUse2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4128,7 +4128,7 @@ public static EList<EncounterDiagnosis2> getEncounterDiagnosis2s(HealthConcernAc
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_ENCOUNTER_DIAGNOSIS2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EncounterDiagnosis2> result = (Collection<EncounterDiagnosis2>) query.evaluate(healthConcernAct);
-		return new BasicEList.UnmodifiableEList<EncounterDiagnosis2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4178,7 +4178,7 @@ public static EList<FunctionalStatusObservation2> getFunctionalStatusObservation
 		@SuppressWarnings("unchecked")
 		Collection<FunctionalStatusObservation2> result = (Collection<FunctionalStatusObservation2>) query.evaluate(
 			healthConcernAct);
-		return new BasicEList.UnmodifiableEList<FunctionalStatusObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4228,7 +4228,7 @@ public static EList<HospitalAdmissionDiagnosis2> getHospitalAdmissionDiagnosis2s
 		@SuppressWarnings("unchecked")
 		Collection<HospitalAdmissionDiagnosis2> result = (Collection<HospitalAdmissionDiagnosis2>) query.evaluate(
 			healthConcernAct);
-		return new BasicEList.UnmodifiableEList<HospitalAdmissionDiagnosis2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4276,7 +4276,7 @@ public static EList<PostprocedureDiagnosis2> getPostprocedureDiagnosis2s(HealthC
 		@SuppressWarnings("unchecked")
 		Collection<PostprocedureDiagnosis2> result = (Collection<PostprocedureDiagnosis2>) query.evaluate(
 			healthConcernAct);
-		return new BasicEList.UnmodifiableEList<PostprocedureDiagnosis2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4324,7 +4324,7 @@ public static EList<PreoperativeDiagnosis2> getPreoperativeDiagnosis2s(HealthCon
 		@SuppressWarnings("unchecked")
 		Collection<PreoperativeDiagnosis2> result = (Collection<PreoperativeDiagnosis2>) query.evaluate(
 			healthConcernAct);
-		return new BasicEList.UnmodifiableEList<PreoperativeDiagnosis2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4371,7 +4371,7 @@ public static EList<ReactionObservation2> getReactionObservation2s(HealthConcern
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_REACTION_OBSERVATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ReactionObservation2> result = (Collection<ReactionObservation2>) query.evaluate(healthConcernAct);
-		return new BasicEList.UnmodifiableEList<ReactionObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4418,7 +4418,7 @@ public static EList<ResultObservation2> getResultObservation2s(HealthConcernAct
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_RESULT_OBSERVATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ResultObservation2> result = (Collection<ResultObservation2>) query.evaluate(healthConcernAct);
-		return new BasicEList.UnmodifiableEList<ResultObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4467,7 +4467,7 @@ public static EList<SocialHistoryObservation2> getSocialHistoryObservation2s(Hea
 		@SuppressWarnings("unchecked")
 		Collection<SocialHistoryObservation2> result = (Collection<SocialHistoryObservation2>) query.evaluate(
 			healthConcernAct);
-		return new BasicEList.UnmodifiableEList<SocialHistoryObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4517,7 +4517,7 @@ public static EList<SubstanceOrDeviceAllergyObservation2> getSubstanceOrDeviceAl
 		@SuppressWarnings("unchecked")
 		Collection<SubstanceOrDeviceAllergyObservation2> result = (Collection<SubstanceOrDeviceAllergyObservation2>) query.evaluate(
 			healthConcernAct);
-		return new BasicEList.UnmodifiableEList<SubstanceOrDeviceAllergyObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4564,7 +4564,7 @@ public static EList<TobaccoUse2> getTobaccoUse2s(HealthConcernAct healthConcernA
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_TOBACCO_USE2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<TobaccoUse2> result = (Collection<TobaccoUse2>) query.evaluate(healthConcernAct);
-		return new BasicEList.UnmodifiableEList<TobaccoUse2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4611,7 +4611,7 @@ public static EList<VitalSignObservation2> getVitalSignObservation2s(HealthConce
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_VITAL_SIGN_OBSERVATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<VitalSignObservation2> result = (Collection<VitalSignObservation2>) query.evaluate(healthConcernAct);
-		return new BasicEList.UnmodifiableEList<VitalSignObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4659,7 +4659,7 @@ public static EList<ProblemObservation2> getProblemObservation2Supports(HealthCo
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PROBLEM_OBSERVATION2_SUPPORTS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation2> result = (Collection<ProblemObservation2>) query.evaluate(healthConcernAct);
-		return new BasicEList.UnmodifiableEList<ProblemObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4706,7 +4706,7 @@ public static EList<ResultOrganizer2> getResultOrganizer2s(HealthConcernAct heal
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_RESULT_ORGANIZER2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ResultOrganizer2> result = (Collection<ResultOrganizer2>) query.evaluate(healthConcernAct);
-		return new BasicEList.UnmodifiableEList<ResultOrganizer2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4753,7 +4753,7 @@ public static EList<ProblemConcernAct2> getProblemConcernAct2s(HealthConcernAct
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PROBLEM_CONCERN_ACT2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ProblemConcernAct2> result = (Collection<ProblemConcernAct2>) query.evaluate(healthConcernAct);
-		return new BasicEList.UnmodifiableEList<ProblemConcernAct2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // HealthConcernActOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthConcernsSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthConcernsSectionOperations.java
index 2f8a95ba05..8bf3b06e10 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthConcernsSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthConcernsSectionOperations.java
@@ -90,7 +90,7 @@ protected HealthConcernsSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERNS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERNS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -157,7 +157,7 @@ public static boolean validateHealthConcernsSectionTemplateId(HealthConcernsSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERNS_SECTION_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERNS_SECTION_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -226,7 +226,7 @@ public static boolean validateHealthConcernsSectionNullFlavor(HealthConcernsSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERNS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERNS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -291,7 +291,7 @@ public static boolean validateHealthConcernsSectionCode(HealthConcernsSection he
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERNS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERNS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -357,7 +357,7 @@ public static boolean validateHealthConcernsSectionCodeP(HealthConcernsSection h
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERNS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERNS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -423,7 +423,7 @@ public static boolean validateHealthConcernsSectionTitle(HealthConcernsSection h
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERNS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERNS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -488,7 +488,7 @@ public static boolean validateHealthConcernsSectionText(HealthConcernsSection he
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERNS_SECTION_HEALTH_CONCERN_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERNS_SECTION_HEALTH_CONCERN_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -555,7 +555,7 @@ public static boolean validateHealthConcernsSectionHealthConcernAct(HealthConcer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERNS_SECTION_HEALTH_STATUS_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERNS_SECTION_HEALTH_STATUS_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -624,7 +624,7 @@ public static boolean validateHealthConcernsSectionHealthStatusObservation2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERNS_SECTION_RISK_CONCERN_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_CONCERNS_SECTION_RISK_CONCERN_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -716,7 +716,7 @@ public static EList<HealthConcernAct> getHealthConcernActs(HealthConcernsSection
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_HEALTH_CONCERN_ACTS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<HealthConcernAct> result = (Collection<HealthConcernAct>) query.evaluate(healthConcernsSection);
-		return new BasicEList.UnmodifiableEList<HealthConcernAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -766,7 +766,7 @@ public static EList<HealthStatusObservation2> getHealthStatusObservation2s(
 		@SuppressWarnings("unchecked")
 		Collection<HealthStatusObservation2> result = (Collection<HealthStatusObservation2>) query.evaluate(
 			healthConcernsSection);
-		return new BasicEList.UnmodifiableEList<HealthStatusObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -813,7 +813,7 @@ public static EList<RiskConcernAct> getRiskConcernActs(HealthConcernsSection hea
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_RISK_CONCERN_ACTS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<RiskConcernAct> result = (Collection<RiskConcernAct>) query.evaluate(healthConcernsSection);
-		return new BasicEList.UnmodifiableEList<RiskConcernAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // HealthConcernsSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthStatusEvaluationsAndOutcomesSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthStatusEvaluationsAndOutcomesSectionOperations.java
index cffcebf0f4..7d905222a6 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthStatusEvaluationsAndOutcomesSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthStatusEvaluationsAndOutcomesSectionOperations.java
@@ -80,7 +80,7 @@ protected HealthStatusEvaluationsAndOutcomesSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_EVALUATIONS_AND_OUTCOMES_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_EVALUATIONS_AND_OUTCOMES_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateHealthStatusEvaluationsAndOutcomesSectionTemplateI
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_EVALUATIONS_AND_OUTCOMES_SECTION_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_EVALUATIONS_AND_OUTCOMES_SECTION_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -224,7 +224,7 @@ public static boolean validateHealthStatusEvaluationsAndOutcomesSectionNullFlavo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_EVALUATIONS_AND_OUTCOMES_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_EVALUATIONS_AND_OUTCOMES_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -294,7 +294,7 @@ public static boolean validateHealthStatusEvaluationsAndOutcomesSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_EVALUATIONS_AND_OUTCOMES_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_EVALUATIONS_AND_OUTCOMES_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -365,7 +365,7 @@ public static boolean validateHealthStatusEvaluationsAndOutcomesSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_EVALUATIONS_AND_OUTCOMES_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_EVALUATIONS_AND_OUTCOMES_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -436,7 +436,7 @@ public static boolean validateHealthStatusEvaluationsAndOutcomesSectionTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_EVALUATIONS_AND_OUTCOMES_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_EVALUATIONS_AND_OUTCOMES_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -506,7 +506,7 @@ public static boolean validateHealthStatusEvaluationsAndOutcomesSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_EVALUATIONS_AND_OUTCOMES_SECTION_OUTCOME_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_EVALUATIONS_AND_OUTCOMES_SECTION_OUTCOME_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -605,7 +605,7 @@ public static EList<OutcomeObservation> getOutcomeObservations(
 		@SuppressWarnings("unchecked")
 		Collection<OutcomeObservation> result = (Collection<OutcomeObservation>) query.evaluate(
 			healthStatusEvaluationsAndOutcomesSection);
-		return new BasicEList.UnmodifiableEList<OutcomeObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // HealthStatusEvaluationsAndOutcomesSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthStatusObservation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthStatusObservation2Operations.java
index b73a42ca5b..f06e362379 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthStatusObservation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthStatusObservation2Operations.java
@@ -80,7 +80,7 @@ protected HealthStatusObservation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -147,7 +147,7 @@ public static boolean validateHealthStatusObservation2TemplateId(HealthStatusObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION2_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION2_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -241,7 +241,7 @@ public static boolean validateHealthStatusObservationCodeP(HealthStatusObservati
 					"org.openhealthtools.mdht.uml.cda.consol.HealthStatusObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.HealthStatusObservationCodeP", passToken);
 				}
 				passToken.add(healthStatusObservation2);
@@ -300,7 +300,7 @@ public static boolean validateHealthStatusObservationStatusCodeP(HealthStatusObs
 					"org.openhealthtools.mdht.uml.cda.consol.HealthStatusObservationStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.HealthStatusObservationStatusCodeP", passToken);
 				}
@@ -476,7 +476,7 @@ public static boolean validateHealthStatusObservationHasTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -550,7 +550,7 @@ public static boolean validateHealthStatusObservationCode(HealthStatusObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateHealthStatusObservationHasTextReference(HealthStatusObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Health Status Observation Has Text Reference</em>}' operation.
@@ -571,7 +571,7 @@ public static boolean validateHealthStatusObservationCode(HealthStatusObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_HAS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_HAS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateHealthStatusObservationTextReferenceValue(HealthStatusObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Health Status Observation Text Reference Value</em>}' operation.
@@ -592,7 +592,7 @@ public static boolean validateHealthStatusObservationCode(HealthStatusObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateHealthStatusObservationHasTextReferenceValue(HealthStatusObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Health Status Observation Has Text Reference Value</em>}' operation.
@@ -613,7 +613,7 @@ public static boolean validateHealthStatusObservationCode(HealthStatusObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_HAS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_HAS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateHealthStatusObservationCode(HealthStatusObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Health Status Observation Code</em>}' operation.
@@ -636,7 +636,7 @@ public static boolean validateHealthStatusObservationCode(HealthStatusObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateHealthStatusObservationText(HealthStatusObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Health Status Observation Text</em>}' operation.
@@ -657,7 +657,7 @@ public static boolean validateHealthStatusObservationCode(HealthStatusObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -724,7 +724,7 @@ public static boolean validateHealthStatusObservationText(HealthStatusObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthStatusObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthStatusObservationOperations.java
index ee1aa7efb5..4f58b3a4f8 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthStatusObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HealthStatusObservationOperations.java
@@ -85,7 +85,7 @@ protected HealthStatusObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_HAS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_HAS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -153,7 +153,7 @@ public static boolean validateHealthStatusObservationHasTextReference(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateHealthStatusObservationTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_HAS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_HAS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -290,7 +290,7 @@ public static boolean validateHealthStatusObservationHasTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -357,7 +357,7 @@ public static boolean validateHealthStatusObservationTemplateId(HealthStatusObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -424,7 +424,7 @@ public static boolean validateHealthStatusObservationClassCode(HealthStatusObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -493,7 +493,7 @@ public static boolean validateHealthStatusObservationMoodCode(HealthStatusObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -559,7 +559,7 @@ public static boolean validateHealthStatusObservationCode(HealthStatusObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -626,7 +626,7 @@ public static boolean validateHealthStatusObservationText(HealthStatusObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -695,7 +695,7 @@ public static boolean validateHealthStatusObservationStatusCode(HealthStatusObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -761,7 +761,7 @@ public static boolean validateHealthStatusObservationValue(HealthStatusObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HEALTH_STATUS_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HighestPressureUlcerStageOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HighestPressureUlcerStageOperations.java
index bcc898f804..121718b609 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HighestPressureUlcerStageOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HighestPressureUlcerStageOperations.java
@@ -78,7 +78,7 @@ protected HighestPressureUlcerStageOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HIGHEST_PRESSURE_ULCER_STAGE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HIGHEST_PRESSURE_ULCER_STAGE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -146,7 +146,7 @@ public static boolean validateHighestPressureUlcerStageTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HIGHEST_PRESSURE_ULCER_STAGE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HIGHEST_PRESSURE_ULCER_STAGE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -214,7 +214,7 @@ public static boolean validateHighestPressureUlcerStageClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HIGHEST_PRESSURE_ULCER_STAGE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HIGHEST_PRESSURE_ULCER_STAGE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -281,7 +281,7 @@ public static boolean validateHighestPressureUlcerStageMoodCode(HighestPressureU
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HIGHEST_PRESSURE_ULCER_STAGE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HIGHEST_PRESSURE_ULCER_STAGE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -347,7 +347,7 @@ public static boolean validateHighestPressureUlcerStageId(HighestPressureUlcerSt
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HIGHEST_PRESSURE_ULCER_STAGE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HIGHEST_PRESSURE_ULCER_STAGE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -397,7 +397,7 @@ public static boolean validateHighestPressureUlcerStageCodeP(HighestPressureUlce
 					"org.openhealthtools.mdht.uml.cda.consol.HighestPressureUlcerStageCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.HighestPressureUlcerStageCodeP", passToken);
 				}
 				passToken.add(highestPressureUlcerStage);
@@ -429,7 +429,7 @@ public static boolean validateHighestPressureUlcerStageCodeP(HighestPressureUlce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HIGHEST_PRESSURE_ULCER_STAGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HIGHEST_PRESSURE_ULCER_STAGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -503,7 +503,7 @@ public static boolean validateHighestPressureUlcerStageCode(HighestPressureUlcer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HIGHEST_PRESSURE_ULCER_STAGE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HIGHEST_PRESSURE_ULCER_STAGE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryAndPhysicalNote2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryAndPhysicalNote2Operations.java
index cc5c7dceb9..4797bb7716 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryAndPhysicalNote2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryAndPhysicalNote2Operations.java
@@ -170,7 +170,7 @@ protected HistoryAndPhysicalNote2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_HAS_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_CHIEF_COMPLAINT_OR_REASON_FOR_VISIT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_HAS_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_CHIEF_COMPLAINT_OR_REASON_FOR_VISIT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -241,7 +241,7 @@ public static boolean validateHistoryAndPhysicalNote2HasChiefComplaintAndReasonF
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_HAS_AN_ASSEMENT_AND_PLAN_SECTION2_OR_BOTH_ASSEMENT_SECTION_AND_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_HAS_AN_ASSEMENT_AND_PLAN_SECTION2_OR_BOTH_ASSEMENT_SECTION_AND_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -312,7 +312,7 @@ public static boolean validateHistoryAndPhysicalNote2HasAnAssementAndPlanSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_DOES_NOT_HAVE_ASSEMENT_AND_PLAN_SECTION2_WHEN_ASSEMENT_AND_PLAN_OF_TREATMENT2_ARE_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_DOES_NOT_HAVE_ASSEMENT_AND_PLAN_SECTION2_WHEN_ASSEMENT_AND_PLAN_OF_TREATMENT2_ARE_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -383,7 +383,7 @@ public static boolean validateHistoryAndPhysicalNote2DoesNotHaveAssementAndPlanS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_DOES_NOT_HAVE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_WITH_CHIEF_COMPLAINT_SECTION_OR_REASON_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_DOES_NOT_HAVE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_WITH_CHIEF_COMPLAINT_SECTION_OR_REASON_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -454,7 +454,7 @@ public static boolean validateHistoryAndPhysicalNote2DoesNotHaveChiefComplaintAn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -503,7 +503,7 @@ public static boolean validateHistoryAndPhysicalNote2CodeP(HistoryAndPhysicalNot
 					"org.openhealthtools.mdht.uml.cda.consol.HistoryAndPhysicalNote2CodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.HistoryAndPhysicalNote2CodeP", passToken);
 				}
 				passToken.add(historyAndPhysicalNote2);
@@ -535,7 +535,7 @@ public static boolean validateHistoryAndPhysicalNote2CodeP(HistoryAndPhysicalNot
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -609,7 +609,7 @@ public static boolean validateHistoryAndPhysicalNote2Code(HistoryAndPhysicalNote
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -677,7 +677,7 @@ public static boolean validateHistoryAndPhysicalNote2InformationRecipient(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -744,7 +744,7 @@ public static boolean validateHistoryAndPhysicalNote2Participant(HistoryAndPhysi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_IN_FULFILLMENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_IN_FULFILLMENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -812,7 +812,7 @@ public static boolean validateHistoryAndPhysicalNote2InFulfillmentOf(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -879,7 +879,7 @@ public static boolean validateHistoryAndPhysicalNote2ComponentOf(HistoryAndPhysi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_ALLERGIES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_ALLERGIES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -948,7 +948,7 @@ public static boolean validateHistoryAndPhysicalNote2AllergiesSectionEntriesOpti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1016,7 +1016,7 @@ public static boolean validateHistoryAndPhysicalNote2AssessmentSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1085,7 +1085,7 @@ public static boolean validateHistoryAndPhysicalNote2PlanOfTreatmentSection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_ASSESSMENT_AND_PLAN_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_ASSESSMENT_AND_PLAN_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1154,7 +1154,7 @@ public static boolean validateHistoryAndPhysicalNote2AssessmentAndPlanSection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1222,7 +1222,7 @@ public static boolean validateHistoryAndPhysicalNote2ChiefComplaintSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1291,7 +1291,7 @@ public static boolean validateHistoryAndPhysicalNote2ChiefComplaintAndReasonForV
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_GENERAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_GENERAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1359,7 +1359,7 @@ public static boolean validateHistoryAndPhysicalNote2GeneralStatusSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_HISTORY_OF_PAST_ILLNESS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_HISTORY_OF_PAST_ILLNESS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1428,7 +1428,7 @@ public static boolean validateHistoryAndPhysicalNote2HistoryOfPastIllnessSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_HISTORY_OF_PRESENT_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_HISTORY_OF_PRESENT_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1497,7 +1497,7 @@ public static boolean validateHistoryAndPhysicalNote2HistoryOfPresentIllnessSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1566,7 +1566,7 @@ public static boolean validateHistoryAndPhysicalNote2ImmunizationsSectionEntries
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_INSTRUCTIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_INSTRUCTIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1634,7 +1634,7 @@ public static boolean validateHistoryAndPhysicalNote2InstructionsSection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_MEDICATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_MEDICATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1703,7 +1703,7 @@ public static boolean validateHistoryAndPhysicalNote2MedicationsSectionEntriesOp
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_PHYSICAL_EXAM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_PHYSICAL_EXAM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1771,7 +1771,7 @@ public static boolean validateHistoryAndPhysicalNote2PhysicalExamSection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_PROBLEM_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_PROBLEM_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1840,7 +1840,7 @@ public static boolean validateHistoryAndPhysicalNote2ProblemSectionEntriesOption
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_PROCEDURES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_PROCEDURES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1909,7 +1909,7 @@ public static boolean validateHistoryAndPhysicalNote2ProceduresSectionEntriesOpt
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1977,7 +1977,7 @@ public static boolean validateHistoryAndPhysicalNote2ReasonForVisitSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_RESULTS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_RESULTS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2046,7 +2046,7 @@ public static boolean validateHistoryAndPhysicalNote2ResultsSectionEntriesOption
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2115,7 +2115,7 @@ public static boolean validateHistoryAndPhysicalNote2ReviewOfSystemsSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_SOCIAL_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_SOCIAL_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2184,7 +2184,7 @@ public static boolean validateHistoryAndPhysicalNote2SocialHistorySection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2253,7 +2253,7 @@ public static boolean validateHistoryAndPhysicalNote2VitalSignsSectionEntriesOpt
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_FAMILY_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_FAMILY_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2322,7 +2322,7 @@ public static boolean validateHistoryAndPhysicalNote2FamilyHistorySection2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_INFORMATION_RECIPIENT_INTENDED_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_INFORMATION_RECIPIENT_INTENDED_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2396,7 +2396,7 @@ public static boolean validateHistoryAndPhysicalNote2InformationRecipientIntende
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_PARTICIPANT_IF_PAR_TYPE_CODE_IND_THEN_AE_CLASS_CODE_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_PARTICIPANT_IF_PAR_TYPE_CODE_IND_THEN_AE_CLASS_CODE_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2471,7 +2471,7 @@ public static boolean validateHistoryAndPhysicalNote2ParticipantIfParTypeCodeIND
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_DAY_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_DAY_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2547,7 +2547,7 @@ public static boolean validateHistoryAndPhysicalNote2ComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_MINUTE_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_MINUTE_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2623,7 +2623,7 @@ public static boolean validateHistoryAndPhysicalNote2ComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_SECOND_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_SECOND_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2699,7 +2699,7 @@ public static boolean validateHistoryAndPhysicalNote2ComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2775,7 +2775,7 @@ public static boolean validateHistoryAndPhysicalNote2ComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_HAS_PERSON_OR_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_HAS_PERSON_OR_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2851,7 +2851,7 @@ public static boolean validateHistoryAndPhysicalNote2ComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2927,7 +2927,7 @@ public static boolean validateHistoryAndPhysicalNote2ComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY_HAS_PERSON_OR_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY_HAS_PERSON_OR_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3003,7 +3003,7 @@ public static boolean validateHistoryAndPhysicalNote2ComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3079,7 +3079,7 @@ public static boolean validateHistoryAndPhysicalNote2ComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3153,7 +3153,7 @@ public static boolean validateHistoryAndPhysicalNote2ComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3228,7 +3228,7 @@ public static boolean validateHistoryAndPhysicalNote2ComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3303,7 +3303,7 @@ public static boolean validateHistoryAndPhysicalNote2ComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3379,7 +3379,7 @@ public static boolean validateHistoryAndPhysicalNote2ComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3453,7 +3453,7 @@ public static boolean validateHistoryAndPhysicalNote2ComponentOfEncompassingEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4494,7 +4494,7 @@ public static FamilyHistorySection2 getFamilyHistorySection2(HistoryAndPhysicalN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryAndPhysicalNoteOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryAndPhysicalNoteOperations.java
index 1179afce2a..91c39265f5 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryAndPhysicalNoteOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryAndPhysicalNoteOperations.java
@@ -164,7 +164,7 @@ protected HistoryAndPhysicalNoteOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_HAS_AN_ASSEMENT_AND_PLAN_SECTION_OR_INDIVIDUAL_ASSEMENT_AND_PLAN_SECTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_HAS_AN_ASSEMENT_AND_PLAN_SECTION_OR_INDIVIDUAL_ASSEMENT_AND_PLAN_SECTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -235,7 +235,7 @@ public static boolean validateHistoryAndPhysicalNoteHasAnAssementAndPlanSectionO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_DOES_NOT_HAVE_INDIVIDUAL_ASSEMENT_AND_PLAN_SECTIONS_WHEN_ASSEMENT_AND_PLAN_SECTION_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_DOES_NOT_HAVE_INDIVIDUAL_ASSEMENT_AND_PLAN_SECTIONS_WHEN_ASSEMENT_AND_PLAN_SECTION_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -306,7 +306,7 @@ public static boolean validateHistoryAndPhysicalNoteDoesNotHaveIndividualAssemen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_HAS_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_CHIEF_COMPLAINT_OR_REASON_FOR_VISIT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_HAS_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_CHIEF_COMPLAINT_OR_REASON_FOR_VISIT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -377,7 +377,7 @@ public static boolean validateHistoryAndPhysicalNoteHasChiefComplaintAndReasonFo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_DOES_NOT_HAVE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_WITH_CHIEF_COMPLAINT_SECTION_OR_REASON_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_DOES_NOT_HAVE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_WITH_CHIEF_COMPLAINT_SECTION_OR_REASON_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -448,7 +448,7 @@ public static boolean validateHistoryAndPhysicalNoteDoesNotHaveChiefComplaintAnd
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -497,7 +497,7 @@ public static boolean validateGeneralHeaderConstraintsCodeP(HistoryAndPhysicalNo
 					"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsCodeP", passToken);
 				}
 				passToken.add(historyAndPhysicalNote);
@@ -527,7 +527,7 @@ public static boolean validateGeneralHeaderConstraintsCodeP(HistoryAndPhysicalNo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_IN_FULFILLMENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_IN_FULFILLMENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -594,7 +594,7 @@ public static boolean validateHistoryAndPhysicalNoteInFulfillmentOf(HistoryAndPh
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -661,7 +661,7 @@ public static boolean validateHistoryAndPhysicalNoteComponentOf(HistoryAndPhysic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_ALLERGIES_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_ALLERGIES_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -730,7 +730,7 @@ public static boolean validateHistoryAndPhysicalNoteAllergiesSectionEntriesOptio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -798,7 +798,7 @@ public static boolean validateHistoryAndPhysicalNoteAssessmentSection(HistoryAnd
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_PLAN_OF_CARE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_PLAN_OF_CARE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -866,7 +866,7 @@ public static boolean validateHistoryAndPhysicalNotePlanOfCareSection(HistoryAnd
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_ASSESSMENT_AND_PLAN_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_ASSESSMENT_AND_PLAN_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -935,7 +935,7 @@ public static boolean validateHistoryAndPhysicalNoteAssessmentAndPlanSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1003,7 +1003,7 @@ public static boolean validateHistoryAndPhysicalNoteChiefComplaintSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1072,7 +1072,7 @@ public static boolean validateHistoryAndPhysicalNoteChiefComplaintAndReasonForVi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_FAMILY_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_FAMILY_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1140,7 +1140,7 @@ public static boolean validateHistoryAndPhysicalNoteFamilyHistorySection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_GENERAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_GENERAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1208,7 +1208,7 @@ public static boolean validateHistoryAndPhysicalNoteGeneralStatusSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_HISTORY_OF_PAST_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_HISTORY_OF_PAST_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1277,7 +1277,7 @@ public static boolean validateHistoryAndPhysicalNoteHistoryOfPastIllnessSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1346,7 +1346,7 @@ public static boolean validateHistoryAndPhysicalNoteMedicationsSectionEntriesOpt
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_PHYSICAL_EXAM_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_PHYSICAL_EXAM_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1414,7 +1414,7 @@ public static boolean validateHistoryAndPhysicalNotePhysicalExamSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1482,7 +1482,7 @@ public static boolean validateHistoryAndPhysicalNoteReasonForVisitSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_RESULTS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_RESULTS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1551,7 +1551,7 @@ public static boolean validateHistoryAndPhysicalNoteResultsSectionEntriesOptiona
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1619,7 +1619,7 @@ public static boolean validateHistoryAndPhysicalNoteReviewOfSystemsSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_SOCIAL_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_SOCIAL_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1687,7 +1687,7 @@ public static boolean validateHistoryAndPhysicalNoteSocialHistorySection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_HISTORY_OF_PRESENT_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_HISTORY_OF_PRESENT_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1756,7 +1756,7 @@ public static boolean validateHistoryAndPhysicalNoteHistoryOfPresentIllnessSecti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1825,7 +1825,7 @@ public static boolean validateHistoryAndPhysicalNoteImmunizationsSectionEntriesO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_PROBLEM_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_PROBLEM_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1894,7 +1894,7 @@ public static boolean validateHistoryAndPhysicalNoteProblemSectionEntriesOptiona
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_PROCEDURES_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_PROCEDURES_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1963,7 +1963,7 @@ public static boolean validateHistoryAndPhysicalNoteProceduresSectionEntriesOpti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2032,7 +2032,7 @@ public static boolean validateHistoryAndPhysicalNoteVitalSignsSectionEntriesOpti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_INSTRUCTIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_INSTRUCTIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2100,7 +2100,7 @@ public static boolean validateHistoryAndPhysicalNoteInstructionsSection(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_HAS_PERSON_OR_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_RESPONSIBLE_PARTY_ASSIGNED_ENTITY_HAS_PERSON_OR_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2176,7 +2176,7 @@ public static boolean validateHistoryAndPhysicalNoteComponentOfEncompassingEncou
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_RESPONSIBLE_PARTY_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_RESPONSIBLE_PARTY_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2252,7 +2252,7 @@ public static boolean validateHistoryAndPhysicalNoteComponentOfEncompassingEncou
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY_HAS_PERSON_OR_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY_HAS_PERSON_OR_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2328,7 +2328,7 @@ public static boolean validateHistoryAndPhysicalNoteComponentOfEncompassingEncou
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_ENCOUNTER_PARTICIPANT_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2404,7 +2404,7 @@ public static boolean validateHistoryAndPhysicalNoteComponentOfEncompassingEncou
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_PRECISE_TO_THE_DAY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_PRECISE_TO_THE_DAY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2479,7 +2479,7 @@ public static boolean validateHistoryAndPhysicalNoteComponentOfEncompassingEncou
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_PRECISE_TO_THE_MINUTE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_PRECISE_TO_THE_MINUTE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2554,7 +2554,7 @@ public static boolean validateHistoryAndPhysicalNoteComponentOfEncompassingEncou
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_PRECISE_TO_THE_SECOND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_PRECISE_TO_THE_SECOND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2629,7 +2629,7 @@ public static boolean validateHistoryAndPhysicalNoteComponentOfEncompassingEncou
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2705,7 +2705,7 @@ public static boolean validateHistoryAndPhysicalNoteComponentOfEncompassingEncou
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2780,7 +2780,7 @@ public static boolean validateHistoryAndPhysicalNoteComponentOfEncompassingEncou
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2854,7 +2854,7 @@ public static boolean validateHistoryAndPhysicalNoteComponentOfEncompassingEncou
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2928,7 +2928,7 @@ public static boolean validateHistoryAndPhysicalNoteComponentOfEncompassingEncou
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3003,7 +3003,7 @@ public static boolean validateHistoryAndPhysicalNoteComponentOfEncompassingEncou
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_ENCOUNTER_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER4_ENCOUNTER_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3079,7 +3079,7 @@ public static boolean validateHistoryAndPhysicalNoteComponentOfEncompassingEncou
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_HISTORY_AND_PHYSICAL_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4119,7 +4119,7 @@ public static InstructionsSection getInstructionsSection(HistoryAndPhysicalNote
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4188,7 +4188,7 @@ public static boolean validateGeneralHeaderConstraintsTemplateId(HistoryAndPhysi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryOfPastIllnessSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryOfPastIllnessSection2Operations.java
index c89bfda65f..8d390a834f 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryOfPastIllnessSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryOfPastIllnessSection2Operations.java
@@ -80,7 +80,7 @@ protected HistoryOfPastIllnessSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -177,7 +177,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation2> result = (Collection<ProblemObservation2>) query.evaluate(
 			historyOfPastIllnessSection2);
-		return new BasicEList.UnmodifiableEList<ProblemObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -199,7 +199,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -250,7 +250,7 @@ public static boolean validateHistoryOfPastIllnessSectionCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.HistoryOfPastIllnessSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.HistoryOfPastIllnessSectionCodeP", passToken);
 				}
 				passToken.add(historyOfPastIllnessSection2);
@@ -282,7 +282,7 @@ public static boolean validateHistoryOfPastIllnessSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -359,7 +359,7 @@ public static boolean validateHistoryOfPastIllnessSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryOfPastIllnessSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryOfPastIllnessSectionOperations.java
index 020b49315c..ba4fbea4e0 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryOfPastIllnessSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryOfPastIllnessSectionOperations.java
@@ -87,7 +87,7 @@ protected HistoryOfPastIllnessSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -158,7 +158,7 @@ public static boolean validateHistoryOfPastIllnessSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -226,7 +226,7 @@ public static boolean validateHistoryOfPastIllnessSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -294,7 +294,7 @@ public static boolean validateHistoryOfPastIllnessSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -362,7 +362,7 @@ public static boolean validateHistoryOfPastIllnessSectionTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -430,7 +430,7 @@ public static boolean validateHistoryOfPastIllnessSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PAST_ILLNESS_SECTION_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -527,7 +527,7 @@ public static EList<ProblemObservation> getProblemObservations(
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation> result = (Collection<ProblemObservation>) query.evaluate(
 			historyOfPastIllnessSection);
-		return new BasicEList.UnmodifiableEList<ProblemObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // HistoryOfPastIllnessSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryOfPresentIllnessSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryOfPresentIllnessSectionOperations.java
index 80ad7655eb..39b7162b2a 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryOfPresentIllnessSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HistoryOfPresentIllnessSectionOperations.java
@@ -79,7 +79,7 @@ protected HistoryOfPresentIllnessSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PRESENT_ILLNESS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PRESENT_ILLNESS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateHistoryOfPresentIllnessSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PRESENT_ILLNESS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PRESENT_ILLNESS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -220,7 +220,7 @@ public static boolean validateHistoryOfPresentIllnessSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PRESENT_ILLNESS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PRESENT_ILLNESS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -289,7 +289,7 @@ public static boolean validateHistoryOfPresentIllnessSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PRESENT_ILLNESS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PRESENT_ILLNESS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -358,7 +358,7 @@ public static boolean validateHistoryOfPresentIllnessSectionTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PRESENT_ILLNESS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HISTORY_OF_PRESENT_ILLNESS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalAdmissionDiagnosis2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalAdmissionDiagnosis2Operations.java
index 3bfe1f21e7..7edcd8a59d 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalAdmissionDiagnosis2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalAdmissionDiagnosis2Operations.java
@@ -80,7 +80,7 @@ protected HospitalAdmissionDiagnosis2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -179,7 +179,7 @@ public static boolean validateHospitalAdmissionDiagnosisCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.HospitalAdmissionDiagnosisCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.HospitalAdmissionDiagnosisCodeP", passToken);
 				}
 				passToken.add(hospitalAdmissionDiagnosis2);
@@ -217,7 +217,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation2> result = (Collection<ProblemObservation2>) query.evaluate(
 			hospitalAdmissionDiagnosis2);
-		return new BasicEList.UnmodifiableEList<ProblemObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -239,7 +239,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #getConsolProblemObservation2s(HospitalAdmissionDiagnosis2) <em>Get Consol Problem Observation2s</em>}' operation.
@@ -282,7 +282,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -357,7 +357,7 @@ public static boolean validateHospitalAdmissionDiagnosisCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalAdmissionDiagnosisOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalAdmissionDiagnosisOperations.java
index bde30407b1..590e48696b 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalAdmissionDiagnosisOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalAdmissionDiagnosisOperations.java
@@ -86,7 +86,7 @@ protected HospitalAdmissionDiagnosisOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -155,7 +155,7 @@ public static boolean validateHospitalAdmissionDiagnosisTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -269,7 +269,7 @@ public static boolean validateHospitalAdmissionDiagnosisCode(HospitalAdmissionDi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -339,7 +339,7 @@ public static boolean validateHospitalAdmissionDiagnosisMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateHospitalAdmissionDiagnosisProblemObservation(HospitalAdmissionDiagnosis, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Hospital Admission Diagnosis Problem Observation</em>}' operation.
@@ -360,7 +360,7 @@ public static boolean validateHospitalAdmissionDiagnosisMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -457,7 +457,7 @@ public static EList<ProblemObservation> getProblemObservations(
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation> result = (Collection<ProblemObservation>) query.evaluate(
 			hospitalAdmissionDiagnosis);
-		return new BasicEList.UnmodifiableEList<ProblemObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // HospitalAdmissionDiagnosisOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalAdmissionDiagnosisSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalAdmissionDiagnosisSectionOperations.java
index 00040060e4..15d25e4cf7 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalAdmissionDiagnosisSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalAdmissionDiagnosisSectionOperations.java
@@ -84,7 +84,7 @@ protected HospitalAdmissionDiagnosisSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -156,7 +156,7 @@ public static boolean validateHospitalAdmissionDiagnosisSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -226,7 +226,7 @@ public static boolean validateHospitalAdmissionDiagnosisSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -296,7 +296,7 @@ public static boolean validateHospitalAdmissionDiagnosisSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -366,7 +366,7 @@ public static boolean validateHospitalAdmissionDiagnosisSectionTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -436,7 +436,7 @@ public static boolean validateHospitalAdmissionDiagnosisSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION_HOSPITAL_ADMISSION_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_DIAGNOSIS_SECTION_HOSPITAL_ADMISSION_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalAdmissionMedicationsSectionEntriesOptionalOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalAdmissionMedicationsSectionEntriesOptionalOperations.java
index d2a3c10f8c..0b4cc7d478 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalAdmissionMedicationsSectionEntriesOptionalOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalAdmissionMedicationsSectionEntriesOptionalOperations.java
@@ -87,7 +87,7 @@ protected HospitalAdmissionMedicationsSectionEntriesOptionalOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -161,7 +161,7 @@ public static boolean validateHospitalAdmissionMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -233,7 +233,7 @@ public static boolean validateHospitalAdmissionMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -356,7 +356,7 @@ public static boolean validateHospitalAdmissionMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateHospitalAdmissionMedicationsSectionEntriesOptionalText(HospitalAdmissionMedicationsSectionEntriesOptional, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Hospital Admission Medications Section Entries Optional Text</em>}' operation.
@@ -377,7 +377,7 @@ public static boolean validateHospitalAdmissionMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -449,7 +449,7 @@ public static boolean validateHospitalAdmissionMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_ADMISSION_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_ADMISSION_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -549,7 +549,7 @@ public static EList<AdmissionMedication> getAdmissionMedications(
 		@SuppressWarnings("unchecked")
 		Collection<AdmissionMedication> result = (Collection<AdmissionMedication>) query.evaluate(
 			hospitalAdmissionMedicationsSectionEntriesOptional);
-		return new BasicEList.UnmodifiableEList<AdmissionMedication>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // HospitalAdmissionMedicationsSectionEntriesOptionalOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalConsultationsSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalConsultationsSectionOperations.java
index 83d2c08b27..e360202345 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalConsultationsSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalConsultationsSectionOperations.java
@@ -79,7 +79,7 @@ protected HospitalConsultationsSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_CONSULTATIONS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_CONSULTATIONS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -150,7 +150,7 @@ public static boolean validateHospitalConsultationsSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_CONSULTATIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_CONSULTATIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -218,7 +218,7 @@ public static boolean validateHospitalConsultationsSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_CONSULTATIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_CONSULTATIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -287,7 +287,7 @@ public static boolean validateHospitalConsultationsSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_CONSULTATIONS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_CONSULTATIONS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -355,7 +355,7 @@ public static boolean validateHospitalConsultationsSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_CONSULTATIONS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_CONSULTATIONS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalCourseSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalCourseSectionOperations.java
index a40dc3b1af..43193137ac 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalCourseSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalCourseSectionOperations.java
@@ -79,7 +79,7 @@ protected HospitalCourseSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_COURSE_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_COURSE_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateHospitalCourseSectionTemplateId(HospitalCourseSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_COURSE_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_COURSE_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -213,7 +213,7 @@ public static boolean validateHospitalCourseSectionCode(HospitalCourseSection ho
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_COURSE_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_COURSE_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -279,7 +279,7 @@ public static boolean validateHospitalCourseSectionCodeP(HospitalCourseSection h
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_COURSE_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_COURSE_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -345,7 +345,7 @@ public static boolean validateHospitalCourseSectionTitle(HospitalCourseSection h
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_COURSE_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_COURSE_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeDiagnosis2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeDiagnosis2Operations.java
index ce2552f40c..cc22aa4887 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeDiagnosis2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeDiagnosis2Operations.java
@@ -80,7 +80,7 @@ protected HospitalDischargeDiagnosis2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -179,7 +179,7 @@ public static boolean validateHospitalDischargeDiagnosisCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.HospitalDischargeDiagnosisCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.HospitalDischargeDiagnosisCodeP", passToken);
 				}
 				passToken.add(hospitalDischargeDiagnosis2);
@@ -217,7 +217,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation2> result = (Collection<ProblemObservation2>) query.evaluate(
 			hospitalDischargeDiagnosis2);
-		return new BasicEList.UnmodifiableEList<ProblemObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -239,7 +239,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #getConsolProblemObservation2s(HospitalDischargeDiagnosis2) <em>Get Consol Problem Observation2s</em>}' operation.
@@ -282,7 +282,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -357,7 +357,7 @@ public static boolean validateHospitalDischargeDiagnosisCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeDiagnosisOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeDiagnosisOperations.java
index d095dc8127..77ffad7c2a 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeDiagnosisOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeDiagnosisOperations.java
@@ -86,7 +86,7 @@ protected HospitalDischargeDiagnosisOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -156,7 +156,7 @@ public static boolean validateHospitalDischargeDiagnosisProblemObservation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -225,7 +225,7 @@ public static boolean validateHospitalDischargeDiagnosisTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -294,7 +294,7 @@ public static boolean validateHospitalDischargeDiagnosisClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -364,7 +364,7 @@ public static boolean validateHospitalDischargeDiagnosisMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -457,7 +457,7 @@ public static EList<ProblemObservation> getProblemObservations(
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation> result = (Collection<ProblemObservation>) query.evaluate(
 			hospitalDischargeDiagnosis);
-		return new BasicEList.UnmodifiableEList<ProblemObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // HospitalDischargeDiagnosisOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeDiagnosisSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeDiagnosisSectionOperations.java
index f23024c5e8..6aa92c93af 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeDiagnosisSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeDiagnosisSectionOperations.java
@@ -84,7 +84,7 @@ protected HospitalDischargeDiagnosisSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -156,7 +156,7 @@ public static boolean validateHospitalDischargeDiagnosisSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -226,7 +226,7 @@ public static boolean validateHospitalDischargeDiagnosisSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -296,7 +296,7 @@ public static boolean validateHospitalDischargeDiagnosisSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -366,7 +366,7 @@ public static boolean validateHospitalDischargeDiagnosisSectionTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -436,7 +436,7 @@ public static boolean validateHospitalDischargeDiagnosisSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION_HOSPITAL_DISCHARGE_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_DIAGNOSIS_SECTION_HOSPITAL_DISCHARGE_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeInstructionsSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeInstructionsSectionOperations.java
index 00b6794264..79033ed05a 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeInstructionsSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeInstructionsSectionOperations.java
@@ -79,7 +79,7 @@ protected HospitalDischargeInstructionsSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_INSTRUCTIONS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_INSTRUCTIONS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateHospitalDischargeInstructionsSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_INSTRUCTIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_INSTRUCTIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateHospitalDischargeInstructionsSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_INSTRUCTIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_INSTRUCTIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -291,7 +291,7 @@ public static boolean validateHospitalDischargeInstructionsSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_INSTRUCTIONS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_INSTRUCTIONS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -361,7 +361,7 @@ public static boolean validateHospitalDischargeInstructionsSectionTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_INSTRUCTIONS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_INSTRUCTIONS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeMedicationsSectionEntriesOptionalOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeMedicationsSectionEntriesOptionalOperations.java
index 235d99f2d4..a7d78951e7 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeMedicationsSectionEntriesOptionalOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeMedicationsSectionEntriesOptionalOperations.java
@@ -87,7 +87,7 @@ protected HospitalDischargeMedicationsSectionEntriesOptionalOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -161,7 +161,7 @@ public static boolean validateHospitalDischargeMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -233,7 +233,7 @@ public static boolean validateHospitalDischargeMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -305,7 +305,7 @@ public static boolean validateHospitalDischargeMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -377,7 +377,7 @@ public static boolean validateHospitalDischargeMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -449,7 +449,7 @@ public static boolean validateHospitalDischargeMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_DISCHARGE_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_DISCHARGE_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -549,7 +549,7 @@ public static EList<DischargeMedication> getDischargeMedications(
 		@SuppressWarnings("unchecked")
 		Collection<DischargeMedication> result = (Collection<DischargeMedication>) query.evaluate(
 			hospitalDischargeMedicationsSectionEntriesOptional);
-		return new BasicEList.UnmodifiableEList<DischargeMedication>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // HospitalDischargeMedicationsSectionEntriesOptionalOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeMedicationsSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeMedicationsSectionOperations.java
index 34659368f9..e183fff0ef 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeMedicationsSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeMedicationsSectionOperations.java
@@ -115,7 +115,7 @@ public static EList<DischargeMedication> getConsolDischargeMedications(
 		@SuppressWarnings("unchecked")
 		Collection<DischargeMedication> result = (Collection<DischargeMedication>) query.evaluate(
 			hospitalDischargeMedicationsSection);
-		return new BasicEList.UnmodifiableEList<DischargeMedication>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -137,7 +137,7 @@ public static EList<DischargeMedication> getConsolDischargeMedications(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -208,7 +208,7 @@ public static boolean validateHospitalDischargeMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -262,7 +262,7 @@ public static boolean validateHospitalDischargeMedicationsSectionEntriesOptional
 					"org.openhealthtools.mdht.uml.cda.consol.HospitalDischargeMedicationsSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.HospitalDischargeMedicationsSectionEntriesOptionalCodeP",
 						passToken);
@@ -296,7 +296,7 @@ public static boolean validateHospitalDischargeMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -377,7 +377,7 @@ public static boolean validateHospitalDischargeMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -448,7 +448,7 @@ public static boolean validateHospitalDischargeMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -519,7 +519,7 @@ public static boolean validateHospitalDischargeMedicationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_DISCHARGE_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_DISCHARGE_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargePhysicalSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargePhysicalSectionOperations.java
index 52be00638a..3bd38b395b 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargePhysicalSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargePhysicalSectionOperations.java
@@ -79,7 +79,7 @@ protected HospitalDischargePhysicalSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_PHYSICAL_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_PHYSICAL_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateHospitalDischargePhysicalSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_PHYSICAL_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_PHYSICAL_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateHospitalDischargePhysicalSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_PHYSICAL_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_PHYSICAL_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -291,7 +291,7 @@ public static boolean validateHospitalDischargePhysicalSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_PHYSICAL_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_PHYSICAL_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -361,7 +361,7 @@ public static boolean validateHospitalDischargePhysicalSectionTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_PHYSICAL_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_PHYSICAL_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeStudiesSummarySectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeStudiesSummarySectionOperations.java
index cb4eed3880..59f3c7c1c7 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeStudiesSummarySectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/HospitalDischargeStudiesSummarySectionOperations.java
@@ -79,7 +79,7 @@ protected HospitalDischargeStudiesSummarySectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_STUDIES_SUMMARY_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_STUDIES_SUMMARY_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateHospitalDischargeStudiesSummarySectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_STUDIES_SUMMARY_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_STUDIES_SUMMARY_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateHospitalDischargeStudiesSummarySectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_STUDIES_SUMMARY_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_STUDIES_SUMMARY_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -291,7 +291,7 @@ public static boolean validateHospitalDischargeStudiesSummarySectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_STUDIES_SUMMARY_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_STUDIES_SUMMARY_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -361,7 +361,7 @@ public static boolean validateHospitalDischargeStudiesSummarySectionTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_STUDIES_SUMMARY_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_HOSPITAL_DISCHARGE_STUDIES_SUMMARY_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationActivity2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationActivity2Operations.java
index f966d1dc06..f659433b5d 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationActivity2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationActivity2Operations.java
@@ -122,7 +122,7 @@ protected ImmunizationActivity2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -189,7 +189,7 @@ public static boolean validateImmunizationActivity2TemplateId(ImmunizationActivi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -239,7 +239,7 @@ public static boolean validateImmunizationActivityStatusCodeP(ImmunizationActivi
 					"org.openhealthtools.mdht.uml.cda.consol.ImmunizationActivityStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ImmunizationActivityStatusCodeP", passToken);
 				}
 				passToken.add(immunizationActivity2);
@@ -269,7 +269,7 @@ public static boolean validateImmunizationActivityStatusCodeP(ImmunizationActivi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -337,7 +337,7 @@ public static boolean validateImmunizationActivity2AuthorParticipation(Immunizat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY2_ENTRY_RELATIONSHIP_FOR_SUB_ADMIN_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY2_ENTRY_RELATIONSHIP_FOR_SUB_ADMIN_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -406,7 +406,7 @@ public static boolean validateImmunizationActivity2EntryRelationshipForSubAdminA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY2_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY2_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -480,7 +480,7 @@ public static boolean validateImmunizationActivity2EntryRelationshipTypeCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY2_ENTRY_RELATIONSHIP_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY2_ENTRY_RELATIONSHIP_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -554,7 +554,7 @@ public static boolean validateImmunizationActivity2EntryRelationshipInversionInd
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY2_ENTRY_RELATIONSHIP_SEQUENCE_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY2_ENTRY_RELATIONSHIP_SEQUENCE_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -628,7 +628,7 @@ public static boolean validateImmunizationActivity2EntryRelationshipSequenceNumb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY2_ENTRY_RELATIONSHIP_SUBSTANCE_ADMINISTERED_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY2_ENTRY_RELATIONSHIP_SUBSTANCE_ADMINISTERED_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -702,7 +702,7 @@ public static boolean validateImmunizationActivity2EntryRelationshipSubstanceAdm
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY2_CE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY2_CE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -755,7 +755,7 @@ public static boolean validateImmunizationActivity2CETranslationP(ImmunizationAc
 						"org.openhealthtools.mdht.uml.cda.consol.ImmunizationActivity2CETranslationP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.ImmunizationActivity2CETranslationP", passToken);
 					}
@@ -789,7 +789,7 @@ public static boolean validateImmunizationActivity2CETranslationP(ImmunizationAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY2_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY2_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -895,7 +895,7 @@ public static EList<DrugVehicle> getConsolDrugVehicles(ImmunizationActivity2 imm
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_DRUG_VEHICLES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<DrugVehicle> result = (Collection<DrugVehicle>) query.evaluate(immunizationActivity2);
-		return new BasicEList.UnmodifiableEList<DrugVehicle>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -942,7 +942,7 @@ public static EList<Indication2> getConsolIndication2s(ImmunizationActivity2 imm
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_INDICATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication2> result = (Collection<Indication2>) query.evaluate(immunizationActivity2);
-		return new BasicEList.UnmodifiableEList<Indication2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1147,7 +1147,7 @@ public static Instruction2 getConsolInstruction2(ImmunizationActivity2 immunizat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1214,7 +1214,7 @@ public static boolean validateImmunizationActivityTextReference(ImmunizationActi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1281,7 +1281,7 @@ public static boolean validateImmunizationActivityReferenceValue(ImmunizationAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1348,7 +1348,7 @@ public static boolean validateImmunizationActivityTextReferenceValue(Immunizatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_INSTRUCTION_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_INSTRUCTION_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1589,7 +1589,7 @@ public static boolean validateImmunizationActivityAdministrationUnitCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ImmunizationActivityAdministrationUnitCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ImmunizationActivityAdministrationUnitCodeP",
 						passToken);
@@ -1749,7 +1749,7 @@ public static boolean validateImmunizationActivityRouteCodeP(ImmunizationActivit
 					"org.openhealthtools.mdht.uml.cda.consol.ImmunizationActivityRouteCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ImmunizationActivityRouteCodeP", passToken);
 				}
 				passToken.add(immunizationActivity2);
@@ -1832,7 +1832,7 @@ public static boolean validateImmunizationActivityRouteCode(ImmunizationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityStatusCode(ImmunizationActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Status Code</em>}' operation.
@@ -1855,7 +1855,7 @@ public static boolean validateImmunizationActivityRouteCode(ImmunizationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityRepeatNumber(ImmunizationActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Repeat Number</em>}' operation.
@@ -1876,7 +1876,7 @@ public static boolean validateImmunizationActivityRouteCode(ImmunizationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityAdministrationUnitCodeP(ImmunizationActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Administration Unit Code P</em>}' operation.
@@ -1897,7 +1897,7 @@ public static boolean validateImmunizationActivityRouteCode(ImmunizationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_ADMINISTRATION_UNIT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_ADMINISTRATION_UNIT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityAdministrationUnitCode(ImmunizationActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Administration Unit Code</em>}' operation.
@@ -1920,7 +1920,7 @@ public static boolean validateImmunizationActivityRouteCode(ImmunizationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_ADMINISTRATION_UNIT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_ADMINISTRATION_UNIT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityText(ImmunizationActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Text</em>}' operation.
@@ -1941,7 +1941,7 @@ public static boolean validateImmunizationActivityRouteCode(ImmunizationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityRouteCodeP(ImmunizationActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Route Code P</em>}' operation.
@@ -1962,7 +1962,7 @@ public static boolean validateImmunizationActivityRouteCode(ImmunizationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_ROUTE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_ROUTE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityRouteCode(ImmunizationActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Route Code</em>}' operation.
@@ -1985,7 +1985,7 @@ public static boolean validateImmunizationActivityRouteCode(ImmunizationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_ROUTE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_ROUTE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityDrugVehicle(ImmunizationActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Drug Vehicle</em>}' operation.
@@ -2006,7 +2006,7 @@ public static boolean validateImmunizationActivityRouteCode(ImmunizationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_DRUG_VEHICLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_DRUG_VEHICLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2073,7 +2073,7 @@ public static boolean validateImmunizationActivityDrugVehicle(ImmunizationActivi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2139,7 +2139,7 @@ public static boolean validateImmunizationActivityIndication(ImmunizationActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_MEDICATION_SUPPLY_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_MEDICATION_SUPPLY_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2207,7 +2207,7 @@ public static boolean validateImmunizationActivityMedicationSupplyOrder(Immuniza
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_MEDICATION_DISPENSE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_MEDICATION_DISPENSE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2274,7 +2274,7 @@ public static boolean validateImmunizationActivityMedicationDispense(Immunizatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_REACTION_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_REACTION_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2341,7 +2341,7 @@ public static boolean validateImmunizationActivityReactionObservation(Immunizati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2408,7 +2408,7 @@ public static boolean validateImmunizationActivityInstructions(ImmunizationActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_CONSUMABLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_CONSUMABLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2474,7 +2474,7 @@ public static boolean validateImmunizationActivityConsumable(ImmunizationActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_PRECONDITION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_PRECONDITION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2541,7 +2541,7 @@ public static boolean validateImmunizationActivityPrecondition(ImmunizationActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY_CONSUMABLE_IMMUNIZATION_MEDICATION_INFORMATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY_CONSUMABLE_IMMUNIZATION_MEDICATION_INFORMATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2615,7 +2615,7 @@ public static boolean validateImmunizationActivityConsumableImmunizationMedicati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY_PRECONDITION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY_PRECONDITION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2688,7 +2688,7 @@ public static boolean validateImmunizationActivityPreconditionTypeCode(Immunizat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY_PRECONDITION_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY_PRECONDITION_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationActivityOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationActivityOperations.java
index 485e9cd7c1..54310016ca 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationActivityOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationActivityOperations.java
@@ -129,7 +129,7 @@ protected ImmunizationActivityOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -196,7 +196,7 @@ public static boolean validateImmunizationActivityTextReference(ImmunizationActi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -263,7 +263,7 @@ public static boolean validateImmunizationActivityReferenceValue(ImmunizationAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -330,7 +330,7 @@ public static boolean validateImmunizationActivityTextReferenceValue(Immunizatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_DOSE_QUANTITY_UNIT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_DOSE_QUANTITY_UNIT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -397,7 +397,7 @@ public static boolean validateImmunizationActivityDoseQuantityUnit(ImmunizationA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_INSTRUCTION_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_INSTRUCTION_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -464,7 +464,7 @@ public static boolean validateImmunizationActivityInstructionInversion(Immunizat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_DRUG_VEHICLE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_DRUG_VEHICLE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -638,7 +638,7 @@ public static boolean validateImmunizationActivityPreconditionPreconditionForSub
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -704,7 +704,7 @@ public static boolean validateImmunizationActivityTemplateId(ImmunizationActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -772,7 +772,7 @@ public static boolean validateImmunizationActivityClassCode(ImmunizationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1046,7 +1046,7 @@ public static boolean validateImmunizationActivityRouteCodeP(ImmunizationActivit
 					"org.openhealthtools.mdht.uml.cda.consol.ImmunizationActivityRouteCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ImmunizationActivityRouteCodeP", passToken);
 				}
 				passToken.add(immunizationActivity);
@@ -1267,7 +1267,7 @@ public static boolean validateImmunizationActivityDoseQuantity(ImmunizationActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_NEGATION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_NEGATION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityId(ImmunizationActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Id</em>}' operation.
@@ -1288,7 +1288,7 @@ public static boolean validateImmunizationActivityDoseQuantity(ImmunizationActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityCode(ImmunizationActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Code</em>}' operation.
@@ -1309,7 +1309,7 @@ public static boolean validateImmunizationActivityDoseQuantity(ImmunizationActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1376,7 +1376,7 @@ public static boolean validateImmunizationActivityNegationInd(ImmunizationActivi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityStatusCode(ImmunizationActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Status Code</em>}' operation.
@@ -1397,7 +1397,7 @@ public static boolean validateImmunizationActivityNegationInd(ImmunizationActivi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityEffectiveTime(ImmunizationActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Effective Time</em>}' operation.
@@ -1418,7 +1418,7 @@ public static boolean validateImmunizationActivityNegationInd(ImmunizationActivi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1483,7 +1483,7 @@ public static boolean validateImmunizationActivityText(ImmunizationActivity immu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityRouteCodeP(ImmunizationActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Route Code P</em>}' operation.
@@ -1504,7 +1504,7 @@ public static boolean validateImmunizationActivityText(ImmunizationActivity immu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_ROUTE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_ROUTE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityRouteCode(ImmunizationActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Route Code</em>}' operation.
@@ -1527,7 +1527,7 @@ public static boolean validateImmunizationActivityText(ImmunizationActivity immu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_ROUTE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_ROUTE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityApproachSiteCode(ImmunizationActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Approach Site Code</em>}' operation.
@@ -1550,7 +1550,7 @@ public static boolean validateImmunizationActivityText(ImmunizationActivity immu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_APPROACH_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_APPROACH_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityApproachSiteCodeP(ImmunizationActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Approach Site Code P</em>}' operation.
@@ -1571,7 +1571,7 @@ public static boolean validateImmunizationActivityText(ImmunizationActivity immu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_APPROACH_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_APPROACH_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityDoseQuantity(ImmunizationActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Dose Quantity</em>}' operation.
@@ -1592,7 +1592,7 @@ public static boolean validateImmunizationActivityText(ImmunizationActivity immu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_DOSE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_DOSE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1659,7 +1659,7 @@ public static boolean validateImmunizationActivityRepeatNumber(ImmunizationActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_ADMINISTRATION_UNIT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_ADMINISTRATION_UNIT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1710,7 +1710,7 @@ public static boolean validateImmunizationActivityAdministrationUnitCodeP(Immuni
 					"org.openhealthtools.mdht.uml.cda.consol.ImmunizationActivityAdministrationUnitCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ImmunizationActivityAdministrationUnitCodeP",
 						passToken);
@@ -1744,7 +1744,7 @@ public static boolean validateImmunizationActivityAdministrationUnitCodeP(Immuni
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_ADMINISTRATION_UNIT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_ADMINISTRATION_UNIT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1820,7 +1820,7 @@ public static boolean validateImmunizationActivityAdministrationUnitCode(Immuniz
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_DRUG_VEHICLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_DRUG_VEHICLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1887,7 +1887,7 @@ public static boolean validateImmunizationActivityDrugVehicle(ImmunizationActivi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1953,7 +1953,7 @@ public static boolean validateImmunizationActivityIndication(ImmunizationActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2020,7 +2020,7 @@ public static boolean validateImmunizationActivityInstructions(ImmunizationActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_MEDICATION_DISPENSE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_MEDICATION_DISPENSE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2087,7 +2087,7 @@ public static boolean validateImmunizationActivityMedicationDispense(Immunizatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_REACTION_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_REACTION_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2200,7 +2200,7 @@ public static boolean validateImmunizationActivityPrecondition(ImmunizationActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_IMMUNIZATION_REFUSAL_REASON__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_IMMUNIZATION_REFUSAL_REASON__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2268,7 +2268,7 @@ public static boolean validateImmunizationActivityImmunizationRefusalReason(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_CONSUMABLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_CONSUMABLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2334,7 +2334,7 @@ public static boolean validateImmunizationActivityConsumable(ImmunizationActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2400,7 +2400,7 @@ public static boolean validateImmunizationActivityPerformer(ImmunizationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_MEDICATION_SUPPLY_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_MEDICATION_SUPPLY_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityPrecondition(ImmunizationActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Precondition</em>}' operation.
@@ -2421,7 +2421,7 @@ public static boolean validateImmunizationActivityPerformer(ImmunizationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_PRECONDITION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_ACTIVITY_PRECONDITION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2489,7 +2489,7 @@ public static boolean validateImmunizationActivityMedicationSupplyOrder(Immuniza
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY_CONSUMABLE_IMMUNIZATION_MEDICATION_INFORMATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY_CONSUMABLE_IMMUNIZATION_MEDICATION_INFORMATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityPreconditionTypeCode(ImmunizationActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Precondition Type Code</em>}' operation.
@@ -2510,7 +2510,7 @@ public static boolean validateImmunizationActivityMedicationSupplyOrder(Immuniza
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY_PRECONDITION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY_PRECONDITION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationActivityPreconditionPreconditionForSubstanceAdministration(ImmunizationActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Activity Precondition Precondition For Substance Administration</em>}' operation.
@@ -2531,7 +2531,7 @@ public static boolean validateImmunizationActivityMedicationSupplyOrder(Immuniza
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY_PRECONDITION_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_ACTIVITY_PRECONDITION_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationMedicationInformation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationMedicationInformation2Operations.java
index d5098e352a..2be55d1fc1 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationMedicationInformation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationMedicationInformation2Operations.java
@@ -87,7 +87,7 @@ protected ImmunizationMedicationInformation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -157,7 +157,7 @@ public static boolean validateImmunizationMedicationInformation2TemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION2_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION2_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -215,7 +215,7 @@ public static boolean validateImmunizationMedicationInformation2ImmunizationMedi
 						"org.openhealthtools.mdht.uml.cda.consol.ImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslationP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.ImmunizationMedicationInformation2ImmunizationMedicationInformationManufacturedMaterialCETranslationP",
 							passToken);
@@ -250,7 +250,7 @@ public static boolean validateImmunizationMedicationInformation2ImmunizationMedi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION2_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION2_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -337,7 +337,7 @@ public static boolean validateImmunizationMedicationInformation2ImmunizationMedi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -451,7 +451,7 @@ public static boolean validateImmunizationMedicationInformationImmunizationMedic
 						"org.openhealthtools.mdht.uml.cda.consol.ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.ImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeP",
 							passToken);
@@ -702,7 +702,7 @@ public static boolean validateImmunizationMedicationInformationImmunizationMedic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationMedicationInformationManufacturedMaterial(ImmunizationMedicationInformation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Medication Information Manufactured Material</em>}' operation.
@@ -723,7 +723,7 @@ public static boolean validateImmunizationMedicationInformationImmunizationMedic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeOriginalText(ImmunizationMedicationInformation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Medication Information Immunization Medication Information Manufactured Material Code Original Text</em>}' operation.
@@ -744,7 +744,7 @@ public static boolean validateImmunizationMedicationInformationImmunizationMedic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialOriginalTextReference(ImmunizationMedicationInformation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Medication Information Immunization Medication Information Manufactured Material Original Text Reference</em>}' operation.
@@ -765,7 +765,7 @@ public static boolean validateImmunizationMedicationInformationImmunizationMedic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialTextReferenceValue(ImmunizationMedicationInformation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Medication Information Immunization Medication Information Manufactured Material Text Reference Value</em>}' operation.
@@ -786,7 +786,7 @@ public static boolean validateImmunizationMedicationInformationImmunizationMedic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateImmunizationMedicationInformationImmunizationMedicationInformationManufacturedMaterialCodeTranslation(ImmunizationMedicationInformation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Immunization Medication Information Immunization Medication Information Manufactured Material Code Translation</em>}' operation.
@@ -807,7 +807,7 @@ public static boolean validateImmunizationMedicationInformationImmunizationMedic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -886,7 +886,7 @@ public static boolean validateImmunizationMedicationInformationImmunizationMedic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -973,7 +973,7 @@ public static boolean validateImmunizationMedicationInformationImmunizationMedic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_LOT_NUMBER_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_LOT_NUMBER_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationMedicationInformationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationMedicationInformationOperations.java
index b447d3d896..90cc2daf92 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationMedicationInformationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationMedicationInformationOperations.java
@@ -90,7 +90,7 @@ protected ImmunizationMedicationInformationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -160,7 +160,7 @@ public static boolean validateImmunizationMedicationInformationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -230,7 +230,7 @@ public static boolean validateImmunizationMedicationInformationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -300,7 +300,7 @@ public static boolean validateImmunizationMedicationInformationId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURER_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURER_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -371,7 +371,7 @@ public static boolean validateImmunizationMedicationInformationManufacturerOrgan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -441,7 +441,7 @@ public static boolean validateImmunizationMedicationInformationManufacturedMater
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -518,7 +518,7 @@ public static boolean validateImmunizationMedicationInformationImmunizationMedic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -595,7 +595,7 @@ public static boolean validateImmunizationMedicationInformationImmunizationMedic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -672,7 +672,7 @@ public static boolean validateImmunizationMedicationInformationImmunizationMedic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -751,7 +751,7 @@ public static boolean validateImmunizationMedicationInformationImmunizationMedic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -828,7 +828,7 @@ public static boolean validateImmunizationMedicationInformationImmunizationMedic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_LOT_NUMBER_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_IMMUNIZATION_MEDICATION_INFORMATION_IMMUNIZATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_LOT_NUMBER_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationRefusalReasonOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationRefusalReasonOperations.java
index 6c82cb6773..ea4afddd3a 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationRefusalReasonOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationRefusalReasonOperations.java
@@ -80,7 +80,7 @@ protected ImmunizationRefusalReasonOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_REFUSAL_REASON_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_REFUSAL_REASON_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateImmunizationRefusalReasonTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_REFUSAL_REASON_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_REFUSAL_REASON_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -218,7 +218,7 @@ public static boolean validateImmunizationRefusalReasonClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_REFUSAL_REASON_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_REFUSAL_REASON_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -284,7 +284,7 @@ public static boolean validateImmunizationRefusalReasonCode(ImmunizationRefusalR
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_REFUSAL_REASON_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_REFUSAL_REASON_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -350,7 +350,7 @@ public static boolean validateImmunizationRefusalReasonId(ImmunizationRefusalRea
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_REFUSAL_REASON_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_REFUSAL_REASON_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -418,7 +418,7 @@ public static boolean validateImmunizationRefusalReasonMoodCode(ImmunizationRefu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_REFUSAL_REASON_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATION_REFUSAL_REASON_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationsSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationsSection2Operations.java
index d8505b5ea6..3ed3494c91 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationsSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationsSection2Operations.java
@@ -83,7 +83,7 @@ protected ImmunizationsSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -150,7 +150,7 @@ public static boolean validateImmunizationsSection2NullFlavor(ImmunizationsSecti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -215,7 +215,7 @@ public static boolean validateImmunizationsSection2Title(ImmunizationsSection2 i
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -280,7 +280,7 @@ public static boolean validateImmunizationsSection2Text(ImmunizationsSection2 im
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -348,7 +348,7 @@ public static boolean validateImmunizationsSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -399,7 +399,7 @@ public static boolean validateImmunizationsSectionEntriesOptionalCodeP(Immunizat
 					"org.openhealthtools.mdht.uml.cda.consol.ImmunizationsSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ImmunizationsSectionEntriesOptionalCodeP", passToken);
 				}
@@ -432,7 +432,7 @@ public static boolean validateImmunizationsSectionEntriesOptionalCodeP(Immunizat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -507,7 +507,7 @@ public static boolean validateImmunizationsSectionEntriesOptionalCode(Immunizati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_IMMUNIZATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_IMMUNIZATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -604,7 +604,7 @@ public static EList<ImmunizationActivity2> getConsolImmunizationActivity2s(
 		@SuppressWarnings("unchecked")
 		Collection<ImmunizationActivity2> result = (Collection<ImmunizationActivity2>) query.evaluate(
 			immunizationsSection2);
-		return new BasicEList.UnmodifiableEList<ImmunizationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // ImmunizationsSection2Operations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationsSectionEntriesOptional2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationsSectionEntriesOptional2Operations.java
index 7bb9e1676d..caea7643d4 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationsSectionEntriesOptional2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationsSectionEntriesOptional2Operations.java
@@ -108,7 +108,7 @@ public static EList<ImmunizationActivity2> getConsolImmunizationActivity2s(
 		@SuppressWarnings("unchecked")
 		Collection<ImmunizationActivity2> result = (Collection<ImmunizationActivity2>) query.evaluate(
 			immunizationsSectionEntriesOptional2);
-		return new BasicEList.UnmodifiableEList<ImmunizationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -130,7 +130,7 @@ public static EList<ImmunizationActivity2> getConsolImmunizationActivity2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -200,7 +200,7 @@ public static boolean validateImmunizationsSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -253,7 +253,7 @@ public static boolean validateImmunizationsSectionEntriesOptionalCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ImmunizationsSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ImmunizationsSectionEntriesOptionalCodeP", passToken);
 				}
@@ -286,7 +286,7 @@ public static boolean validateImmunizationsSectionEntriesOptionalCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -365,7 +365,7 @@ public static boolean validateImmunizationsSectionEntriesOptionalCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_IMMUNIZATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_IMMUNIZATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationsSectionEntriesOptionalOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationsSectionEntriesOptionalOperations.java
index 2bcb274734..18aba11857 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationsSectionEntriesOptionalOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationsSectionEntriesOptionalOperations.java
@@ -87,7 +87,7 @@ protected ImmunizationsSectionEntriesOptionalOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -159,7 +159,7 @@ public static boolean validateImmunizationsSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -229,7 +229,7 @@ public static boolean validateImmunizationsSectionEntriesOptionalCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -299,7 +299,7 @@ public static boolean validateImmunizationsSectionEntriesOptionalCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -369,7 +369,7 @@ public static boolean validateImmunizationsSectionEntriesOptionalTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -439,7 +439,7 @@ public static boolean validateImmunizationsSectionEntriesOptionalText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_IMMUNIZATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_IMMUNIZATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -537,7 +537,7 @@ public static EList<ImmunizationActivity> getImmunizationActivities(
 		@SuppressWarnings("unchecked")
 		Collection<ImmunizationActivity> result = (Collection<ImmunizationActivity>) query.evaluate(
 			immunizationsSectionEntriesOptional);
-		return new BasicEList.UnmodifiableEList<ImmunizationActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // ImmunizationsSectionEntriesOptionalOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationsSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationsSectionOperations.java
index 9daed51358..84ea1b454f 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationsSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImmunizationsSectionOperations.java
@@ -86,7 +86,7 @@ protected ImmunizationsSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateImmunizationsSectionTitle(ImmunizationsSection imm
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -216,7 +216,7 @@ public static boolean validateImmunizationsSectionText(ImmunizationsSection immu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_IMMUNIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_IMMUNIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -309,7 +309,7 @@ public static EList<ImmunizationActivity> getImmunizations(ImmunizationsSection
 		@SuppressWarnings("unchecked")
 		Collection<ImmunizationActivity> result = (Collection<ImmunizationActivity>) query.evaluate(
 			immunizationsSection);
-		return new BasicEList.UnmodifiableEList<ImmunizationActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -331,7 +331,7 @@ public static EList<ImmunizationActivity> getImmunizations(ImmunizationsSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -399,7 +399,7 @@ public static boolean validateImmunizationsSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -449,7 +449,7 @@ public static boolean validateImmunizationsSectionEntriesOptionalCodeP(Immunizat
 					"org.openhealthtools.mdht.uml.cda.consol.ImmunizationsSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ImmunizationsSectionEntriesOptionalCodeP", passToken);
 				}
@@ -482,7 +482,7 @@ public static boolean validateImmunizationsSectionEntriesOptionalCodeP(Immunizat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImplantableDeviceStatusObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImplantableDeviceStatusObservationOperations.java
index b523e34554..8c729c5095 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImplantableDeviceStatusObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ImplantableDeviceStatusObservationOperations.java
@@ -82,7 +82,7 @@ protected ImplantableDeviceStatusObservationOperations() {
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_IMPLANTABLE_DEVICE_STATUS_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMPLANTABLE_DEVICE_STATUS_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -150,7 +150,7 @@ public static boolean validateImplantableDeviceStatusObservationTemplateId(
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_IMPLANTABLE_DEVICE_STATUS_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMPLANTABLE_DEVICE_STATUS_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -202,7 +202,7 @@ public static boolean validateImplantableDeviceStatusObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ImplantableDeviceStatusObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ImplantableDeviceStatusObservationCodeP", passToken);
 				}
@@ -234,7 +234,7 @@ public static boolean validateImplantableDeviceStatusObservationCodeP(
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_IMPLANTABLE_DEVICE_STATUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMPLANTABLE_DEVICE_STATUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -313,7 +313,7 @@ public static boolean validateImplantableDeviceStatusObservationCode(
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_IMPLANTABLE_DEVICE_STATUS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMPLANTABLE_DEVICE_STATUS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -381,7 +381,7 @@ public static boolean validateImplantableDeviceStatusObservationValue(
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_IMPLANTABLE_DEVICE_STATUS_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_IMPLANTABLE_DEVICE_STATUS_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/Indication2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/Indication2Operations.java
index 7887fecef6..a3a8b6edf6 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/Indication2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/Indication2Operations.java
@@ -79,7 +79,7 @@ protected Indication2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_PROBLEM_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_PROBLEM_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -144,7 +144,7 @@ public static boolean validateIndicationProblemIndication(Indication2 indication
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_CODE_NULL_FLAVOR_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_CODE_NULL_FLAVOR_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -209,7 +209,7 @@ public static boolean validateIndicationCodeNullFlavorValue(Indication2 indicati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -274,7 +274,7 @@ public static boolean validateIndication2TemplateId(Indication2 indication2, Dia
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_CODE_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_CODE_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -365,7 +365,7 @@ public static boolean validateIndicationCodeP(Indication2 indication2, Diagnosti
 					"org.openhealthtools.mdht.uml.cda.consol.IndicationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.IndicationCodeP", passToken);
 				}
 				passToken.add(indication2);
@@ -446,7 +446,7 @@ public static boolean validateIndicationCode(Indication2 indication2, Diagnostic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateIndicationCodeP(Indication2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Indication Code P</em>}' operation.
@@ -467,7 +467,7 @@ public static boolean validateIndicationCode(Indication2 indication2, Diagnostic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateIndicationCode(Indication2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Indication Code</em>}' operation.
@@ -490,7 +490,7 @@ public static boolean validateIndicationCode(Indication2 indication2, Diagnostic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -553,7 +553,7 @@ public static boolean validateIndicationId(Indication2 indication2, DiagnosticCh
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -600,7 +600,7 @@ public static boolean validateIndicationValueP(Indication2 indication2, Diagnost
 					"org.openhealthtools.mdht.uml.cda.consol.IndicationValueP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.IndicationValueP", passToken);
 				}
 				passToken.add(indication2);
@@ -632,7 +632,7 @@ public static boolean validateIndicationValueP(Indication2 indication2, Diagnost
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/IndicationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/IndicationOperations.java
index 21f019a979..6bc1de8e64 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/IndicationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/IndicationOperations.java
@@ -86,7 +86,7 @@ protected IndicationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_CODE_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_CODE_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateIndicationCodeNullFlavor(Indication indication, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -216,7 +216,7 @@ public static boolean validateIndicationTemplateId(Indication indication, Diagno
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -280,7 +280,7 @@ public static boolean validateIndicationClassCode(Indication indication, Diagnos
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -344,7 +344,7 @@ public static boolean validateIndicationMoodCode(Indication indication, Diagnost
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -407,7 +407,7 @@ public static boolean validateIndicationId(Indication indication, DiagnosticChai
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -454,7 +454,7 @@ public static boolean validateIndicationCodeP(Indication indication, DiagnosticC
 					"org.openhealthtools.mdht.uml.cda.consol.IndicationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.IndicationCodeP", passToken);
 				}
 				passToken.add(indication);
@@ -486,7 +486,7 @@ public static boolean validateIndicationCodeP(Indication indication, DiagnosticC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -559,7 +559,7 @@ public static boolean validateIndicationCode(Indication indication, DiagnosticCh
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -624,7 +624,7 @@ public static boolean validateIndicationStatusCode(Indication indication, Diagno
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -691,7 +691,7 @@ public static boolean validateIndicationEffectiveTime(Indication indication, Dia
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -755,7 +755,7 @@ public static boolean validateIndicationValue(Indication indication, DiagnosticC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INDICATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/Instruction2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/Instruction2Operations.java
index db55d06424..eca01c5172 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/Instruction2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/Instruction2Operations.java
@@ -71,7 +71,7 @@ protected Instruction2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -136,7 +136,7 @@ public static boolean validateInstruction2TemplateId(Instruction2 instruction2,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InstructionsOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InstructionsOperations.java
index 6a2c993f6c..5558766f01 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InstructionsOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InstructionsOperations.java
@@ -85,7 +85,7 @@ protected InstructionsOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -150,7 +150,7 @@ public static boolean validateInstructionsTextReference(Instructions instruction
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -215,7 +215,7 @@ public static boolean validateInstructionsReferenceValue(Instructions instructio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -280,7 +280,7 @@ public static boolean validateInstructionsTextReferenceValue(Instructions instru
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -345,7 +345,7 @@ public static boolean validateInstructionsTemplateId(Instructions instructions,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -410,7 +410,7 @@ public static boolean validateInstructionsClassCode(Instructions instructions, D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -475,7 +475,7 @@ public static boolean validateInstructionsMoodCode(Instructions instructions, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -523,7 +523,7 @@ public static boolean validateInstructionsCodeP(Instructions instructions, Diagn
 					"org.openhealthtools.mdht.uml.cda.consol.InstructionsCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.InstructionsCodeP", passToken);
 				}
 				passToken.add(instructions);
@@ -555,7 +555,7 @@ public static boolean validateInstructionsCodeP(Instructions instructions, Diagn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -628,7 +628,7 @@ public static boolean validateInstructionsCode(Instructions instructions, Diagno
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -694,7 +694,7 @@ public static boolean validateInstructionsText(Instructions instructions, Diagno
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InstructionsSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InstructionsSection2Operations.java
index 8711b024c9..7212005085 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InstructionsSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InstructionsSection2Operations.java
@@ -81,7 +81,7 @@ protected InstructionsSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -147,7 +147,7 @@ public static boolean validateInstructionsSection2TemplateId(InstructionsSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -238,7 +238,7 @@ public static EList<Instruction2> getConsolInstruction2s(InstructionsSection2 in
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_INSTRUCTION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Instruction2> result = (Collection<Instruction2>) query.evaluate(instructionsSection2);
-		return new BasicEList.UnmodifiableEList<Instruction2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -260,7 +260,7 @@ public static EList<Instruction2> getConsolInstruction2s(InstructionsSection2 in
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -308,7 +308,7 @@ public static boolean validateInstructionsSectionCodeP(InstructionsSection2 inst
 					"org.openhealthtools.mdht.uml.cda.consol.InstructionsSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.InstructionsSectionCodeP", passToken);
 				}
 				passToken.add(instructionsSection2);
@@ -340,7 +340,7 @@ public static boolean validateInstructionsSectionCodeP(InstructionsSection2 inst
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -413,7 +413,7 @@ public static boolean validateInstructionsSectionCode(InstructionsSection2 instr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InstructionsSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InstructionsSectionOperations.java
index 98973b004e..376b515d79 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InstructionsSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InstructionsSectionOperations.java
@@ -87,7 +87,7 @@ protected InstructionsSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -155,7 +155,7 @@ public static boolean validateInstructionsSectionTemplateId(InstructionsSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -220,7 +220,7 @@ public static boolean validateInstructionsSectionCode(InstructionsSection instru
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -329,7 +329,7 @@ public static boolean validateInstructionsSectionText(InstructionsSection instru
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateInstructionsSectionText(InstructionsSection, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Instructions Section Text</em>}' operation.
@@ -350,7 +350,7 @@ public static boolean validateInstructionsSectionText(InstructionsSection instru
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -415,7 +415,7 @@ public static boolean validateInstructionsSectionTitle(InstructionsSection instr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INSTRUCTIONS_SECTION_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -506,7 +506,7 @@ public static EList<Instructions> getInstructionss(InstructionsSection instructi
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INSTRUCTIONSS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Instructions> result = (Collection<Instructions>) query.evaluate(instructionsSection);
-		return new BasicEList.UnmodifiableEList<Instructions>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // InstructionsSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InterventionActOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InterventionActOperations.java
index 7a15c193e9..f2b452a88b 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InterventionActOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InterventionActOperations.java
@@ -132,7 +132,7 @@ protected InterventionActOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -197,7 +197,7 @@ public static boolean validateInterventionActTemplateId(InterventionAct interven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -262,7 +262,7 @@ public static boolean validateInterventionActClassCode(InterventionAct intervent
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -327,7 +327,7 @@ public static boolean validateInterventionActMoodCode(InterventionAct interventi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -392,7 +392,7 @@ public static boolean validateInterventionActId(InterventionAct interventionAct,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -440,7 +440,7 @@ public static boolean validateInterventionActCodeP(InterventionAct interventionA
 					"org.openhealthtools.mdht.uml.cda.consol.InterventionActCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.InterventionActCodeP", passToken);
 				}
 				passToken.add(interventionAct);
@@ -472,7 +472,7 @@ public static boolean validateInterventionActCodeP(InterventionAct interventionA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -546,7 +546,7 @@ public static boolean validateInterventionActCode(InterventionAct interventionAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -611,7 +611,7 @@ public static boolean validateInterventionActStatusCode(InterventionAct interven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -676,7 +676,7 @@ public static boolean validateInterventionActStatusCodeP(InterventionAct interve
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -741,7 +741,7 @@ public static boolean validateInterventionActEffectiveTime(InterventionAct inter
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_INTERVENTION_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_INTERVENTION_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -806,7 +806,7 @@ public static boolean validateInterventionActInterventionAct(InterventionAct int
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_NUTRITION_RECOMMENDATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_NUTRITION_RECOMMENDATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -873,7 +873,7 @@ public static boolean validateInterventionActNutritionRecommendation(Interventio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_INTERVENTION_ENTRY_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_INTERVENTION_ENTRY_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -940,7 +940,7 @@ public static boolean validateInterventionActInterventionEntryReference(Interven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_GOAL_OBS_ENTRY_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_GOAL_OBS_ENTRY_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1007,7 +1007,7 @@ public static boolean validateInterventionActGoalObsEntryReference(InterventionA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1074,7 +1074,7 @@ public static boolean validateInterventionActAuthorParticipation(InterventionAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_ADVANCE_DIRECTIVE_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_ADVANCE_DIRECTIVE_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1141,7 +1141,7 @@ public static boolean validateInterventionActAdvanceDirectiveObservation2(Interv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_IMMUNIZATION_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_IMMUNIZATION_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1208,7 +1208,7 @@ public static boolean validateInterventionActImmunizationActivity2(InterventionA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_MEDICATION_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_MEDICATION_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1275,7 +1275,7 @@ public static boolean validateInterventionActMedicationActivity2(InterventionAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_PROCEDURE_ACTIVITY_ACT2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_PROCEDURE_ACTIVITY_ACT2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1342,7 +1342,7 @@ public static boolean validateInterventionActProcedureActivityAct2(InterventionA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_PROCEDURE_ACTIVITY_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_PROCEDURE_ACTIVITY_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1409,7 +1409,7 @@ public static boolean validateInterventionActProcedureActivityObservation2(Inter
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_PROCEDURE_ACTIVITY_PROCEDURE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_PROCEDURE_ACTIVITY_PROCEDURE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1476,7 +1476,7 @@ public static boolean validateInterventionActProcedureActivityProcedure2(Interve
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_ENCOUNTER_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_ENCOUNTER_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1543,7 +1543,7 @@ public static boolean validateInterventionActEncounterActivity2(InterventionAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_NON_MEDICINAL_SUPPLY_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_NON_MEDICINAL_SUPPLY_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1610,7 +1610,7 @@ public static boolean validateInterventionActNonMedicinalSupplyActivity2(Interve
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_INSTRUCTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_INSTRUCTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1675,7 +1675,7 @@ public static boolean validateInterventionActInstruction2(InterventionAct interv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_HANDOFF_COMMUNICATION_PARTICIPANTS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_HANDOFF_COMMUNICATION_PARTICIPANTS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1743,7 +1743,7 @@ public static boolean validateInterventionActHandoffCommunicationParticipants(In
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_PLANNED_INTERVENTION_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_PLANNED_INTERVENTION_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1810,7 +1810,7 @@ public static boolean validateInterventionActPlannedInterventionAct(Intervention
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTION_ACT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1875,7 +1875,7 @@ public static boolean validateInterventionActReference(InterventionAct intervent
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_INTERVENTION_ACT_REFERENCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_INTERVENTION_ACT_REFERENCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1947,7 +1947,7 @@ public static boolean validateInterventionActReferenceTypeCode(InterventionAct i
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_INTERVENTION_ACT_REFERENCE_EXTERNAL_DOCUMENT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_INTERVENTION_ACT_REFERENCE_EXTERNAL_DOCUMENT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2045,7 +2045,7 @@ public static EList<InterventionAct> getInterventionActs(InterventionAct interve
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INTERVENTION_ACTS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<InterventionAct> result = (Collection<InterventionAct>) query.evaluate(interventionAct);
-		return new BasicEList.UnmodifiableEList<InterventionAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2093,7 +2093,7 @@ public static EList<NutritionRecommendation> getNutritionRecommendations(Interve
 		@SuppressWarnings("unchecked")
 		Collection<NutritionRecommendation> result = (Collection<NutritionRecommendation>) query.evaluate(
 			interventionAct);
-		return new BasicEList.UnmodifiableEList<NutritionRecommendation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2141,7 +2141,7 @@ public static EList<EntryReference> getInterventionEntryReferences(InterventionA
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INTERVENTION_ENTRY_REFERENCES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EntryReference> result = (Collection<EntryReference>) query.evaluate(interventionAct);
-		return new BasicEList.UnmodifiableEList<EntryReference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2191,7 +2191,7 @@ public static EList<AdvanceDirectiveObservation2> getAdvanceDirectiveObservation
 		@SuppressWarnings("unchecked")
 		Collection<AdvanceDirectiveObservation2> result = (Collection<AdvanceDirectiveObservation2>) query.evaluate(
 			interventionAct);
-		return new BasicEList.UnmodifiableEList<AdvanceDirectiveObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2238,7 +2238,7 @@ public static EList<ImmunizationActivity2> getImmunizationActivity2s(Interventio
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_IMMUNIZATION_ACTIVITY2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ImmunizationActivity2> result = (Collection<ImmunizationActivity2>) query.evaluate(interventionAct);
-		return new BasicEList.UnmodifiableEList<ImmunizationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2285,7 +2285,7 @@ public static EList<MedicationActivity2> getMedicationActivity2s(InterventionAct
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_MEDICATION_ACTIVITY2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity2> result = (Collection<MedicationActivity2>) query.evaluate(interventionAct);
-		return new BasicEList.UnmodifiableEList<MedicationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2332,7 +2332,7 @@ public static EList<ProcedureActivityAct2> getProcedureActivityAct2s(Interventio
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PROCEDURE_ACTIVITY_ACT2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityAct2> result = (Collection<ProcedureActivityAct2>) query.evaluate(interventionAct);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityAct2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2382,7 +2382,7 @@ public static EList<ProcedureActivityObservation2> getProcedureActivityObservati
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityObservation2> result = (Collection<ProcedureActivityObservation2>) query.evaluate(
 			interventionAct);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2431,7 +2431,7 @@ public static EList<ProcedureActivityProcedure2> getProcedureActivityProcedure2s
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityProcedure2> result = (Collection<ProcedureActivityProcedure2>) query.evaluate(
 			interventionAct);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityProcedure2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2478,7 +2478,7 @@ public static EList<EncounterActivity2> getEncounterActivity2s(InterventionAct i
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_ENCOUNTER_ACTIVITY2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EncounterActivity2> result = (Collection<EncounterActivity2>) query.evaluate(interventionAct);
-		return new BasicEList.UnmodifiableEList<EncounterActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2527,7 +2527,7 @@ public static EList<NonMedicinalSupplyActivity2> getNonMedicinalSupplyActivity2s
 		@SuppressWarnings("unchecked")
 		Collection<NonMedicinalSupplyActivity2> result = (Collection<NonMedicinalSupplyActivity2>) query.evaluate(
 			interventionAct);
-		return new BasicEList.UnmodifiableEList<NonMedicinalSupplyActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2574,7 +2574,7 @@ public static EList<Instruction2> getInstruction2s(InterventionAct interventionA
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INSTRUCTION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Instruction2> result = (Collection<Instruction2>) query.evaluate(interventionAct);
-		return new BasicEList.UnmodifiableEList<Instruction2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2624,7 +2624,7 @@ public static EList<HandoffCommunicationParticipants> getHandoffCommunicationPar
 		@SuppressWarnings("unchecked")
 		Collection<HandoffCommunicationParticipants> result = (Collection<HandoffCommunicationParticipants>) query.evaluate(
 			interventionAct);
-		return new BasicEList.UnmodifiableEList<HandoffCommunicationParticipants>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2672,7 +2672,7 @@ public static EList<PlannedInterventionAct> getPlannedInterventionActs(Intervent
 		@SuppressWarnings("unchecked")
 		Collection<PlannedInterventionAct> result = (Collection<PlannedInterventionAct>) query.evaluate(
 			interventionAct);
-		return new BasicEList.UnmodifiableEList<PlannedInterventionAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // InterventionActOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InterventionsSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InterventionsSection2Operations.java
index 252ff7f5e2..a1288ea5b6 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InterventionsSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InterventionsSection2Operations.java
@@ -86,7 +86,7 @@ protected InterventionsSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -153,7 +153,7 @@ public static boolean validateInterventionsSection2TemplateId(InterventionsSecti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION2_INTERVENTION_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION2_INTERVENTION_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -220,7 +220,7 @@ public static boolean validateInterventionsSection2InterventionAct(Interventions
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION2_HANDOFF_COMMUNICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION2_HANDOFF_COMMUNICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -288,7 +288,7 @@ public static boolean validateInterventionsSection2HandoffCommunication(Interven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION2_PLANNED_INTERVENTION_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION2_PLANNED_INTERVENTION_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -381,7 +381,7 @@ public static EList<InterventionAct> getInterventionActs(InterventionsSection2 i
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INTERVENTION_ACTS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<InterventionAct> result = (Collection<InterventionAct>) query.evaluate(interventionsSection2);
-		return new BasicEList.UnmodifiableEList<InterventionAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -430,7 +430,7 @@ public static EList<HandoffCommunicationParticipants> getHandoffCommunications(
 		@SuppressWarnings("unchecked")
 		Collection<HandoffCommunicationParticipants> result = (Collection<HandoffCommunicationParticipants>) query.evaluate(
 			interventionsSection2);
-		return new BasicEList.UnmodifiableEList<HandoffCommunicationParticipants>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -479,7 +479,7 @@ public static EList<PlannedInterventionAct> getPlannedInterventionActs(
 		@SuppressWarnings("unchecked")
 		Collection<PlannedInterventionAct> result = (Collection<PlannedInterventionAct>) query.evaluate(
 			interventionsSection2);
-		return new BasicEList.UnmodifiableEList<PlannedInterventionAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -501,7 +501,7 @@ public static EList<PlannedInterventionAct> getPlannedInterventionActs(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -549,7 +549,7 @@ public static boolean validateInterventionsSectionCodeP(InterventionsSection2 in
 					"org.openhealthtools.mdht.uml.cda.consol.InterventionsSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.InterventionsSectionCodeP", passToken);
 				}
 				passToken.add(interventionsSection2);
@@ -581,7 +581,7 @@ public static boolean validateInterventionsSectionCodeP(InterventionsSection2 in
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InterventionsSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InterventionsSectionOperations.java
index f8f13d0e35..0e847b20f7 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InterventionsSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/InterventionsSectionOperations.java
@@ -79,7 +79,7 @@ protected InterventionsSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -147,7 +147,7 @@ public static boolean validateInterventionsSectionTemplateId(InterventionsSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -212,7 +212,7 @@ public static boolean validateInterventionsSectionCode(InterventionsSection inte
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -321,7 +321,7 @@ public static boolean validateInterventionsSectionText(InterventionsSection inte
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateInterventionsSectionText(InterventionsSection, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Interventions Section Text</em>}' operation.
@@ -342,7 +342,7 @@ public static boolean validateInterventionsSectionText(InterventionsSection inte
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_INTERVENTIONS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/LatexSafetyObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/LatexSafetyObservationOperations.java
index 1a3267be7f..b92d17ba5b 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/LatexSafetyObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/LatexSafetyObservationOperations.java
@@ -82,7 +82,7 @@ protected LatexSafetyObservationOperations() {
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_LATEX_SAFETY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LATEX_SAFETY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -147,7 +147,7 @@ public static boolean validateLatexSafetyObservationTemplateId(LatexSafetyObserv
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_LATEX_SAFETY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LATEX_SAFETY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -195,7 +195,7 @@ public static boolean validateLatexSafetyObservationCodeP(LatexSafetyObservation
 					"org.openhealthtools.mdht.uml.cda.consol.LatexSafetyObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.LatexSafetyObservationCodeP", passToken);
 				}
 				passToken.add(latexSafetyObservation);
@@ -226,7 +226,7 @@ public static boolean validateLatexSafetyObservationCodeP(LatexSafetyObservation
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_LATEX_SAFETY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LATEX_SAFETY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -300,7 +300,7 @@ public static boolean validateLatexSafetyObservationCode(LatexSafetyObservation
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_LATEX_SAFETY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LATEX_SAFETY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -364,7 +364,7 @@ public static boolean validateLatexSafetyObservationValue(LatexSafetyObservation
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_LATEX_SAFETY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LATEX_SAFETY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/LongitudinalCareWoundObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/LongitudinalCareWoundObservationOperations.java
index 85a4a453a7..7dd1e284b7 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/LongitudinalCareWoundObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/LongitudinalCareWoundObservationOperations.java
@@ -115,7 +115,7 @@ protected LongitudinalCareWoundObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -185,7 +185,7 @@ public static boolean validateLongitudinalCareWoundObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -255,7 +255,7 @@ public static boolean validateLongitudinalCareWoundObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -308,7 +308,7 @@ public static boolean validateLongitudinalCareWoundObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.LongitudinalCareWoundObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.LongitudinalCareWoundObservationCodeP", passToken);
 				}
@@ -341,7 +341,7 @@ public static boolean validateLongitudinalCareWoundObservationCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -420,7 +420,7 @@ public static boolean validateLongitudinalCareWoundObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -473,7 +473,7 @@ public static boolean validateLongitudinalCareWoundObservationValueP(
 					"org.openhealthtools.mdht.uml.cda.consol.LongitudinalCareWoundObservationValueP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.LongitudinalCareWoundObservationValueP", passToken);
 				}
@@ -506,7 +506,7 @@ public static boolean validateLongitudinalCareWoundObservationValueP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -636,7 +636,7 @@ public static boolean validateLongitudinalCareWoundObservationTargetSiteCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateLongitudinalCareWoundObservationTargetSiteCodeP(LongitudinalCareWoundObservation, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Longitudinal Care Wound Observation Target Site Code P</em>}' operation.
@@ -657,7 +657,7 @@ public static boolean validateLongitudinalCareWoundObservationTargetSiteCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_TARGET_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_TARGET_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -727,7 +727,7 @@ public static boolean validateLongitudinalCareWoundObservationTargetSiteCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_WOUND_MEASUREMENT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_WOUND_MEASUREMENT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -798,7 +798,7 @@ public static boolean validateLongitudinalCareWoundObservationWoundMeasurementOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_WOUND_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_WOUND_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -868,7 +868,7 @@ public static boolean validateLongitudinalCareWoundObservationWoundCharacteristi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_HIGHEST_PRESSURE_ULCER_STAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_HIGHEST_PRESSURE_ULCER_STAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -939,7 +939,7 @@ public static boolean validateLongitudinalCareWoundObservationHighestPressureUlc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1009,7 +1009,7 @@ public static boolean validateLongitudinalCareWoundObservationAuthorParticipatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1081,7 +1081,7 @@ public static boolean validateLongitudinalCareWoundObservationNumberOfPressureUl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_CDCRCD_VALUE_TERMINOLOGY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_CDCRCD_VALUE_TERMINOLOGY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1157,7 +1157,7 @@ public static boolean validateLongitudinalCareWoundObservationCDCRCDValueTermino
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_CDCRCD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_CDCRCD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1234,7 +1234,7 @@ public static boolean validateLongitudinalCareWoundObservationCDCRCDCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_CDCR_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_CDCR_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1309,7 +1309,7 @@ public static boolean validateLongitudinalCareWoundObservationCDCRName(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_CDCR_NAME_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_CDCR_NAME_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1384,7 +1384,7 @@ public static boolean validateLongitudinalCareWoundObservationCDCRNameP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_CDCR_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_CDCR_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1459,7 +1459,7 @@ public static boolean validateLongitudinalCareWoundObservationCDCRValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_CD_QUALIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_LONGITUDINAL_CARE_WOUND_OBSERVATION_CD_QUALIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1562,7 +1562,7 @@ public static EList<WoundMeasurementObservation> getWoundMeasurementObservations
 		@SuppressWarnings("unchecked")
 		Collection<WoundMeasurementObservation> result = (Collection<WoundMeasurementObservation>) query.evaluate(
 			longitudinalCareWoundObservation);
-		return new BasicEList.UnmodifiableEList<WoundMeasurementObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1611,7 +1611,7 @@ public static EList<WoundCharacteristic> getWoundCharacteristicss(
 		@SuppressWarnings("unchecked")
 		Collection<WoundCharacteristic> result = (Collection<WoundCharacteristic>) query.evaluate(
 			longitudinalCareWoundObservation);
-		return new BasicEList.UnmodifiableEList<WoundCharacteristic>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1708,7 +1708,7 @@ public static EList<NumberOfPressureUlcersObservation2> getNumberOfPressureUlcer
 		@SuppressWarnings("unchecked")
 		Collection<NumberOfPressureUlcersObservation2> result = (Collection<NumberOfPressureUlcersObservation2>) query.evaluate(
 			longitudinalCareWoundObservation);
-		return new BasicEList.UnmodifiableEList<NumberOfPressureUlcersObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1730,7 +1730,7 @@ public static EList<NumberOfPressureUlcersObservation2> getNumberOfPressureUlcer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/LotOrBatchNumberObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/LotOrBatchNumberObservationOperations.java
index d671261270..f5f7ca7566 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/LotOrBatchNumberObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/LotOrBatchNumberObservationOperations.java
@@ -81,7 +81,7 @@ protected LotOrBatchNumberObservationOperations() {
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_LOT_OR_BATCH_NUMBER_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LOT_OR_BATCH_NUMBER_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateLotOrBatchNumberObservationTemplateId(
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_LOT_OR_BATCH_NUMBER_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LOT_OR_BATCH_NUMBER_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -198,7 +198,7 @@ public static boolean validateLotOrBatchNumberObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.LotOrBatchNumberObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.LotOrBatchNumberObservationCodeP", passToken);
 				}
 				passToken.add(lotOrBatchNumberObservation);
@@ -229,7 +229,7 @@ public static boolean validateLotOrBatchNumberObservationCodeP(
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_LOT_OR_BATCH_NUMBER_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LOT_OR_BATCH_NUMBER_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -293,7 +293,7 @@ public static boolean validateLotOrBatchNumberObservationCode(
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String VALIDATE_LOT_OR_BATCH_NUMBER_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_EXP = "(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::ST)))";
+	protected static final String VALIDATE_LOT_OR_BATCH_NUMBER_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_EXP = "(self.value->isEmpty() or self.value->exists(element | element.isNullFlavorUndefined())) implies (self.value->size() =  1 and self.value->forAll(element | element.oclIsTypeOf(datatypes::ED)))";
 
 	/**
 	 * The cached OCL invariant for the '{@link #validateLotOrBatchNumberObservationValue(LotOrBatchNumberObservation, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Lot Or Batch Number Observation Value</em>}' invariant operation.
@@ -303,7 +303,7 @@ public static boolean validateLotOrBatchNumberObservationCode(
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_LOT_OR_BATCH_NUMBER_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_LOT_OR_BATCH_NUMBER_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MRISafetyObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MRISafetyObservationOperations.java
index ef1837a171..4f4d773e36 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MRISafetyObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MRISafetyObservationOperations.java
@@ -80,7 +80,7 @@ protected MRISafetyObservationOperations() {
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_MRI_SAFETY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MRI_SAFETY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -147,7 +147,7 @@ public static boolean validateMRISafetyObservationTemplateId(MRISafetyObservatio
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_MRI_SAFETY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MRI_SAFETY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -212,7 +212,7 @@ public static boolean validateMRISafetyObservationCode(MRISafetyObservation mriS
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_MRI_SAFETY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MRI_SAFETY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -275,7 +275,7 @@ public static boolean validateMRISafetyObservationValue(MRISafetyObservation mri
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_MRI_SAFETY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MRI_SAFETY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ManufacturingDateObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ManufacturingDateObservationOperations.java
index fdd97dcf83..6124927a1c 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ManufacturingDateObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ManufacturingDateObservationOperations.java
@@ -82,7 +82,7 @@ protected ManufacturingDateObservationOperations() {
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_MANUFACTURING_DATE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MANUFACTURING_DATE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -150,7 +150,7 @@ public static boolean validateManufacturingDateObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MANUFACTURING_DATE_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MANUFACTURING_DATE_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -202,7 +202,7 @@ public static boolean validateManufacturingDateObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ManufacturingDateObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ManufacturingDateObservationCodeP", passToken);
 				}
 				passToken.add(manufacturingDateObservation);
@@ -233,7 +233,7 @@ public static boolean validateManufacturingDateObservationCodeP(
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_MANUFACTURING_DATE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MANUFACTURING_DATE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -308,7 +308,7 @@ public static boolean validateManufacturingDateObservationCode(
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_MANUFACTURING_DATE_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MANUFACTURING_DATE_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -376,7 +376,7 @@ public static boolean validateManufacturingDateObservationValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MANUFACTURING_DATE_OBSERVATION_TS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MANUFACTURING_DATE_OBSERVATION_TS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicalEquipmentOrganizerOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicalEquipmentOrganizerOperations.java
index 395955b63e..cf6e8b43db 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicalEquipmentOrganizerOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicalEquipmentOrganizerOperations.java
@@ -94,7 +94,7 @@ protected MedicalEquipmentOrganizerOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_HAS_NON_MED_SUP_ACT_OR_PROC_ACT_PROC__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_HAS_NON_MED_SUP_ACT_OR_PROC_ACT_PROC__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -164,7 +164,7 @@ public static boolean validateMedicalEquipmentOrganizerHasNonMedSupActOrProcActP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -232,7 +232,7 @@ public static boolean validateMedicalEquipmentOrganizerTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -300,7 +300,7 @@ public static boolean validateMedicalEquipmentOrganizerClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -367,7 +367,7 @@ public static boolean validateMedicalEquipmentOrganizerMoodCode(MedicalEquipment
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -433,7 +433,7 @@ public static boolean validateMedicalEquipmentOrganizerId(MedicalEquipmentOrgani
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -499,7 +499,7 @@ public static boolean validateMedicalEquipmentOrganizerCode(MedicalEquipmentOrga
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -551,7 +551,7 @@ public static boolean validateMedicalEquipmentOrganizerStatusCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.MedicalEquipmentOrganizerStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.MedicalEquipmentOrganizerStatusCodeP", passToken);
 				}
@@ -584,7 +584,7 @@ public static boolean validateMedicalEquipmentOrganizerStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -660,7 +660,7 @@ public static boolean validateMedicalEquipmentOrganizerStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -729,7 +729,7 @@ public static boolean validateMedicalEquipmentOrganizerEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_NON_MEDICINAL_SUPPLY_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_NON_MEDICINAL_SUPPLY_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -799,7 +799,7 @@ public static boolean validateMedicalEquipmentOrganizerNonMedicinalSupplyActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_PROCEDURE_ACTIVITY_PROCEDURE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_PROCEDURE_ACTIVITY_PROCEDURE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -869,7 +869,7 @@ public static boolean validateMedicalEquipmentOrganizerProcedureActivityProcedur
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -942,7 +942,7 @@ public static boolean validateMedicalEquipmentOrganizerIVLTSLow(MedicalEquipment
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICAL_EQUIPMENT_ORGANIZER_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1044,7 +1044,7 @@ public static EList<NonMedicinalSupplyActivity2> getNonMedicinalSupplyActivity2s
 		@SuppressWarnings("unchecked")
 		Collection<NonMedicinalSupplyActivity2> result = (Collection<NonMedicinalSupplyActivity2>) query.evaluate(
 			medicalEquipmentOrganizer);
-		return new BasicEList.UnmodifiableEList<NonMedicinalSupplyActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1094,7 +1094,7 @@ public static EList<ProcedureActivityProcedure2> getProcedureActivityProcedure2s
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityProcedure2> result = (Collection<ProcedureActivityProcedure2>) query.evaluate(
 			medicalEquipmentOrganizer);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityProcedure2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // MedicalEquipmentOrganizerOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicalEquipmentSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicalEquipmentSection2Operations.java
index e0b7e30819..8cb21e1062 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicalEquipmentSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicalEquipmentSection2Operations.java
@@ -86,7 +86,7 @@ protected MedicalEquipmentSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -153,7 +153,7 @@ public static boolean validateMedicalEquipmentSection2TemplateId(MedicalEquipmen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION2_MEDICAL_EQUIPMENT_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION2_MEDICAL_EQUIPMENT_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -223,7 +223,7 @@ public static boolean validateMedicalEquipmentSection2MedicalEquipmentOrganizer(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION2_PROCEDURE_ACTIVITY_PROCEDURE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION2_PROCEDURE_ACTIVITY_PROCEDURE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -321,7 +321,7 @@ public static EList<NonMedicinalSupplyActivity2> getConsolNonMedicinalSupplyActi
 		@SuppressWarnings("unchecked")
 		Collection<NonMedicinalSupplyActivity2> result = (Collection<NonMedicinalSupplyActivity2>) query.evaluate(
 			medicalEquipmentSection2);
-		return new BasicEList.UnmodifiableEList<NonMedicinalSupplyActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -371,7 +371,7 @@ public static EList<MedicalEquipmentOrganizer> getMedicalEquipmentOrganizers(
 		@SuppressWarnings("unchecked")
 		Collection<MedicalEquipmentOrganizer> result = (Collection<MedicalEquipmentOrganizer>) query.evaluate(
 			medicalEquipmentSection2);
-		return new BasicEList.UnmodifiableEList<MedicalEquipmentOrganizer>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -421,7 +421,7 @@ public static EList<ProcedureActivityProcedure2> getProcedureActivityProcedure2s
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityProcedure2> result = (Collection<ProcedureActivityProcedure2>) query.evaluate(
 			medicalEquipmentSection2);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityProcedure2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -443,7 +443,7 @@ public static EList<ProcedureActivityProcedure2> getProcedureActivityProcedure2s
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -492,7 +492,7 @@ public static boolean validateMedicalEquipmentSectionCodeP(MedicalEquipmentSecti
 					"org.openhealthtools.mdht.uml.cda.consol.MedicalEquipmentSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.MedicalEquipmentSectionCodeP", passToken);
 				}
 				passToken.add(medicalEquipmentSection2);
@@ -524,7 +524,7 @@ public static boolean validateMedicalEquipmentSectionCodeP(MedicalEquipmentSecti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -598,7 +598,7 @@ public static boolean validateMedicalEquipmentSectionCode(MedicalEquipmentSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicalEquipmentSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicalEquipmentSectionOperations.java
index 8aabe19800..9d29bc9ac1 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicalEquipmentSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicalEquipmentSectionOperations.java
@@ -87,7 +87,7 @@ protected MedicalEquipmentSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -156,7 +156,7 @@ public static boolean validateMedicalEquipmentSectionTemplateId(MedicalEquipment
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -222,7 +222,7 @@ public static boolean validateMedicalEquipmentSectionCode(MedicalEquipmentSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -288,7 +288,7 @@ public static boolean validateMedicalEquipmentSectionCodeP(MedicalEquipmentSecti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -354,7 +354,7 @@ public static boolean validateMedicalEquipmentSectionTitle(MedicalEquipmentSecti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -420,7 +420,7 @@ public static boolean validateMedicalEquipmentSectionText(MedicalEquipmentSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_EQUIPMENT_SECTION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -517,7 +517,7 @@ public static EList<NonMedicinalSupplyActivity> getNonMedicinalSupplyActivities(
 		@SuppressWarnings("unchecked")
 		Collection<NonMedicinalSupplyActivity> result = (Collection<NonMedicinalSupplyActivity>) query.evaluate(
 			medicalEquipmentSection);
-		return new BasicEList.UnmodifiableEList<NonMedicinalSupplyActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // MedicalEquipmentSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicalHistorySectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicalHistorySectionOperations.java
index 4395e1d76f..2399a1a993 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicalHistorySectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicalHistorySectionOperations.java
@@ -79,7 +79,7 @@ protected MedicalHistorySectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_HISTORY_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_HISTORY_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateMedicalHistorySectionTemplateId(MedicalHistorySect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_HISTORY_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_HISTORY_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -213,7 +213,7 @@ public static boolean validateMedicalHistorySectionCode(MedicalHistorySection me
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_HISTORY_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_HISTORY_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -279,7 +279,7 @@ public static boolean validateMedicalHistorySectionCodeP(MedicalHistorySection m
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_HISTORY_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_HISTORY_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -344,7 +344,7 @@ public static boolean validateMedicalHistorySectionText(MedicalHistorySection me
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_HISTORY_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICAL_HISTORY_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationActivity2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationActivity2Operations.java
index 56c4a71651..81840cd308 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationActivity2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationActivity2Operations.java
@@ -132,7 +132,7 @@ protected MedicationActivity2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY2_SUBSTANCE_ADMINISTERED_ACT_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY2_SUBSTANCE_ADMINISTERED_ACT_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -201,7 +201,7 @@ public static boolean validateMedicationActivity2SubstanceAdministeredActInversi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY2_SUBSTANCE_ADMINISTERED_ACT_SEQUENCE_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY2_SUBSTANCE_ADMINISTERED_ACT_SEQUENCE_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -363,7 +363,7 @@ public static boolean validateMedicationActivity2TemplateId(MedicationActivity2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY2_EFFECTIVE_TIME_IVLTS_LOW_XOR_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY2_EFFECTIVE_TIME_IVLTS_LOW_XOR_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationActivity2TemplateId(MedicationActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Activity2 Template Id</em>}' operation.
@@ -384,7 +384,7 @@ public static boolean validateMedicationActivity2TemplateId(MedicationActivity2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationActivityStatusCodeP(MedicationActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Activity Status Code P</em>}' operation.
@@ -405,7 +405,7 @@ public static boolean validateMedicationActivity2TemplateId(MedicationActivity2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -454,7 +454,7 @@ public static boolean validateMedicationActivityStatusCodeP(MedicationActivity2
 					"org.openhealthtools.mdht.uml.cda.consol.MedicationActivityStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.MedicationActivityStatusCodeP", passToken);
 				}
 				passToken.add(medicationActivity2);
@@ -513,7 +513,7 @@ public static boolean validateMedicationActivityAdministrationUnitCodeP(Medicati
 					"org.openhealthtools.mdht.uml.cda.consol.MedicationActivityAdministrationUnitCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.MedicationActivityAdministrationUnitCodeP", passToken);
 				}
@@ -544,7 +544,7 @@ public static boolean validateMedicationActivityAdministrationUnitCodeP(Medicati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY2_DRUG_MONITORING_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY2_DRUG_MONITORING_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -611,7 +611,7 @@ public static boolean validateMedicationActivity2DrugMonitoringAct(MedicationAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -678,7 +678,7 @@ public static boolean validateMedicationActivity2AuthorParticipation(MedicationA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY2_SUBSTANCE_ADMINISTERED_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY2_SUBSTANCE_ADMINISTERED_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -746,7 +746,7 @@ public static boolean validateMedicationActivity2SubstanceAdministeredAct(Medica
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY2_MEDICATION_FREE_TEXT_SIG__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY2_MEDICATION_FREE_TEXT_SIG__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -813,7 +813,7 @@ public static boolean validateMedicationActivity2MedicationFreeTextSig(Medicatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_ACTIVITY2_CE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_ACTIVITY2_CE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -866,7 +866,7 @@ public static boolean validateMedicationActivity2CETranslationP(MedicationActivi
 						"org.openhealthtools.mdht.uml.cda.consol.MedicationActivity2CETranslationP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.MedicationActivity2CETranslationP", passToken);
 					}
@@ -900,7 +900,7 @@ public static boolean validateMedicationActivity2CETranslationP(MedicationActivi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_ACTIVITY2_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_ACTIVITY2_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1099,7 +1099,7 @@ public static EList<SubstanceAdministeredAct> getSubstanceAdministeredActs(
 		@SuppressWarnings("unchecked")
 		Collection<SubstanceAdministeredAct> result = (Collection<SubstanceAdministeredAct>) query.evaluate(
 			medicationActivity2);
-		return new BasicEList.UnmodifiableEList<SubstanceAdministeredAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1146,7 +1146,7 @@ public static EList<Indication2> getConsolIndication2s(MedicationActivity2 medic
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_INDICATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication2> result = (Collection<Indication2>) query.evaluate(medicationActivity2);
-		return new BasicEList.UnmodifiableEList<Indication2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1240,7 +1240,7 @@ public static EList<MedicationDispense2> getConsolMedicationDispense2s(Medicatio
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_MEDICATION_DISPENSE2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<MedicationDispense2> result = (Collection<MedicationDispense2>) query.evaluate(medicationActivity2);
-		return new BasicEList.UnmodifiableEList<MedicationDispense2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1334,7 +1334,7 @@ public static EList<MedicationFreeTextSig> getMedicationFreeTextSigs(MedicationA
 		@SuppressWarnings("unchecked")
 		Collection<MedicationFreeTextSig> result = (Collection<MedicationFreeTextSig>) query.evaluate(
 			medicationActivity2);
-		return new BasicEList.UnmodifiableEList<MedicationFreeTextSig>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1356,7 +1356,7 @@ public static EList<MedicationFreeTextSig> getMedicationFreeTextSigs(MedicationA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1423,7 +1423,7 @@ public static boolean validateMedicationActivityTextReference(MedicationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1490,7 +1490,7 @@ public static boolean validateMedicationActivityReferenceValue(MedicationActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1557,7 +1557,7 @@ public static boolean validateMedicationActivityTextReferenceValue(MedicationAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_INSTRUCTIONS_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_INSTRUCTIONS_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1625,7 +1625,7 @@ public static boolean validateMedicationActivityInstructionsInversionInd(Medicat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_DOSE_QUANTITYORRATE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_DOSE_QUANTITYORRATE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1693,7 +1693,7 @@ public static boolean validateMedicationActivityDoseQuantityorrateQuantity(Medic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_IVLT_SOR_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_IVLT_SOR_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1760,7 +1760,7 @@ public static boolean validateMedicationActivityEffectiveTimeIVLTSorTS(Medicatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1827,7 +1827,7 @@ public static boolean validateMedicationActivityEffectiveTimeIVLTSLow(Medication
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1894,7 +1894,7 @@ public static boolean validateMedicationActivityEffectiveTimeIVLTSHigh(Medicatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_PIVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_PIVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2034,7 +2034,7 @@ public static boolean validateMedicationActivityRouteCodeP(MedicationActivity2 m
 					"org.openhealthtools.mdht.uml.cda.consol.MedicationActivityRouteCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.MedicationActivityRouteCodeP", passToken);
 				}
 				passToken.add(medicationActivity2);
@@ -2116,7 +2116,7 @@ public static boolean validateMedicationActivityRouteCode(MedicationActivity2 me
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2183,7 +2183,7 @@ public static boolean validateMedicationActivityCode(MedicationActivity2 medicat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationActivityRepeatNumber(MedicationActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Activity Repeat Number</em>}' operation.
@@ -2204,7 +2204,7 @@ public static boolean validateMedicationActivityCode(MedicationActivity2 medicat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationActivityRouteCodeP(MedicationActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Activity Route Code P</em>}' operation.
@@ -2225,7 +2225,7 @@ public static boolean validateMedicationActivityCode(MedicationActivity2 medicat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_ROUTE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_ROUTE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationActivityRouteCode(MedicationActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Activity Route Code</em>}' operation.
@@ -2248,7 +2248,7 @@ public static boolean validateMedicationActivityCode(MedicationActivity2 medicat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_ROUTE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_ROUTE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2509,7 +2509,7 @@ public static boolean validateMedicationActivityIndication(MedicationActivity2 m
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_DOSE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_DOSE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationActivityAdministrationUnitCodeP(MedicationActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Activity Administration Unit Code P</em>}' operation.
@@ -2530,7 +2530,7 @@ public static boolean validateMedicationActivityIndication(MedicationActivity2 m
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_ADMINISTRATION_UNIT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_ADMINISTRATION_UNIT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationActivityAdministrationUnitCode(MedicationActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Activity Administration Unit Code</em>}' operation.
@@ -2553,7 +2553,7 @@ public static boolean validateMedicationActivityIndication(MedicationActivity2 m
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_ADMINISTRATION_UNIT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_ADMINISTRATION_UNIT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationActivityText(MedicationActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Activity Text</em>}' operation.
@@ -2574,7 +2574,7 @@ public static boolean validateMedicationActivityIndication(MedicationActivity2 m
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationActivityInstructions(MedicationActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Activity Instructions</em>}' operation.
@@ -2595,7 +2595,7 @@ public static boolean validateMedicationActivityIndication(MedicationActivity2 m
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationActivityIndication(MedicationActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Activity Indication</em>}' operation.
@@ -2616,7 +2616,7 @@ public static boolean validateMedicationActivityIndication(MedicationActivity2 m
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2682,7 +2682,7 @@ public static boolean validateMedicationActivityDoseQuantity(MedicationActivity2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_CONSUMABLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_CONSUMABLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2747,7 +2747,7 @@ public static boolean validateMedicationActivityConsumable(MedicationActivity2 m
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_MEDICATION_SUPPLY_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_MEDICATION_SUPPLY_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2814,7 +2814,7 @@ public static boolean validateMedicationActivityMedicationSupplyOrder(Medication
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_MEDICATION_DISPENSE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_MEDICATION_DISPENSE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2881,7 +2881,7 @@ public static boolean validateMedicationActivityMedicationDispense(MedicationAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_REACTION_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_REACTION_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2948,7 +2948,7 @@ public static boolean validateMedicationActivityReactionObservation(MedicationAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_PRECONDITION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_PRECONDITION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3014,7 +3014,7 @@ public static boolean validateMedicationActivityPrecondition(MedicationActivity2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_ACTIVITY_PRECONDITION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_ACTIVITY_PRECONDITION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3087,7 +3087,7 @@ public static boolean validateMedicationActivityPreconditionTypeCode(MedicationA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_ACTIVITY_PRECONDITION_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_ACTIVITY_PRECONDITION_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3162,7 +3162,7 @@ public static boolean validateMedicationActivityPreconditionPreconditionForSubst
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_ACTIVITY_CONSUMABLE_MEDICATION_INFORMATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_ACTIVITY_CONSUMABLE_MEDICATION_INFORMATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationActivityOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationActivityOperations.java
index f3c79eb238..fcc3df82cc 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationActivityOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationActivityOperations.java
@@ -136,7 +136,7 @@ protected MedicationActivityOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_DOSE_QUANTITYORRATE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_DOSE_QUANTITYORRATE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -204,7 +204,7 @@ public static boolean validateMedicationActivityDoseQuantityorrateQuantity(Medic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -271,7 +271,7 @@ public static boolean validateMedicationActivityTextReference(MedicationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -338,7 +338,7 @@ public static boolean validateMedicationActivityReferenceValue(MedicationActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -405,7 +405,7 @@ public static boolean validateMedicationActivityTextReferenceValue(MedicationAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_IVLT_SOR_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_IVLT_SOR_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -472,7 +472,7 @@ public static boolean validateMedicationActivityEffectiveTimeIVLTSorTS(Medicatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -539,7 +539,7 @@ public static boolean validateMedicationActivityEffectiveTimeIVLTSLow(Medication
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -606,7 +606,7 @@ public static boolean validateMedicationActivityEffectiveTimeIVLTSHigh(Medicatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_TS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_TS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -673,7 +673,7 @@ public static boolean validateMedicationActivityEffectiveTimeTSValue(MedicationA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_PIVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_PIVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -740,7 +740,7 @@ public static boolean validateMedicationActivityEffectiveTimePIVLTS(MedicationAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_OPERATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_EFFECTIVE_TIME_OPERATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -807,7 +807,7 @@ public static boolean validateMedicationActivityEffectiveTimeOperator(Medication
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_DOSE_QUANTITY_UNIT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_DOSE_QUANTITY_UNIT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -874,7 +874,7 @@ public static boolean validateMedicationActivityDoseQuantityUnit(MedicationActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_DRUG_VEHICLE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_DRUG_VEHICLE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -941,7 +941,7 @@ public static boolean validateMedicationActivityDrugVehicleTypeCode(MedicationAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_INSTRUCTIONS_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_INSTRUCTIONS_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1008,7 +1008,7 @@ public static boolean validateMedicationActivityInstructionsInversionInd(Medicat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_RATE_QUANTITY_UNIT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_RATE_QUANTITY_UNIT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1075,7 +1075,7 @@ public static boolean validateMedicationActivityRateQuantityUnit(MedicationActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1140,7 +1140,7 @@ public static boolean validateMedicationActivityTemplateId(MedicationActivity me
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1207,7 +1207,7 @@ public static boolean validateMedicationActivityClassCode(MedicationActivity med
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1272,7 +1272,7 @@ public static boolean validateMedicationActivityMoodCode(MedicationActivity medi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1337,7 +1337,7 @@ public static boolean validateMedicationActivityId(MedicationActivity medication
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1402,7 +1402,7 @@ public static boolean validateMedicationActivityCode(MedicationActivity medicati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1467,7 +1467,7 @@ public static boolean validateMedicationActivityStatusCode(MedicationActivity me
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_ROUTE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_ROUTE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1516,7 +1516,7 @@ public static boolean validateMedicationActivityRouteCodeP(MedicationActivity me
 					"org.openhealthtools.mdht.uml.cda.consol.MedicationActivityRouteCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.MedicationActivityRouteCodeP", passToken);
 				}
 				passToken.add(medicationActivity);
@@ -1548,7 +1548,7 @@ public static boolean validateMedicationActivityRouteCodeP(MedicationActivity me
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_ROUTE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_ROUTE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1669,7 +1669,7 @@ public static boolean validateMedicationActivityApproachSiteCodeP(MedicationActi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_APPROACH_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_APPROACH_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationActivityApproachSiteCodeP(MedicationActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Activity Approach Site Code P</em>}' operation.
@@ -1690,7 +1690,7 @@ public static boolean validateMedicationActivityApproachSiteCodeP(MedicationActi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_APPROACH_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_APPROACH_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1757,7 +1757,7 @@ public static boolean validateMedicationActivityApproachSiteCode(MedicationActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_DOSE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_DOSE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1823,7 +1823,7 @@ public static boolean validateMedicationActivityDoseQuantity(MedicationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_RATE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_RATE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1889,7 +1889,7 @@ public static boolean validateMedicationActivityRateQuantity(MedicationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_MAX_DOSE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_MAX_DOSE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1956,7 +1956,7 @@ public static boolean validateMedicationActivityMaxDoseQuantity(MedicationActivi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_ADMINISTRATION_UNIT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_ADMINISTRATION_UNIT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2006,7 +2006,7 @@ public static boolean validateMedicationActivityAdministrationUnitCodeP(Medicati
 					"org.openhealthtools.mdht.uml.cda.consol.MedicationActivityAdministrationUnitCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.MedicationActivityAdministrationUnitCodeP", passToken);
 				}
@@ -2039,7 +2039,7 @@ public static boolean validateMedicationActivityAdministrationUnitCodeP(Medicati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_ADMINISTRATION_UNIT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_ADMINISTRATION_UNIT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2114,7 +2114,7 @@ public static boolean validateMedicationActivityAdministrationUnitCode(Medicatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2179,7 +2179,7 @@ public static boolean validateMedicationActivityText(MedicationActivity medicati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2245,7 +2245,7 @@ public static boolean validateMedicationActivityRepeatNumber(MedicationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_MEDICATION_SUPPLY_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_MEDICATION_SUPPLY_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2312,7 +2312,7 @@ public static boolean validateMedicationActivityMedicationSupplyOrder(Medication
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_REACTION_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_REACTION_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2379,7 +2379,7 @@ public static boolean validateMedicationActivityReactionObservation(MedicationAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2444,7 +2444,7 @@ public static boolean validateMedicationActivityPerformer(MedicationActivity med
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2510,7 +2510,7 @@ public static boolean validateMedicationActivityInstructions(MedicationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2575,7 +2575,7 @@ public static boolean validateMedicationActivityIndication(MedicationActivity me
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_MEDICATION_DISPENSE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_MEDICATION_DISPENSE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2687,7 +2687,7 @@ public static boolean validateMedicationActivityPrecondition(MedicationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_DRUG_VEHICLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_DRUG_VEHICLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2753,7 +2753,7 @@ public static boolean validateMedicationActivityDrugVehicle(MedicationActivity m
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_CONSUMABLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_CONSUMABLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationActivityPrecondition(MedicationActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Activity Precondition</em>}' operation.
@@ -2774,7 +2774,7 @@ public static boolean validateMedicationActivityDrugVehicle(MedicationActivity m
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_PRECONDITION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_ACTIVITY_PRECONDITION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2839,7 +2839,7 @@ public static boolean validateMedicationActivityConsumable(MedicationActivity me
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_ACTIVITY_CONSUMABLE_MEDICATION_INFORMATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_ACTIVITY_CONSUMABLE_MEDICATION_INFORMATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2913,7 +2913,7 @@ public static boolean validateMedicationActivityConsumableMedicationInformation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_ACTIVITY_PRECONDITION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_ACTIVITY_PRECONDITION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2985,7 +2985,7 @@ public static boolean validateMedicationActivityPreconditionTypeCode(MedicationA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_ACTIVITY_PRECONDITION_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_ACTIVITY_PRECONDITION_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3219,7 +3219,7 @@ public static EList<Indication> getIndications(MedicationActivity medicationActi
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INDICATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication> result = (Collection<Indication>) query.evaluate(medicationActivity);
-		return new BasicEList.UnmodifiableEList<Indication>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3266,7 +3266,7 @@ public static EList<MedicationDispense> getMedicationDispenses(MedicationActivit
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_MEDICATION_DISPENSES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<MedicationDispense> result = (Collection<MedicationDispense>) query.evaluate(medicationActivity);
-		return new BasicEList.UnmodifiableEList<MedicationDispense>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3313,7 +3313,7 @@ public static EList<DrugVehicle> getDrugVehicles(MedicationActivity medicationAc
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_DRUG_VEHICLES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<DrugVehicle> result = (Collection<DrugVehicle>) query.evaluate(medicationActivity);
-		return new BasicEList.UnmodifiableEList<DrugVehicle>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // MedicationActivityOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationDispense2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationDispense2Operations.java
index e4d90f9561..81702841ff 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationDispense2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationDispense2Operations.java
@@ -82,7 +82,7 @@ protected MedicationDispense2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE2_CONTAINS_MEDICATION_INFORMATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE2_CONTAINS_MEDICATION_INFORMATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateMedicationDispense2ContainsMedicationInformation2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE2_CONTAINS_IMMUNIZATION_MEDICATION_INFORMATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE2_CONTAINS_IMMUNIZATION_MEDICATION_INFORMATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -220,7 +220,7 @@ public static boolean validateMedicationDispense2ContainsImmunizationMedicationI
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -314,7 +314,7 @@ public static boolean validateMedicationDispenseStatusCodeP(MedicationDispense2
 					"org.openhealthtools.mdht.uml.cda.consol.MedicationDispenseStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.MedicationDispenseStatusCodeP", passToken);
 				}
 				passToken.add(medicationDispense2);
@@ -418,7 +418,7 @@ public static boolean validateMedicationDispenseContainsMedicationOrImmunization
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #getConsolMedicationSupplyOrder2(MedicationDispense2) <em>Get Consol Medication Supply Order2</em>}' operation.
@@ -459,7 +459,7 @@ public static boolean validateMedicationDispenseContainsMedicationOrImmunization
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_CONTAINS_MEDICATION_OR_IMMUNIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_CONTAINS_MEDICATION_OR_IMMUNIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationDispenseStatusCode(MedicationDispense2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Dispense Status Code</em>}' operation.
@@ -482,7 +482,7 @@ public static boolean validateMedicationDispenseContainsMedicationOrImmunization
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -556,7 +556,7 @@ public static boolean validateMedicationDispenseStatusCode(MedicationDispense2 m
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -622,7 +622,7 @@ public static boolean validateMedicationDispenseRepeatNumber(MedicationDispense2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_MEDICATION_SUPPLY_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_MEDICATION_SUPPLY_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationDispenseOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationDispenseOperations.java
index 1cdaf32a11..11421f1497 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationDispenseOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationDispenseOperations.java
@@ -104,7 +104,7 @@ protected MedicationDispenseOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_CONTAINS_MEDICATION_OR_IMMUNIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_CONTAINS_MEDICATION_OR_IMMUNIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -173,7 +173,7 @@ public static boolean validateMedicationDispenseContainsMedicationOrImmunization
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -238,7 +238,7 @@ public static boolean validateMedicationDispenseTemplateId(MedicationDispense me
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -303,7 +303,7 @@ public static boolean validateMedicationDispenseClassCode(MedicationDispense med
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -370,7 +370,7 @@ public static boolean validateMedicationDispenseEffectiveTime(MedicationDispense
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -435,7 +435,7 @@ public static boolean validateMedicationDispenseId(MedicationDispense medication
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -500,7 +500,7 @@ public static boolean validateMedicationDispenseMoodCode(MedicationDispense medi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -568,7 +568,7 @@ public static boolean validateMedicationDispenseRepeatNumber(MedicationDispense
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -633,7 +633,7 @@ public static boolean validateMedicationDispenseStatusCode(MedicationDispense me
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -698,7 +698,7 @@ public static boolean validateMedicationDispenseQuantity(MedicationDispense medi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_MEDICATION_SUPPLY_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_MEDICATION_SUPPLY_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -765,7 +765,7 @@ public static boolean validateMedicationDispenseMedicationSupplyOrder(Medication
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_DISPENSE_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -830,7 +830,7 @@ public static boolean validateMedicationDispensePerformer(MedicationDispense med
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -906,7 +906,7 @@ public static boolean validateMedicationDispensePerformerMedicationDispenseAssig
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -982,7 +982,7 @@ public static boolean validateMedicationDispensePerformerMedicationDispenseAssig
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1115,7 +1115,7 @@ public static boolean validateMedicationDispensePerformerMedicationDispenseAssig
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationDispensePerformerMedicationDispenseAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP(MedicationDispense, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Dispense Performer Medication Dispense Assigned Entity General Header Constraints US Realm Address Use P</em>}' operation.
@@ -1136,7 +1136,7 @@ public static boolean validateMedicationDispensePerformerMedicationDispenseAssig
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1212,7 +1212,7 @@ public static boolean validateMedicationDispensePerformerMedicationDispenseAssig
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1288,7 +1288,7 @@ public static boolean validateMedicationDispensePerformerMedicationDispenseAssig
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1364,7 +1364,7 @@ public static boolean validateMedicationDispensePerformerMedicationDispenseAssig
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1440,7 +1440,7 @@ public static boolean validateMedicationDispensePerformerMedicationDispenseAssig
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1516,7 +1516,7 @@ public static boolean validateMedicationDispensePerformerMedicationDispenseAssig
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1592,7 +1592,7 @@ public static boolean validateMedicationDispensePerformerMedicationDispenseAssig
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1666,7 +1666,7 @@ public static boolean validateMedicationDispensePerformerMedicationDispenseAssig
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_DISPENSE_PERFORMER_MEDICATION_DISPENSE_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationFreeTextSigOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationFreeTextSigOperations.java
index 2414e31e7e..181e52887b 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationFreeTextSigOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationFreeTextSigOperations.java
@@ -94,7 +94,7 @@ protected MedicationFreeTextSigOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_FREE_TEXT_SIG_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_FREE_TEXT_SIG_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -161,7 +161,7 @@ public static boolean validateMedicationFreeTextSigTextReferenceValue(Medication
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_FREE_TEXT_SIG_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_FREE_TEXT_SIG_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -228,7 +228,7 @@ public static boolean validateMedicationFreeTextSigTemplateId(MedicationFreeText
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_FREE_TEXT_SIG_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_FREE_TEXT_SIG_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -297,7 +297,7 @@ public static boolean validateMedicationFreeTextSigClassCode(MedicationFreeTextS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_FREE_TEXT_SIG_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_FREE_TEXT_SIG_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -366,7 +366,7 @@ public static boolean validateMedicationFreeTextSigMoodCode(MedicationFreeTextSi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_FREE_TEXT_SIG_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_FREE_TEXT_SIG_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -432,7 +432,7 @@ public static boolean validateMedicationFreeTextSigCode(MedicationFreeTextSig me
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_FREE_TEXT_SIG_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_FREE_TEXT_SIG_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -498,7 +498,7 @@ public static boolean validateMedicationFreeTextSigCodeP(MedicationFreeTextSig m
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_FREE_TEXT_SIG_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_FREE_TEXT_SIG_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -564,7 +564,7 @@ public static boolean validateMedicationFreeTextSigText(MedicationFreeTextSig me
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_FREE_TEXT_SIG_CONSUMABLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_FREE_TEXT_SIG_CONSUMABLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -631,7 +631,7 @@ public static boolean validateMedicationFreeTextSigConsumable(MedicationFreeText
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_FREE_TEXT_SIG_EDTEL_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_FREE_TEXT_SIG_EDTEL_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -703,7 +703,7 @@ public static boolean validateMedicationFreeTextSigEDTELValue(MedicationFreeText
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_FREE_TEXT_SIG_ED_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_FREE_TEXT_SIG_ED_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -779,7 +779,7 @@ public static boolean validateMedicationFreeTextSigEDReference(MedicationFreeTex
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_FREE_TEXT_SIG_CONSUMABLE_MANUFACTURED_PRODUCT_MANUFACTURED_LABELED_DRUG_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_FREE_TEXT_SIG_CONSUMABLE_MANUFACTURED_PRODUCT_MANUFACTURED_LABELED_DRUG_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -855,7 +855,7 @@ public static boolean validateMedicationFreeTextSigConsumableManufacturedProduct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_FREE_TEXT_SIG_CONSUMABLE_MANUFACTURED_PRODUCT_MANUFACTURED_LABELED_DRUG__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_FREE_TEXT_SIG_CONSUMABLE_MANUFACTURED_PRODUCT_MANUFACTURED_LABELED_DRUG__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -930,7 +930,7 @@ public static boolean validateMedicationFreeTextSigConsumableManufacturedProduct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_FREE_TEXT_SIG_CONSUMABLE_MANUFACTURED_PRODUCT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_FREE_TEXT_SIG_CONSUMABLE_MANUFACTURED_PRODUCT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationInformation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationInformation2Operations.java
index 39e70dbe0f..0cb6c675db 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationInformation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationInformation2Operations.java
@@ -85,7 +85,7 @@ protected MedicationInformation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_INFORMATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_INFORMATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -152,7 +152,7 @@ public static boolean validateMedicationInformation2TemplateId(MedicationInforma
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION2_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION2_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -228,7 +228,7 @@ public static boolean validateMedicationInformation2MedicationInformationManufac
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -339,7 +339,7 @@ public static boolean validateMedicationInformationMedicationInformationManufact
 						"org.openhealthtools.mdht.uml.cda.consol.MedicationInformationMedicationInformationManufacturedMaterialCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.MedicationInformationMedicationInformationManufacturedMaterialCodeP",
 							passToken);
@@ -583,7 +583,7 @@ public static boolean validateMedicationInformationMedicationInformationManufact
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationInformationManufacturedMaterial(MedicationInformation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Information Manufactured Material</em>}' operation.
@@ -604,7 +604,7 @@ public static boolean validateMedicationInformationMedicationInformationManufact
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationInformationMedicationInformationManufacturedMaterialCodeOriginalText(MedicationInformation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Information Medication Information Manufactured Material Code Original Text</em>}' operation.
@@ -625,7 +625,7 @@ public static boolean validateMedicationInformationMedicationInformationManufact
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationInformationMedicationInformationManufacturedMaterialCodeTranslation(MedicationInformation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Information Medication Information Manufactured Material Code Translation</em>}' operation.
@@ -646,7 +646,7 @@ public static boolean validateMedicationInformationMedicationInformationManufact
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationInformationMedicationInformationManufacturedMaterialReference(MedicationInformation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Information Medication Information Manufactured Material Reference</em>}' operation.
@@ -667,7 +667,7 @@ public static boolean validateMedicationInformationMedicationInformationManufact
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationInformationMedicationInformationManufacturedMaterialOriginalTextReferenceValue(MedicationInformation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Information Medication Information Manufactured Material Original Text Reference Value</em>}' operation.
@@ -688,7 +688,7 @@ public static boolean validateMedicationInformationMedicationInformationManufact
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -766,7 +766,7 @@ public static boolean validateMedicationInformationMedicationInformationManufact
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationInformationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationInformationOperations.java
index 7bd5657076..23ef1d17c0 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationInformationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationInformationOperations.java
@@ -89,7 +89,7 @@ protected MedicationInformationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_INFORMATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_INFORMATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -156,7 +156,7 @@ public static boolean validateMedicationInformationTemplateId(MedicationInformat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_INFORMATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_INFORMATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateMedicationInformationId(MedicationInformation medi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_INFORMATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_INFORMATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -287,7 +287,7 @@ public static boolean validateMedicationInformationClassCode(MedicationInformati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_INFORMATION_MANUFACTURER_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_INFORMATION_MANUFACTURER_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -355,7 +355,7 @@ public static boolean validateMedicationInformationManufacturerOrganization(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -423,7 +423,7 @@ public static boolean validateMedicationInformationManufacturedMaterial(Medicati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -499,7 +499,7 @@ public static boolean validateMedicationInformationMedicationInformationManufact
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -574,7 +574,7 @@ public static boolean validateMedicationInformationMedicationInformationManufact
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -650,7 +650,7 @@ public static boolean validateMedicationInformationMedicationInformationManufact
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -728,7 +728,7 @@ public static boolean validateMedicationInformationMedicationInformationManufact
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MEDICATION_INFORMATION_MEDICATION_INFORMATION_MANUFACTURED_MATERIAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationSupplyOrder2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationSupplyOrder2Operations.java
index a1542e6325..3bd309632b 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationSupplyOrder2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationSupplyOrder2Operations.java
@@ -83,7 +83,7 @@ protected MedicationSupplyOrder2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER2_CONTAINS_MEDICATION_INFORMATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER2_CONTAINS_MEDICATION_INFORMATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -152,7 +152,7 @@ public static boolean validateMedicationSupplyOrder2ContainsMedicationInformatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER2_CONTAINS_IMMUNIZATION_MEDICATION_INFORMATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER2_CONTAINS_IMMUNIZATION_MEDICATION_INFORMATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateMedicationSupplyOrder2ContainsImmunizationMedicati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -288,7 +288,7 @@ public static boolean validateMedicationSupplyOrder2TemplateId(MedicationSupplyO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -338,7 +338,7 @@ public static boolean validateMedicationSupplyOrderStatusCodeP(MedicationSupplyO
 					"org.openhealthtools.mdht.uml.cda.consol.MedicationSupplyOrderStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.MedicationSupplyOrderStatusCodeP", passToken);
 				}
 				passToken.add(medicationSupplyOrder2);
@@ -413,7 +413,7 @@ public static Instruction2 getConsolInstruction2(MedicationSupplyOrder2 medicati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_CONTAINS_MEDICATION_OR_IMMUNIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_CONTAINS_MEDICATION_OR_IMMUNIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -482,7 +482,7 @@ public static boolean validateMedicationSupplyOrderContainsMedicationOrImmunizat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_INSTRUCTION_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_INSTRUCTION_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -552,7 +552,7 @@ public static boolean validateMedicationSupplyOrderInstructionInversionInd(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -627,7 +627,7 @@ public static boolean validateMedicationSupplyOrderStatusCode(MedicationSupplyOr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -694,7 +694,7 @@ public static boolean validateMedicationSupplyOrderRepeatNumber(MedicationSupply
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationSupplyOrderOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationSupplyOrderOperations.java
index 71137edb1d..503ae4bad7 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationSupplyOrderOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationSupplyOrderOperations.java
@@ -91,7 +91,7 @@ protected MedicationSupplyOrderOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_INSTRUCTION_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_INSTRUCTION_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -159,7 +159,7 @@ public static boolean validateMedicationSupplyOrderInstructionInversionInd(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_EFFECTIVE_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_EFFECTIVE_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -226,7 +226,7 @@ public static boolean validateMedicationSupplyOrderEffectiveTimeHigh(MedicationS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_CONTAINS_MEDICATION_OR_IMMUNIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_CONTAINS_MEDICATION_OR_IMMUNIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -295,7 +295,7 @@ public static boolean validateMedicationSupplyOrderContainsMedicationOrImmunizat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -362,7 +362,7 @@ public static boolean validateMedicationSupplyOrderTemplateId(MedicationSupplyOr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -475,7 +475,7 @@ public static boolean validateMedicationSupplyOrderEffectiveTime(MedicationSuppl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -678,7 +678,7 @@ public static boolean validateMedicationSupplyOrderStatusCode(MedicationSupplyOr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationSupplyOrderStatusCode(MedicationSupplyOrder, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Supply Order Status Code</em>}' operation.
@@ -699,7 +699,7 @@ public static boolean validateMedicationSupplyOrderStatusCode(MedicationSupplyOr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationSupplyOrderEffectiveTime(MedicationSupplyOrder, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Supply Order Effective Time</em>}' operation.
@@ -720,7 +720,7 @@ public static boolean validateMedicationSupplyOrderStatusCode(MedicationSupplyOr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationSupplyOrderRepeatNumber(MedicationSupplyOrder, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Supply Order Repeat Number</em>}' operation.
@@ -741,7 +741,7 @@ public static boolean validateMedicationSupplyOrderStatusCode(MedicationSupplyOr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationSupplyOrderQuantity(MedicationSupplyOrder, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medication Supply Order Quantity</em>}' operation.
@@ -762,7 +762,7 @@ public static boolean validateMedicationSupplyOrderStatusCode(MedicationSupplyOr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -827,7 +827,7 @@ public static boolean validateMedicationSupplyOrderId(MedicationSupplyOrder medi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -893,7 +893,7 @@ public static boolean validateMedicationSupplyOrderAuthor(MedicationSupplyOrder
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_SUPPLY_ORDER_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationUseNoneKnownOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationUseNoneKnownOperations.java
index 534483cc61..3b604f4a7a 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationUseNoneKnownOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationUseNoneKnownOperations.java
@@ -86,7 +86,7 @@ protected MedicationUseNoneKnownOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -153,7 +153,7 @@ public static boolean validateMedicationUseNoneKnownTextReference(MedicationUseN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateMedicationUseNoneKnownTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -288,7 +288,7 @@ public static boolean validateMedicationUseNoneKnownReferenceValue(MedicationUse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -355,7 +355,7 @@ public static boolean validateMedicationUseNoneKnownTemplateId(MedicationUseNone
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -422,7 +422,7 @@ public static boolean validateMedicationUseNoneKnownClassCode(MedicationUseNoneK
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -489,7 +489,7 @@ public static boolean validateMedicationUseNoneKnownMoodCode(MedicationUseNoneKn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -555,7 +555,7 @@ public static boolean validateMedicationUseNoneKnownId(MedicationUseNoneKnown me
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -604,7 +604,7 @@ public static boolean validateMedicationUseNoneKnownCodeP(MedicationUseNoneKnown
 					"org.openhealthtools.mdht.uml.cda.consol.MedicationUseNoneKnownCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.MedicationUseNoneKnownCodeP", passToken);
 				}
 				passToken.add(medicationUseNoneKnown);
@@ -636,7 +636,7 @@ public static boolean validateMedicationUseNoneKnownCodeP(MedicationUseNoneKnown
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -710,7 +710,7 @@ public static boolean validateMedicationUseNoneKnownCode(MedicationUseNoneKnown
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -778,7 +778,7 @@ public static boolean validateMedicationUseNoneKnownEffectiveTime(MedicationUseN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -845,7 +845,7 @@ public static boolean validateMedicationUseNoneKnownStatusCode(MedicationUseNone
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -912,7 +912,7 @@ public static boolean validateMedicationUseNoneKnownStatusCodeP(MedicationUseNon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -980,7 +980,7 @@ public static boolean validateMedicationUseNoneKnownText(MedicationUseNoneKnown
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1046,7 +1046,7 @@ public static boolean validateMedicationUseNoneKnownValue(MedicationUseNoneKnown
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATION_USE_NONE_KNOWN_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsAdministeredSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsAdministeredSection2Operations.java
index 5eebfa2709..0c9a3afd91 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsAdministeredSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsAdministeredSection2Operations.java
@@ -80,7 +80,7 @@ protected MedicationsAdministeredSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -178,7 +178,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity2> result = (Collection<MedicationActivity2>) query.evaluate(
 			medicationsAdministeredSection2);
-		return new BasicEList.UnmodifiableEList<MedicationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -200,7 +200,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -252,7 +252,7 @@ public static boolean validateMedicationsAdministeredSectionCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.MedicationsAdministeredSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.MedicationsAdministeredSectionCodeP", passToken);
 				}
@@ -285,7 +285,7 @@ public static boolean validateMedicationsAdministeredSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -363,7 +363,7 @@ public static boolean validateMedicationsAdministeredSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsAdministeredSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsAdministeredSectionOperations.java
index 5db0fdf4bc..6189555eef 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsAdministeredSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsAdministeredSectionOperations.java
@@ -87,7 +87,7 @@ protected MedicationsAdministeredSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -159,7 +159,7 @@ public static boolean validateMedicationsAdministeredSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -228,7 +228,7 @@ public static boolean validateMedicationsAdministeredSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -345,7 +345,7 @@ public static boolean validateMedicationsAdministeredSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationsAdministeredSectionText(MedicationsAdministeredSection, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medications Administered Section Text</em>}' operation.
@@ -366,7 +366,7 @@ public static boolean validateMedicationsAdministeredSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -435,7 +435,7 @@ public static boolean validateMedicationsAdministeredSectionTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_ADMINISTERED_SECTION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -532,7 +532,7 @@ public static EList<MedicationActivity> getMedicationActivities(
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity> result = (Collection<MedicationActivity>) query.evaluate(
 			medicationsAdministeredSection);
-		return new BasicEList.UnmodifiableEList<MedicationActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // MedicationsAdministeredSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsSection2Operations.java
index a7bba44333..a91d3cfaa7 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsSection2Operations.java
@@ -83,7 +83,7 @@ protected MedicationsSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -149,7 +149,7 @@ public static boolean validateMedicationsSection2NullFlavor(MedicationsSection2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -214,7 +214,7 @@ public static boolean validateMedicationsSection2Title(MedicationsSection2 medic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -279,7 +279,7 @@ public static boolean validateMedicationsSection2Text(MedicationsSection2 medica
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -347,7 +347,7 @@ public static boolean validateMedicationsSectionEntriesOptionalTemplateId(Medica
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -397,7 +397,7 @@ public static boolean validateMedicationsSectionEntriesOptionalCodeP(Medications
 					"org.openhealthtools.mdht.uml.cda.consol.MedicationsSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.MedicationsSectionEntriesOptionalCodeP", passToken);
 				}
@@ -430,7 +430,7 @@ public static boolean validateMedicationsSectionEntriesOptionalCodeP(Medications
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -505,7 +505,7 @@ public static boolean validateMedicationsSectionEntriesOptionalCode(MedicationsS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -600,7 +600,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(Medicatio
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_MEDICATION_ACTIVITY2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity2> result = (Collection<MedicationActivity2>) query.evaluate(medicationsSection2);
-		return new BasicEList.UnmodifiableEList<MedicationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // MedicationsSection2Operations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsSectionEntriesOptional2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsSectionEntriesOptional2Operations.java
index e7d12b0443..733adfdd49 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsSectionEntriesOptional2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsSectionEntriesOptional2Operations.java
@@ -81,7 +81,7 @@ protected MedicationsSectionEntriesOptional2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_ABSENCE_OF_MEDICATIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_ABSENCE_OF_MEDICATIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -183,7 +183,7 @@ public static boolean validateMedicationsSectionEntriesOptionalCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.MedicationsSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.MedicationsSectionEntriesOptionalCodeP", passToken);
 				}
@@ -222,7 +222,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity2> result = (Collection<MedicationActivity2>) query.evaluate(
 			medicationsSectionEntriesOptional2);
-		return new BasicEList.UnmodifiableEList<MedicationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -313,7 +313,7 @@ public static boolean validateMedicationsSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationsSectionEntriesOptionalCodeP(MedicationsSectionEntriesOptional2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medications Section Entries Optional Code P</em>}' operation.
@@ -334,7 +334,7 @@ public static boolean validateMedicationsSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateMedicationsSectionEntriesOptionalCode(MedicationsSectionEntriesOptional2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Medications Section Entries Optional Code</em>}' operation.
@@ -357,7 +357,7 @@ public static boolean validateMedicationsSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -436,7 +436,7 @@ public static boolean validateMedicationsSectionEntriesOptionalCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsSectionEntriesOptionalOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsSectionEntriesOptionalOperations.java
index 203d0a8558..0405303247 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsSectionEntriesOptionalOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsSectionEntriesOptionalOperations.java
@@ -87,7 +87,7 @@ protected MedicationsSectionEntriesOptionalOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -159,7 +159,7 @@ public static boolean validateMedicationsSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -229,7 +229,7 @@ public static boolean validateMedicationsSectionEntriesOptionalCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -299,7 +299,7 @@ public static boolean validateMedicationsSectionEntriesOptionalCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -369,7 +369,7 @@ public static boolean validateMedicationsSectionEntriesOptionalTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -439,7 +439,7 @@ public static boolean validateMedicationsSectionEntriesOptionalText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -536,7 +536,7 @@ public static EList<MedicationActivity> getMedicationActivities(
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity> result = (Collection<MedicationActivity>) query.evaluate(
 			medicationsSectionEntriesOptional);
-		return new BasicEList.UnmodifiableEList<MedicationActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // MedicationsSectionEntriesOptionalOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsSectionOperations.java
index 420a737fea..a1607374e6 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MedicationsSectionOperations.java
@@ -86,7 +86,7 @@ protected MedicationsSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateMedicationsSectionTitle(MedicationsSection medicat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -216,7 +216,7 @@ public static boolean validateMedicationsSectionText(MedicationsSection medicati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -306,7 +306,7 @@ public static EList<MedicationActivity> getMedications(MedicationsSection medica
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_MEDICATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity> result = (Collection<MedicationActivity>) query.evaluate(medicationsSection);
-		return new BasicEList.UnmodifiableEList<MedicationActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -328,7 +328,7 @@ public static EList<MedicationActivity> getMedications(MedicationsSection medica
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -396,7 +396,7 @@ public static boolean validateMedicationsSectionEntriesOptionalTemplateId(Medica
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -446,7 +446,7 @@ public static boolean validateMedicationsSectionEntriesOptionalCodeP(Medications
 					"org.openhealthtools.mdht.uml.cda.consol.MedicationsSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.MedicationsSectionEntriesOptionalCodeP", passToken);
 				}
@@ -479,7 +479,7 @@ public static boolean validateMedicationsSectionEntriesOptionalCodeP(Medications
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MentalStatusObservation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MentalStatusObservation2Operations.java
index e95089ba1b..ecaea3d6d9 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MentalStatusObservation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MentalStatusObservation2Operations.java
@@ -109,7 +109,7 @@ protected MentalStatusObservation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -176,7 +176,7 @@ public static boolean validateMentalStatusObservation2TemplateId(MentalStatusObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -248,7 +248,7 @@ public static boolean validateMentalStatusObservation2AuthorParticipation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MENTAL_STATUS_OBSERVATION2_CD_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MENTAL_STATUS_OBSERVATION2_CD_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -322,7 +322,7 @@ public static boolean validateMentalStatusObservation2CDTranslation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MENTAL_STATUS_OBSERVATION2_CD_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MENTAL_STATUS_OBSERVATION2_CD_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -424,7 +424,7 @@ public static EList<AssessmentScaleObservation> getConsolAssessmentScaleObservat
 		@SuppressWarnings("unchecked")
 		Collection<AssessmentScaleObservation> result = (Collection<AssessmentScaleObservation>) query.evaluate(
 			mentalStatusObservation2);
-		return new BasicEList.UnmodifiableEList<AssessmentScaleObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -474,7 +474,7 @@ public static EList<NonMedicinalSupplyActivity> getConsolNonMedicinalSupplyActiv
 		@SuppressWarnings("unchecked")
 		Collection<NonMedicinalSupplyActivity> result = (Collection<NonMedicinalSupplyActivity>) query.evaluate(
 			mentalStatusObservation2);
-		return new BasicEList.UnmodifiableEList<NonMedicinalSupplyActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -524,7 +524,7 @@ public static EList<CaregiverCharacteristics> getConsolCaregiverCharacteristicss
 		@SuppressWarnings("unchecked")
 		Collection<CaregiverCharacteristics> result = (Collection<CaregiverCharacteristics>) query.evaluate(
 			mentalStatusObservation2);
-		return new BasicEList.UnmodifiableEList<CaregiverCharacteristics>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -546,7 +546,7 @@ public static EList<CaregiverCharacteristics> getConsolCaregiverCharacteristicss
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_VALUE_DATATYPE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_VALUE_DATATYPE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -616,7 +616,7 @@ public static boolean validateCognitiveStatusResultObservationValueDatatype(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -682,7 +682,7 @@ public static boolean validateResultObservationTextReference(MentalStatusObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -749,7 +749,7 @@ public static boolean validateResultObservationTextReferenceValue(MentalStatusOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -816,7 +816,7 @@ public static boolean validateResultObservationReferenceValue(MentalStatusObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -882,7 +882,7 @@ public static boolean validateResultObservationCodeValue(MentalStatusObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_NO_OBSERVATION_RANGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_NO_OBSERVATION_RANGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -951,7 +951,7 @@ public static boolean validateResultObservationNoObservationRangeCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_AUTHOR_MULTIPLICITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_AUTHOR_MULTIPLICITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1018,7 +1018,7 @@ public static boolean validateResultObservationAuthorMultiplicity(MentalStatusOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1084,7 +1084,7 @@ public static boolean validateResultObservationClassCode(MentalStatusObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1150,7 +1150,7 @@ public static boolean validateResultObservationMoodCode(MentalStatusObservation2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1215,7 +1215,7 @@ public static boolean validateResultObservationId(MentalStatusObservation2 menta
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1263,7 +1263,7 @@ public static boolean validateResultObservationCodeP(MentalStatusObservation2 me
 					"org.openhealthtools.mdht.uml.cda.consol.ResultObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ResultObservationCodeP", passToken);
 				}
 				passToken.add(mentalStatusObservation2);
@@ -1295,7 +1295,7 @@ public static boolean validateResultObservationCodeP(MentalStatusObservation2 me
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1368,7 +1368,7 @@ public static boolean validateResultObservationCode(MentalStatusObservation2 men
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1417,7 +1417,7 @@ public static boolean validateResultObservationStatusCodeP(MentalStatusObservati
 					"org.openhealthtools.mdht.uml.cda.consol.ResultObservationStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ResultObservationStatusCodeP", passToken);
 				}
 				passToken.add(mentalStatusObservation2);
@@ -1448,7 +1448,7 @@ public static boolean validateResultObservationStatusCodeP(MentalStatusObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1522,7 +1522,7 @@ public static boolean validateResultObservationStatusCode(MentalStatusObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1588,7 +1588,7 @@ public static boolean validateResultObservationEffectiveTime(MentalStatusObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1653,7 +1653,7 @@ public static boolean validateResultObservationValue(MentalStatusObservation2 me
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1718,7 +1718,7 @@ public static boolean validateResultObservationText(MentalStatusObservation2 men
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_INTERPRETATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_INTERPRETATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1785,7 +1785,7 @@ public static boolean validateResultObservationInterpretationCode(MentalStatusOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1851,7 +1851,7 @@ public static boolean validateResultObservationMethodCode(MentalStatusObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1918,7 +1918,7 @@ public static boolean validateResultObservationTargetSiteCode(MentalStatusObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1988,7 +1988,7 @@ public static boolean validateCognitiveStatusResultObservationAssessmentScaleObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2058,7 +2058,7 @@ public static boolean validateCognitiveStatusResultObservationReferenceRange(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2127,7 +2127,7 @@ public static boolean validateCognitiveStatusResultObservationAuthor(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_NON_MEDICINAL_SUPPLY_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2197,7 +2197,7 @@ public static boolean validateCognitiveStatusResultObservationNonMedicinalSupply
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_CAREGIVER_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_CAREGIVER_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2267,7 +2267,7 @@ public static boolean validateCognitiveStatusResultObservationCaregiverCharacter
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE_NO_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE_NO_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2343,7 +2343,7 @@ public static boolean validateCognitiveStatusResultObservationReferenceRangeObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_COGNITIVE_STATUS_RESULT_OBSERVATION_REFERENCE_RANGE_OBSERVATION_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MentalStatusObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MentalStatusObservationOperations.java
index d895a96b90..7b810e8bb3 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MentalStatusObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MentalStatusObservationOperations.java
@@ -90,7 +90,7 @@ protected MentalStatusObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -157,7 +157,7 @@ public static boolean validateMentalStatusObservationTemplateId(MentalStatusObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -224,7 +224,7 @@ public static boolean validateMentalStatusObservationClassCode(MentalStatusObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -291,7 +291,7 @@ public static boolean validateMentalStatusObservationMoodCode(MentalStatusObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -357,7 +357,7 @@ public static boolean validateMentalStatusObservationId(MentalStatusObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -406,7 +406,7 @@ public static boolean validateMentalStatusObservationCodeP(MentalStatusObservati
 					"org.openhealthtools.mdht.uml.cda.consol.MentalStatusObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.MentalStatusObservationCodeP", passToken);
 				}
 				passToken.add(mentalStatusObservation);
@@ -438,7 +438,7 @@ public static boolean validateMentalStatusObservationCodeP(MentalStatusObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -513,7 +513,7 @@ public static boolean validateMentalStatusObservationCode(MentalStatusObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -580,7 +580,7 @@ public static boolean validateMentalStatusObservationStatusCode(MentalStatusObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -647,7 +647,7 @@ public static boolean validateMentalStatusObservationStatusCodeP(MentalStatusObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -716,7 +716,7 @@ public static boolean validateMentalStatusObservationEffectiveTime(MentalStatusO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -782,7 +782,7 @@ public static boolean validateMentalStatusObservationValue(MentalStatusObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -848,7 +848,7 @@ public static boolean validateMentalStatusObservationValueP(MentalStatusObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -917,7 +917,7 @@ public static boolean validateMentalStatusObservationAssessmentScaleObservation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_OBSERVATION_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1014,7 +1014,7 @@ public static EList<AssessmentScaleObservation> getAssessmentScaleObservations(
 		@SuppressWarnings("unchecked")
 		Collection<AssessmentScaleObservation> result = (Collection<AssessmentScaleObservation>) query.evaluate(
 			mentalStatusObservation);
-		return new BasicEList.UnmodifiableEList<AssessmentScaleObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // MentalStatusObservationOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MentalStatusOrganizer2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MentalStatusOrganizer2Operations.java
index 2026551059..d2a485f17a 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MentalStatusOrganizer2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MentalStatusOrganizer2Operations.java
@@ -81,7 +81,7 @@ protected MentalStatusOrganizer2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_ORGANIZER2_HAS_CODE_OR_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_ORGANIZER2_HAS_CODE_OR_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -149,7 +149,7 @@ public static boolean validateMentalStatusOrganizer2HasCodeOrEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_ORGANIZER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_ORGANIZER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -216,7 +216,7 @@ public static boolean validateMentalStatusOrganizer2TemplateId(MentalStatusOrgan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_ORGANIZER2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_ORGANIZER2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -283,7 +283,7 @@ public static boolean validateMentalStatusOrganizer2EffectiveTime(MentalStatusOr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MENTAL_STATUS_ORGANIZER2_CD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_MENTAL_STATUS_ORGANIZER2_CD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -383,7 +383,7 @@ public static EList<MentalStatusObservation2> getConsolMentalStatusObservation2s
 		@SuppressWarnings("unchecked")
 		Collection<MentalStatusObservation2> result = (Collection<MentalStatusObservation2>) query.evaluate(
 			mentalStatusOrganizer2);
-		return new BasicEList.UnmodifiableEList<MentalStatusObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -405,7 +405,7 @@ public static EList<MentalStatusObservation2> getConsolMentalStatusObservation2s
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_ORGANIZER_CODE_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_COGNITIVE_STATUS_RESULT_ORGANIZER_CODE_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -474,7 +474,7 @@ public static boolean validateCognitiveStatusResultOrganizerCodeCodeSystem(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -539,7 +539,7 @@ public static boolean validateResultOrganizerCode(MentalStatusOrganizer2 mentalS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MentalStatusSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MentalStatusSectionOperations.java
index 64dac28750..79e9cd36c9 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MentalStatusSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/MentalStatusSectionOperations.java
@@ -89,7 +89,7 @@ protected MentalStatusSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -157,7 +157,7 @@ public static boolean validateMentalStatusSectionTemplateId(MentalStatusSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -222,7 +222,7 @@ public static boolean validateMentalStatusSectionCode(MentalStatusSection mental
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -287,7 +287,7 @@ public static boolean validateMentalStatusSectionCodeP(MentalStatusSection menta
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -352,7 +352,7 @@ public static boolean validateMentalStatusSectionTitle(MentalStatusSection menta
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -417,7 +417,7 @@ public static boolean validateMentalStatusSectionText(MentalStatusSection mental
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_SECTION_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_SECTION_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -485,7 +485,7 @@ public static boolean validateMentalStatusSectionAssessmentScaleObservation(Ment
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_SECTION_MENTAL_STATUS_ORGANIZER2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_SECTION_MENTAL_STATUS_ORGANIZER2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -552,7 +552,7 @@ public static boolean validateMentalStatusSectionMentalStatusOrganizer2(MentalSt
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_SECTION_MENTAL_STATUS_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MENTAL_STATUS_SECTION_MENTAL_STATUS_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -648,7 +648,7 @@ public static EList<AssessmentScaleObservation> getAssessmentScaleObservations(
 		@SuppressWarnings("unchecked")
 		Collection<AssessmentScaleObservation> result = (Collection<AssessmentScaleObservation>) query.evaluate(
 			mentalStatusSection);
-		return new BasicEList.UnmodifiableEList<AssessmentScaleObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -696,7 +696,7 @@ public static EList<MentalStatusOrganizer2> getMentalStatusOrganizer2s(MentalSta
 		@SuppressWarnings("unchecked")
 		Collection<MentalStatusOrganizer2> result = (Collection<MentalStatusOrganizer2>) query.evaluate(
 			mentalStatusSection);
-		return new BasicEList.UnmodifiableEList<MentalStatusOrganizer2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -746,7 +746,7 @@ public static EList<MentalStatusObservation2> getMentalStatusObservation2s(
 		@SuppressWarnings("unchecked")
 		Collection<MentalStatusObservation2> result = (Collection<MentalStatusObservation2>) query.evaluate(
 			mentalStatusSection);
-		return new BasicEList.UnmodifiableEList<MentalStatusObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // MentalStatusSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ModelNumberObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ModelNumberObservationOperations.java
index a375bae002..c31ff20bee 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ModelNumberObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ModelNumberObservationOperations.java
@@ -81,7 +81,7 @@ protected ModelNumberObservationOperations() {
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_MODEL_NUMBER_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MODEL_NUMBER_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -146,7 +146,7 @@ public static boolean validateModelNumberObservationTemplateId(ModelNumberObserv
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_MODEL_NUMBER_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MODEL_NUMBER_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -194,7 +194,7 @@ public static boolean validateModelNumberObservationCodeP(ModelNumberObservation
 					"org.openhealthtools.mdht.uml.cda.consol.ModelNumberObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ModelNumberObservationCodeP", passToken);
 				}
 				passToken.add(modelNumberObservation);
@@ -225,7 +225,7 @@ public static boolean validateModelNumberObservationCodeP(ModelNumberObservation
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_MODEL_NUMBER_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MODEL_NUMBER_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -297,7 +297,7 @@ public static boolean validateModelNumberObservationCode(ModelNumberObservation
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_MODEL_NUMBER_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_MODEL_NUMBER_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NonMedicinalSupplyActivity2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NonMedicinalSupplyActivity2Operations.java
index dd57d3efa2..496221c3a4 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NonMedicinalSupplyActivity2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NonMedicinalSupplyActivity2Operations.java
@@ -82,7 +82,7 @@ protected NonMedicinalSupplyActivity2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY2_INSTRUCTION2_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY2_INSTRUCTION2_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -152,7 +152,7 @@ public static boolean validateNonMedicinalSupplyActivity2Instruction2InversionIn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateNonMedicinalSupplyActivity2TemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -273,7 +273,7 @@ public static boolean validateNonMedicinalSupplyActivityStatusCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.NonMedicinalSupplyActivityStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.NonMedicinalSupplyActivityStatusCodeP", passToken);
 				}
@@ -304,7 +304,7 @@ public static boolean validateNonMedicinalSupplyActivityStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY2_INSTRUCTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY2_INSTRUCTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -465,7 +465,7 @@ public static ProductInstance getConsolProductInstance(NonMedicinalSupplyActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -542,7 +542,7 @@ public static boolean validateNonMedicinalSupplyActivityStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_PRODUCT_INSTANCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_PRODUCT_INSTANCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NonMedicinalSupplyActivityOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NonMedicinalSupplyActivityOperations.java
index ddec99b737..a2a70c04a2 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NonMedicinalSupplyActivityOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NonMedicinalSupplyActivityOperations.java
@@ -88,7 +88,7 @@ protected NonMedicinalSupplyActivityOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_EFFECTIVE_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_EFFECTIVE_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -158,7 +158,7 @@ public static boolean validateNonMedicinalSupplyActivityEffectiveTimeHigh(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_PRODUCT_INSTANCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_PRODUCT_INSTANCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -228,7 +228,7 @@ public static boolean validateNonMedicinalSupplyActivityProductInstanceTypeCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -297,7 +297,7 @@ public static boolean validateNonMedicinalSupplyActivityTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -368,7 +368,7 @@ public static boolean validateNonMedicinalSupplyActivityClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -436,7 +436,7 @@ public static boolean validateNonMedicinalSupplyActivityMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -502,7 +502,7 @@ public static boolean validateNonMedicinalSupplyActivityId(NonMedicinalSupplyAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -571,7 +571,7 @@ public static boolean validateNonMedicinalSupplyActivityStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -641,7 +641,7 @@ public static boolean validateNonMedicinalSupplyActivityEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -709,7 +709,7 @@ public static boolean validateNonMedicinalSupplyActivityQuantity(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_PRODUCT_INSTANCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NON_MEDICINAL_SUPPLY_ACTIVITY_PRODUCT_INSTANCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NoteActivityOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NoteActivityOperations.java
index a343cedbd7..d8afa048ca 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NoteActivityOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NoteActivityOperations.java
@@ -95,7 +95,7 @@ protected NoteActivityOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -160,7 +160,7 @@ public static boolean validateNoteActivityTemplateId(NoteActivity noteActivity,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -208,7 +208,7 @@ public static boolean validateNoteActivityCodeP(NoteActivity noteActivity, Diagn
 					"org.openhealthtools.mdht.uml.cda.consol.NoteActivityCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.NoteActivityCodeP", passToken);
 				}
 				passToken.add(noteActivity);
@@ -240,7 +240,7 @@ public static boolean validateNoteActivityCodeP(NoteActivity noteActivity, Diagn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -313,7 +313,7 @@ public static boolean validateNoteActivityCode(NoteActivity noteActivity, Diagno
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -378,7 +378,7 @@ public static boolean validateNoteActivityText(NoteActivity noteActivity, Diagno
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -443,7 +443,7 @@ public static boolean validateNoteActivityStatusCode(NoteActivity noteActivity,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -508,7 +508,7 @@ public static boolean validateNoteActivityEffectiveTime(NoteActivity noteActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -573,7 +573,7 @@ public static boolean validateNoteActivityClassCode(NoteActivity noteActivity, D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -638,7 +638,7 @@ public static boolean validateNoteActivityMoodCode(NoteActivity noteActivity, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -703,7 +703,7 @@ public static boolean validateNoteActivityAuthor(NoteActivity noteActivity, Diag
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -768,7 +768,7 @@ public static boolean validateNoteActivityParticipant(NoteActivity noteActivity,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NOTE_ACTIVITY_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -833,7 +833,7 @@ public static boolean validateNoteActivityReference(NoteActivity noteActivity, D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NOTE_ACTIVITY_CD_TRANSLATION1_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NOTE_ACTIVITY_CD_TRANSLATION1_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -886,7 +886,7 @@ public static boolean validateNoteActivityCDTranslation1P(NoteActivity noteActiv
 						"org.openhealthtools.mdht.uml.cda.consol.NoteActivityCDTranslation1P");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put("org.openhealthtools.mdht.uml.cda.consol.NoteActivityCDTranslation1P", passToken);
 					}
 					passToken.addAll(oclResultSet);
@@ -919,7 +919,7 @@ public static boolean validateNoteActivityCDTranslation1P(NoteActivity noteActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NOTE_ACTIVITY_CD_TRANSLATION1__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NOTE_ACTIVITY_CD_TRANSLATION1__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1000,7 +1000,7 @@ public static boolean validateNoteActivityCDTranslation1(NoteActivity noteActivi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NOTE_ACTIVITY_IVLTS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NOTE_ACTIVITY_IVLTS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NumberOfPressureUlcersObservation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NumberOfPressureUlcersObservation2Operations.java
index 648de8ed5a..70ec519798 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NumberOfPressureUlcersObservation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NumberOfPressureUlcersObservation2Operations.java
@@ -85,7 +85,7 @@ protected NumberOfPressureUlcersObservation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -157,7 +157,7 @@ public static boolean validateNumberOfPressureUlcersObservation2TemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION2_CD_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION2_CD_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -232,7 +232,7 @@ public static boolean validateNumberOfPressureUlcersObservation2CDTranslation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION2_CD_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION2_CD_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -307,7 +307,7 @@ public static boolean validateNumberOfPressureUlcersObservation2CDTranslationP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION2_ENTRY_RELATIONSHIP_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION2_ENTRY_RELATIONSHIP_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -365,7 +365,7 @@ public static boolean validateNumberOfPressureUlcersObservation2EntryRelationshi
 						"org.openhealthtools.mdht.uml.cda.consol.NumberOfPressureUlcersObservation2EntryRelationshipObservationCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.NumberOfPressureUlcersObservation2EntryRelationshipObservationCodeP",
 							passToken);
@@ -400,7 +400,7 @@ public static boolean validateNumberOfPressureUlcersObservation2EntryRelationshi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION2_ENTRY_RELATIONSHIP_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION2_ENTRY_RELATIONSHIP_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -487,7 +487,7 @@ public static boolean validateNumberOfPressureUlcersObservation2EntryRelationshi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -540,7 +540,7 @@ public static boolean validateNumberOfPressureUlcersObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.NumberOfPressureUlcersObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.NumberOfPressureUlcersObservationCodeP", passToken);
 				}
@@ -573,7 +573,7 @@ public static boolean validateNumberOfPressureUlcersObservationCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -652,7 +652,7 @@ public static boolean validateNumberOfPressureUlcersObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -722,7 +722,7 @@ public static boolean validateNumberOfPressureUlcersObservationEntryRelationship
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -799,7 +799,7 @@ public static boolean validateNumberOfPressureUlcersObservationEntryRelationship
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -876,7 +876,7 @@ public static boolean validateNumberOfPressureUlcersObservationEntryRelationship
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -934,7 +934,7 @@ public static boolean validateNumberOfPressureUlcersObservationEntryRelationship
 						"org.openhealthtools.mdht.uml.cda.consol.NumberOfPressureUlcersObservationEntryRelationshipObservationValueP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.NumberOfPressureUlcersObservationEntryRelationshipObservationValueP",
 							passToken);
@@ -969,7 +969,7 @@ public static boolean validateNumberOfPressureUlcersObservationEntryRelationship
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1056,7 +1056,7 @@ public static boolean validateNumberOfPressureUlcersObservationEntryRelationship
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1132,7 +1132,7 @@ public static boolean validateNumberOfPressureUlcersObservationEntryRelationship
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NumberOfPressureUlcersObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NumberOfPressureUlcersObservationOperations.java
index 299b3dfb78..ca15054e36 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NumberOfPressureUlcersObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NumberOfPressureUlcersObservationOperations.java
@@ -93,7 +93,7 @@ protected NumberOfPressureUlcersObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -163,7 +163,7 @@ public static boolean validateNumberOfPressureUlcersObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -233,7 +233,7 @@ public static boolean validateNumberOfPressureUlcersObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -303,7 +303,7 @@ public static boolean validateNumberOfPressureUlcersObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -373,7 +373,7 @@ public static boolean validateNumberOfPressureUlcersObservationId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -426,7 +426,7 @@ public static boolean validateNumberOfPressureUlcersObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.NumberOfPressureUlcersObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.NumberOfPressureUlcersObservationCodeP", passToken);
 				}
@@ -459,7 +459,7 @@ public static boolean validateNumberOfPressureUlcersObservationCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -539,7 +539,7 @@ public static boolean validateNumberOfPressureUlcersObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -609,7 +609,7 @@ public static boolean validateNumberOfPressureUlcersObservationStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -679,7 +679,7 @@ public static boolean validateNumberOfPressureUlcersObservationStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -749,7 +749,7 @@ public static boolean validateNumberOfPressureUlcersObservationEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -819,7 +819,7 @@ public static boolean validateNumberOfPressureUlcersObservationValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -889,7 +889,7 @@ public static boolean validateNumberOfPressureUlcersObservationAuthor(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -959,7 +959,7 @@ public static boolean validateNumberOfPressureUlcersObservationEntryRelationship
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1036,7 +1036,7 @@ public static boolean validateNumberOfPressureUlcersObservationEntryRelationship
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1115,7 +1115,7 @@ public static boolean validateNumberOfPressureUlcersObservationEntryRelationship
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1192,7 +1192,7 @@ public static boolean validateNumberOfPressureUlcersObservationEntryRelationship
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1269,7 +1269,7 @@ public static boolean validateNumberOfPressureUlcersObservationEntryRelationship
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1345,7 +1345,7 @@ public static boolean validateNumberOfPressureUlcersObservationEntryRelationship
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION_ENTRY_RELATIONSHIP_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NutritionAssessmentOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NutritionAssessmentOperations.java
index 0f01f5bbc0..107ef08a74 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NutritionAssessmentOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NutritionAssessmentOperations.java
@@ -83,7 +83,7 @@ protected NutritionAssessmentOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_VALUE_OF_TYPE_CD_IS_FROM_SNOMED__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_VALUE_OF_TYPE_CD_IS_FROM_SNOMED__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateNutritionAssessmentValueOfTypeCDIsFromSnomed(Nutri
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -217,7 +217,7 @@ public static boolean validateNutritionAssessmentTemplateId(NutritionAssessment
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -283,7 +283,7 @@ public static boolean validateNutritionAssessmentClassCode(NutritionAssessment n
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -348,7 +348,7 @@ public static boolean validateNutritionAssessmentMoodCode(NutritionAssessment nu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -413,7 +413,7 @@ public static boolean validateNutritionAssessmentId(NutritionAssessment nutritio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -461,7 +461,7 @@ public static boolean validateNutritionAssessmentCodeP(NutritionAssessment nutri
 					"org.openhealthtools.mdht.uml.cda.consol.NutritionAssessmentCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.NutritionAssessmentCodeP", passToken);
 				}
 				passToken.add(nutritionAssessment);
@@ -493,7 +493,7 @@ public static boolean validateNutritionAssessmentCodeP(NutritionAssessment nutri
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -567,7 +567,7 @@ public static boolean validateNutritionAssessmentCode(NutritionAssessment nutrit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -633,7 +633,7 @@ public static boolean validateNutritionAssessmentStatusCode(NutritionAssessment
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -700,7 +700,7 @@ public static boolean validateNutritionAssessmentStatusCodeP(NutritionAssessment
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -767,7 +767,7 @@ public static boolean validateNutritionAssessmentEffectiveTime(NutritionAssessme
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -832,7 +832,7 @@ public static boolean validateNutritionAssessmentValue(NutritionAssessment nutri
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_ASSESSMENT_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NutritionRecommendationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NutritionRecommendationOperations.java
index 81e5cab506..8d20a5ce29 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NutritionRecommendationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NutritionRecommendationOperations.java
@@ -98,7 +98,7 @@ protected NutritionRecommendationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -165,7 +165,7 @@ public static boolean validateNutritionRecommendationTemplateId(NutritionRecomme
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -232,7 +232,7 @@ public static boolean validateNutritionRecommendationClassCode(NutritionRecommen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_MOOD_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_MOOD_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -282,7 +282,7 @@ public static boolean validateNutritionRecommendationMoodCodeP(NutritionRecommen
 					"org.openhealthtools.mdht.uml.cda.consol.NutritionRecommendationMoodCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.NutritionRecommendationMoodCodeP", passToken);
 				}
 				passToken.add(nutritionRecommendation);
@@ -314,7 +314,7 @@ public static boolean validateNutritionRecommendationMoodCodeP(NutritionRecommen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -389,7 +389,7 @@ public static boolean validateNutritionRecommendationMoodCode(NutritionRecommend
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -438,7 +438,7 @@ public static boolean validateNutritionRecommendationCodeP(NutritionRecommendati
 					"org.openhealthtools.mdht.uml.cda.consol.NutritionRecommendationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.NutritionRecommendationCodeP", passToken);
 				}
 				passToken.add(nutritionRecommendation);
@@ -470,7 +470,7 @@ public static boolean validateNutritionRecommendationCodeP(NutritionRecommendati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -545,7 +545,7 @@ public static boolean validateNutritionRecommendationCode(NutritionRecommendatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -612,7 +612,7 @@ public static boolean validateNutritionRecommendationStatusCode(NutritionRecomme
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -679,7 +679,7 @@ public static boolean validateNutritionRecommendationStatusCodeP(NutritionRecomm
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -746,7 +746,7 @@ public static boolean validateNutritionRecommendationEffectiveTime(NutritionReco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_PLANNED_ENCOUNTER2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_PLANNED_ENCOUNTER2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -814,7 +814,7 @@ public static boolean validateNutritionRecommendationPlannedEncounter2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_PLANNED_MEDICATION_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_PLANNED_MEDICATION_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -883,7 +883,7 @@ public static boolean validateNutritionRecommendationPlannedMedicationActivity2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_PLANNED_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_PLANNED_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -951,7 +951,7 @@ public static boolean validateNutritionRecommendationPlannedObservation2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_PLANNED_PROCEDURE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_PLANNED_PROCEDURE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1019,7 +1019,7 @@ public static boolean validateNutritionRecommendationPlannedProcedure2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_PLANNED_SUPPLY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_PLANNED_SUPPLY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1086,7 +1086,7 @@ public static boolean validateNutritionRecommendationPlannedSupply2(NutritionRec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_PLANNED_ACT2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_RECOMMENDATION_PLANNED_ACT2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1178,7 +1178,7 @@ public static EList<PlannedEncounter2> getPlannedEncounter2s(NutritionRecommenda
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PLANNED_ENCOUNTER2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PlannedEncounter2> result = (Collection<PlannedEncounter2>) query.evaluate(nutritionRecommendation);
-		return new BasicEList.UnmodifiableEList<PlannedEncounter2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1228,7 +1228,7 @@ public static EList<PlannedMedicationActivity2> getPlannedMedicationActivity2s(
 		@SuppressWarnings("unchecked")
 		Collection<PlannedMedicationActivity2> result = (Collection<PlannedMedicationActivity2>) query.evaluate(
 			nutritionRecommendation);
-		return new BasicEList.UnmodifiableEList<PlannedMedicationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1276,7 +1276,7 @@ public static EList<PlannedObservation2> getPlannedObservation2s(NutritionRecomm
 		@SuppressWarnings("unchecked")
 		Collection<PlannedObservation2> result = (Collection<PlannedObservation2>) query.evaluate(
 			nutritionRecommendation);
-		return new BasicEList.UnmodifiableEList<PlannedObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1323,7 +1323,7 @@ public static EList<PlannedProcedure2> getPlannedProcedure2s(NutritionRecommenda
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PLANNED_PROCEDURE2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PlannedProcedure2> result = (Collection<PlannedProcedure2>) query.evaluate(nutritionRecommendation);
-		return new BasicEList.UnmodifiableEList<PlannedProcedure2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1370,7 +1370,7 @@ public static EList<PlannedSupply2> getPlannedSupply2s(NutritionRecommendation n
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PLANNED_SUPPLY2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PlannedSupply2> result = (Collection<PlannedSupply2>) query.evaluate(nutritionRecommendation);
-		return new BasicEList.UnmodifiableEList<PlannedSupply2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1417,7 +1417,7 @@ public static EList<PlannedAct2> getPlannedAct2s(NutritionRecommendation nutriti
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PLANNED_ACT2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PlannedAct2> result = (Collection<PlannedAct2>) query.evaluate(nutritionRecommendation);
-		return new BasicEList.UnmodifiableEList<PlannedAct2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // NutritionRecommendationOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NutritionSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NutritionSectionOperations.java
index 43fc33673c..e89633cc71 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NutritionSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NutritionSectionOperations.java
@@ -83,7 +83,7 @@ protected NutritionSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -150,7 +150,7 @@ public static boolean validateNutritionSectionTemplateId(NutritionSection nutrit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -215,7 +215,7 @@ public static boolean validateNutritionSectionCode(NutritionSection nutritionSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -280,7 +280,7 @@ public static boolean validateNutritionSectionCodeP(NutritionSection nutritionSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -345,7 +345,7 @@ public static boolean validateNutritionSectionTitle(NutritionSection nutritionSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -410,7 +410,7 @@ public static boolean validateNutritionSectionText(NutritionSection nutritionSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_SECTION_NUTRITIONAL_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITION_SECTION_NUTRITIONAL_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -505,7 +505,7 @@ public static EList<NutritionalStatusObservation> getNutritionalStatusObservatio
 		@SuppressWarnings("unchecked")
 		Collection<NutritionalStatusObservation> result = (Collection<NutritionalStatusObservation>) query.evaluate(
 			nutritionSection);
-		return new BasicEList.UnmodifiableEList<NutritionalStatusObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // NutritionSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NutritionalStatusObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NutritionalStatusObservationOperations.java
index bac9bcba48..c86197b057 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NutritionalStatusObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/NutritionalStatusObservationOperations.java
@@ -89,7 +89,7 @@ protected NutritionalStatusObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -158,7 +158,7 @@ public static boolean validateNutritionalStatusObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -227,7 +227,7 @@ public static boolean validateNutritionalStatusObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -296,7 +296,7 @@ public static boolean validateNutritionalStatusObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -363,7 +363,7 @@ public static boolean validateNutritionalStatusObservationId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -415,7 +415,7 @@ public static boolean validateNutritionalStatusObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.NutritionalStatusObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.NutritionalStatusObservationCodeP", passToken);
 				}
 				passToken.add(nutritionalStatusObservation);
@@ -447,7 +447,7 @@ public static boolean validateNutritionalStatusObservationCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -525,7 +525,7 @@ public static boolean validateNutritionalStatusObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -594,7 +594,7 @@ public static boolean validateNutritionalStatusObservationStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -664,7 +664,7 @@ public static boolean validateNutritionalStatusObservationStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -736,7 +736,7 @@ public static boolean validateNutritionalStatusObservationEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -805,7 +805,7 @@ public static boolean validateNutritionalStatusObservationValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -874,7 +874,7 @@ public static boolean validateNutritionalStatusObservationValueP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_NUTRITION_ASSESSMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_NUTRITIONAL_STATUS_OBSERVATION_NUTRITION_ASSESSMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -971,7 +971,7 @@ public static EList<NutritionAssessment> getNutritionAssessments(
 		@SuppressWarnings("unchecked")
 		Collection<NutritionAssessment> result = (Collection<NutritionAssessment>) query.evaluate(
 			nutritionalStatusObservation);
-		return new BasicEList.UnmodifiableEList<NutritionAssessment>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // NutritionalStatusObservationOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ObjectiveSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ObjectiveSectionOperations.java
index a0087a4d31..45d23baebe 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ObjectiveSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ObjectiveSectionOperations.java
@@ -79,7 +79,7 @@ protected ObjectiveSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OBJECTIVE_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OBJECTIVE_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -146,7 +146,7 @@ public static boolean validateObjectiveSectionTemplateId(ObjectiveSection object
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OBJECTIVE_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OBJECTIVE_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -211,7 +211,7 @@ public static boolean validateObjectiveSectionCode(ObjectiveSection objectiveSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OBJECTIVE_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OBJECTIVE_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -276,7 +276,7 @@ public static boolean validateObjectiveSectionCodeP(ObjectiveSection objectiveSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OBJECTIVE_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OBJECTIVE_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -341,7 +341,7 @@ public static boolean validateObjectiveSectionText(ObjectiveSection objectiveSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OBJECTIVE_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OBJECTIVE_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ObserverContextOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ObserverContextOperations.java
index 378a9dcda0..6ef983e2d9 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ObserverContextOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ObserverContextOperations.java
@@ -72,7 +72,7 @@ protected ObserverContextOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OBSERVER_CONTEXT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OBSERVER_CONTEXT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -137,7 +137,7 @@ public static boolean validateObserverContextTemplateId(ObserverContext observer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OBSERVER_CONTEXT_ASSIGNED_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OBSERVER_CONTEXT_ASSIGNED_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OperativeNote2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OperativeNote2Operations.java
index 21f625f72e..438de03bea 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OperativeNote2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OperativeNote2Operations.java
@@ -146,7 +146,7 @@ protected OperativeNote2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -194,7 +194,7 @@ public static boolean validateOperativeNote2CodeP(OperativeNote2 operativeNote2,
 					"org.openhealthtools.mdht.uml.cda.consol.OperativeNote2CodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.OperativeNote2CodeP", passToken);
 				}
 				passToken.add(operativeNote2);
@@ -226,7 +226,7 @@ public static boolean validateOperativeNote2CodeP(OperativeNote2 operativeNote2,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -299,7 +299,7 @@ public static boolean validateOperativeNote2Code(OperativeNote2 operativeNote2,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -364,7 +364,7 @@ public static boolean validateOperativeNote2DocumentationOf(OperativeNote2 opera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_AUTHORIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_AUTHORIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -429,7 +429,7 @@ public static boolean validateOperativeNote2Authorization(OperativeNote2 operati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_ANESTHESIA_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_ANESTHESIA_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -495,7 +495,7 @@ public static boolean validateOperativeNote2AnesthesiaSection2(OperativeNote2 op
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_COMPLICATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_COMPLICATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -562,7 +562,7 @@ public static boolean validateOperativeNote2ComplicationsSection2(OperativeNote2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PREOPERATIVE_DIAGNOSIS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PREOPERATIVE_DIAGNOSIS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -629,7 +629,7 @@ public static boolean validateOperativeNote2PreoperativeDiagnosisSection2(Operat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PROCEDURE_ESTIMATED_BLOOD_LOSS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PROCEDURE_ESTIMATED_BLOOD_LOSS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -697,7 +697,7 @@ public static boolean validateOperativeNote2ProcedureEstimatedBloodLossSection(O
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PROCEDURE_FINDINGS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PROCEDURE_FINDINGS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -764,7 +764,7 @@ public static boolean validateOperativeNote2ProcedureFindingsSection2(OperativeN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PROCEDURE_SPECIMENS_TAKEN_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PROCEDURE_SPECIMENS_TAKEN_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -831,7 +831,7 @@ public static boolean validateOperativeNote2ProcedureSpecimensTakenSection(Opera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PROCEDURE_DESCRIPTION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PROCEDURE_DESCRIPTION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -898,7 +898,7 @@ public static boolean validateOperativeNote2ProcedureDescriptionSection(Operativ
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_POSTOPERATIVE_DIAGNOSIS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_POSTOPERATIVE_DIAGNOSIS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -965,7 +965,7 @@ public static boolean validateOperativeNote2PostoperativeDiagnosisSection(Operat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PROCEDURE_IMPLANTS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PROCEDURE_IMPLANTS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1032,7 +1032,7 @@ public static boolean validateOperativeNote2ProcedureImplantsSection(OperativeNo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_OPERATIVE_NOTE_FLUID_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_OPERATIVE_NOTE_FLUID_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1099,7 +1099,7 @@ public static boolean validateOperativeNote2OperativeNoteFluidSection(OperativeN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_OPERATIVE_NOTE_SURGICAL_PROCEDURE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_OPERATIVE_NOTE_SURGICAL_PROCEDURE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1167,7 +1167,7 @@ public static boolean validateOperativeNote2OperativeNoteSurgicalProcedureSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1234,7 +1234,7 @@ public static boolean validateOperativeNote2PlanOfTreatmentSection2(OperativeNot
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PLANNED_PROCEDURE_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PLANNED_PROCEDURE_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1301,7 +1301,7 @@ public static boolean validateOperativeNote2PlannedProcedureSection2(OperativeNo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PROCEDURE_DISPOSITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PROCEDURE_DISPOSITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1368,7 +1368,7 @@ public static boolean validateOperativeNote2ProcedureDispositionSection(Operativ
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PROCEDURE_INDICATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_PROCEDURE_INDICATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1435,7 +1435,7 @@ public static boolean validateOperativeNote2ProcedureIndicationsSection2(Operati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_SURGICAL_DRAINS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE2_SURGICAL_DRAINS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1502,7 +1502,7 @@ public static boolean validateOperativeNote2SurgicalDrainsSection(OperativeNote2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_US_REALM_DATE_AND_TIME_DT_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_US_REALM_DATE_AND_TIME_DT_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1639,7 +1639,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateOperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCode(OperativeNote2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Operative Note2 Documentation Of Service Event Performer Assigned Entity Code</em>}' operation.
@@ -1662,7 +1662,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1717,7 +1717,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEventPerformer
 						"org.openhealthtools.mdht.uml.cda.consol.OperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.OperativeNote2DocumentationOfServiceEventPerformerAssignedEntityCodeP",
 							passToken);
@@ -1750,7 +1750,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1824,7 +1824,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1962,7 +1962,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateOperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCode(OperativeNote2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Operative Note2 Documentation Of Service Event Performer Assistants Assigned Entity Code</em>}' operation.
@@ -1985,7 +1985,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2041,7 +2041,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEventPerformer
 						"org.openhealthtools.mdht.uml.cda.consol.OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.OperativeNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCodeP",
 							passToken);
@@ -2074,7 +2074,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2148,7 +2148,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2223,7 +2223,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_HAS_HIGH_WHEN_NO_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_HAS_HIGH_WHEN_NO_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2297,7 +2297,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEventEffective
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_NO_HIGH_IF_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_NO_HIGH_IF_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2371,7 +2371,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEventEffective
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PROCEDURE_CODES__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PROCEDURE_CODES__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2445,7 +2445,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEventProcedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2519,7 +2519,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEventEffective
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2592,7 +2592,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEventCode(Oper
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2665,7 +2665,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2739,7 +2739,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2811,7 +2811,7 @@ public static boolean validateOperativeNote2DocumentationOfServiceEvent(Operativ
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_AUTHORIZATION_CONSENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_AUTHORIZATION_CONSENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2884,7 +2884,7 @@ public static boolean validateOperativeNote2AuthorizationConsentClassCode(Operat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_AUTHORIZATION_CONSENT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_AUTHORIZATION_CONSENT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2956,7 +2956,7 @@ public static boolean validateOperativeNote2AuthorizationConsentMoodCode(Operati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_AUTHORIZATION_CONSENT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_AUTHORIZATION_CONSENT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3029,7 +3029,7 @@ public static boolean validateOperativeNote2AuthorizationConsentStatusCode(Opera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_AUTHORIZATION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_AUTHORIZATION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3101,7 +3101,7 @@ public static boolean validateOperativeNote2AuthorizationTypeCode(OperativeNote2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_AUTHORIZATION_CONSENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE2_AUTHORIZATION_CONSENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3905,7 +3905,7 @@ public static SurgicalDrainsSection getSurgicalDrainsSection(OperativeNote2 oper
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OperativeNoteFluidSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OperativeNoteFluidSectionOperations.java
index b398d0be8e..fa49b669b3 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OperativeNoteFluidSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OperativeNoteFluidSectionOperations.java
@@ -79,7 +79,7 @@ protected OperativeNoteFluidSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_FLUID_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_FLUID_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -149,7 +149,7 @@ public static boolean validateOperativeNoteFluidSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_FLUID_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_FLUID_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -215,7 +215,7 @@ public static boolean validateOperativeNoteFluidSectionCode(OperativeNoteFluidSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_FLUID_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_FLUID_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -282,7 +282,7 @@ public static boolean validateOperativeNoteFluidSectionCodeP(OperativeNoteFluidS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_FLUID_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_FLUID_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -348,7 +348,7 @@ public static boolean validateOperativeNoteFluidSectionText(OperativeNoteFluidSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_FLUID_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_FLUID_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OperativeNoteOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OperativeNoteOperations.java
index 788c6328f5..5c284e892a 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OperativeNoteOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OperativeNoteOperations.java
@@ -146,7 +146,7 @@ protected OperativeNoteOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -194,7 +194,7 @@ public static boolean validateGeneralHeaderConstraintsCodeP(OperativeNote operat
 					"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsCodeP", passToken);
 				}
 				passToken.add(operativeNote);
@@ -224,7 +224,7 @@ public static boolean validateGeneralHeaderConstraintsCodeP(OperativeNote operat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -289,7 +289,7 @@ public static boolean validateOperativeNoteDocumentationOf(OperativeNote operati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_ANESTHESIA_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_ANESTHESIA_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -354,7 +354,7 @@ public static boolean validateOperativeNoteAnesthesiaSection(OperativeNote opera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_COMPLICATIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_COMPLICATIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -420,7 +420,7 @@ public static boolean validateOperativeNoteComplicationsSection(OperativeNote op
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_POSTOPERATIVE_DIAGNOSIS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_POSTOPERATIVE_DIAGNOSIS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -487,7 +487,7 @@ public static boolean validateOperativeNotePostoperativeDiagnosisSection(Operati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PREOPERATIVE_DIAGNOSIS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PREOPERATIVE_DIAGNOSIS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -554,7 +554,7 @@ public static boolean validateOperativeNotePreoperativeDiagnosisSection(Operativ
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PROCEDURE_ESTIMATED_BLOOD_LOSS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PROCEDURE_ESTIMATED_BLOOD_LOSS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -621,7 +621,7 @@ public static boolean validateOperativeNoteProcedureEstimatedBloodLossSection(Op
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PROCEDURE_FINDINGS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PROCEDURE_FINDINGS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -688,7 +688,7 @@ public static boolean validateOperativeNoteProcedureFindingsSection(OperativeNot
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PROCEDURE_SPECIMENS_TAKEN_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PROCEDURE_SPECIMENS_TAKEN_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -755,7 +755,7 @@ public static boolean validateOperativeNoteProcedureSpecimensTakenSection(Operat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PROCEDURE_DESCRIPTION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PROCEDURE_DESCRIPTION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -822,7 +822,7 @@ public static boolean validateOperativeNoteProcedureDescriptionSection(Operative
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PROCEDURE_IMPLANTS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PROCEDURE_IMPLANTS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -889,7 +889,7 @@ public static boolean validateOperativeNoteProcedureImplantsSection(OperativeNot
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_OPERATIVE_NOTE_FLUID_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_OPERATIVE_NOTE_FLUID_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -956,7 +956,7 @@ public static boolean validateOperativeNoteOperativeNoteFluidSection(OperativeNo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_OPERATIVE_NOTE_SURGICAL_PROCEDURE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_OPERATIVE_NOTE_SURGICAL_PROCEDURE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1024,7 +1024,7 @@ public static boolean validateOperativeNoteOperativeNoteSurgicalProcedureSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PLAN_OF_CARE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PLAN_OF_CARE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1090,7 +1090,7 @@ public static boolean validateOperativeNotePlanOfCareSection(OperativeNote opera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PLANNED_PROCEDURE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PLANNED_PROCEDURE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1157,7 +1157,7 @@ public static boolean validateOperativeNotePlannedProcedureSection(OperativeNote
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PROCEDURE_DISPOSITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PROCEDURE_DISPOSITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1224,7 +1224,7 @@ public static boolean validateOperativeNoteProcedureDispositionSection(Operative
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PROCEDURE_INDICATIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_PROCEDURE_INDICATIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1291,7 +1291,7 @@ public static boolean validateOperativeNoteProcedureIndicationsSection(Operative
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_SURGICAL_DRAINS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_SURGICAL_DRAINS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1360,7 +1360,7 @@ public static boolean validateOperativeNoteSurgicalDrainsSection(OperativeNote o
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_PRIMARY_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_PRIMARY_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1435,7 +1435,7 @@ public static boolean validateOperativeNoteDocumentationOfServiceEventPrimaryPer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_PRIMARY_PERFORMER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_PRIMARY_PERFORMER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1510,7 +1510,7 @@ public static boolean validateOperativeNoteDocumentationOfServiceEventPrimaryPer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_PRIMARY_PERFORMER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_PRIMARY_PERFORMER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1584,7 +1584,7 @@ public static boolean validateOperativeNoteDocumentationOfServiceEventPrimaryPer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_PRIMARY_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_PRIMARY_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1658,7 +1658,7 @@ public static boolean validateOperativeNoteDocumentationOfServiceEventPrimaryPer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_PROCEDURE_CODES__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_PROCEDURE_CODES__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1732,7 +1732,7 @@ public static boolean validateOperativeNoteDocumentationOfServiceEventProcedureC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_HAS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_HAS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1806,7 +1806,7 @@ public static boolean validateOperativeNoteDocumentationOfServiceEventEffectiveT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_HAS_HIGH_WHEN_NO_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_HAS_HIGH_WHEN_NO_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1880,7 +1880,7 @@ public static boolean validateOperativeNoteDocumentationOfServiceEventEffectiveT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_NO_HIGH_IF_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_NO_HIGH_IF_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1954,7 +1954,7 @@ public static boolean validateOperativeNoteDocumentationOfServiceEventEffectiveT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_PRECISE_TO_THE_DAY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_PRECISE_TO_THE_DAY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2028,7 +2028,7 @@ public static boolean validateOperativeNoteDocumentationOfServiceEventPreciseToT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_PRECISE_TO_THE_MINUTE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_PRECISE_TO_THE_MINUTE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2102,7 +2102,7 @@ public static boolean validateOperativeNoteDocumentationOfServiceEventPreciseToT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_PRECISE_TO_THE_SECOND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_PRECISE_TO_THE_SECOND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2176,7 +2176,7 @@ public static boolean validateOperativeNoteDocumentationOfServiceEventPreciseToT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2251,7 +2251,7 @@ public static boolean validateOperativeNoteDocumentationOfServiceEventIfMorePrec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2324,7 +2324,7 @@ public static boolean validateOperativeNoteDocumentationOfServiceEventCode(Opera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2397,7 +2397,7 @@ public static boolean validateOperativeNoteDocumentationOfServiceEventEffectiveT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_PRIMARY_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT_PRIMARY_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2471,7 +2471,7 @@ public static boolean validateOperativeNoteDocumentationOfServiceEventPrimaryPer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OPERATIVE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3274,7 +3274,7 @@ public static SurgicalDrainsSection getSurgicalDrainsSection(OperativeNote opera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3343,7 +3343,7 @@ public static boolean validateGeneralHeaderConstraintsTemplateId(OperativeNote o
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OperativeNoteSurgicalProcedureSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OperativeNoteSurgicalProcedureSectionOperations.java
index 7d03330248..b72ace6544 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OperativeNoteSurgicalProcedureSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OperativeNoteSurgicalProcedureSectionOperations.java
@@ -79,7 +79,7 @@ protected OperativeNoteSurgicalProcedureSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_SURGICAL_PROCEDURE_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_SURGICAL_PROCEDURE_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateOperativeNoteSurgicalProcedureSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_SURGICAL_PROCEDURE_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_SURGICAL_PROCEDURE_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateOperativeNoteSurgicalProcedureSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_SURGICAL_PROCEDURE_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_SURGICAL_PROCEDURE_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -291,7 +291,7 @@ public static boolean validateOperativeNoteSurgicalProcedureSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_SURGICAL_PROCEDURE_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_SURGICAL_PROCEDURE_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -361,7 +361,7 @@ public static boolean validateOperativeNoteSurgicalProcedureSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_SURGICAL_PROCEDURE_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OPERATIVE_NOTE_SURGICAL_PROCEDURE_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OutcomeObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OutcomeObservationOperations.java
index 7f0f4f3b75..7d1f91a8f2 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OutcomeObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/OutcomeObservationOperations.java
@@ -98,7 +98,7 @@ protected OutcomeObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_PROG_TOWARD_GOAL_OBS_INVERSION_IND_IS_TRUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_PROG_TOWARD_GOAL_OBS_INVERSION_IND_IS_TRUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -167,7 +167,7 @@ public static boolean validateOutcomeObservationProgTowardGoalObsInversionIndIsT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -232,7 +232,7 @@ public static boolean validateOutcomeObservationTemplateId(OutcomeObservation ou
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -297,7 +297,7 @@ public static boolean validateOutcomeObservationClassCode(OutcomeObservation out
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -362,7 +362,7 @@ public static boolean validateOutcomeObservationMoodCode(OutcomeObservation outc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -427,7 +427,7 @@ public static boolean validateOutcomeObservationId(OutcomeObservation outcomeObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -475,7 +475,7 @@ public static boolean validateOutcomeObservationCodeP(OutcomeObservation outcome
 					"org.openhealthtools.mdht.uml.cda.consol.OutcomeObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.OutcomeObservationCodeP", passToken);
 				}
 				passToken.add(outcomeObservation);
@@ -507,7 +507,7 @@ public static boolean validateOutcomeObservationCodeP(OutcomeObservation outcome
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -580,7 +580,7 @@ public static boolean validateOutcomeObservationCode(OutcomeObservation outcomeO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -645,7 +645,7 @@ public static boolean validateOutcomeObservationValue(OutcomeObservation outcome
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_ENTRY_REFERENCE_GOAL_OBS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_ENTRY_REFERENCE_GOAL_OBS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -712,7 +712,7 @@ public static boolean validateOutcomeObservationEntryReferenceGoalObs(OutcomeObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_ENTRY_REFERENCE_INTERVENTION_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_ENTRY_REFERENCE_INTERVENTION_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -780,7 +780,7 @@ public static boolean validateOutcomeObservationEntryReferenceInterventionAct(Ou
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -847,7 +847,7 @@ public static boolean validateOutcomeObservationAuthorParticipation(OutcomeObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_PROGRESS_TOWARD_GOAL_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_PROGRESS_TOWARD_GOAL_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -916,7 +916,7 @@ public static boolean validateOutcomeObservationProgressTowardGoalObservation(Ou
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -981,7 +981,7 @@ public static boolean validateOutcomeObservationReference(OutcomeObservation out
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_OUTCOME_OBSERVATION_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1048,7 +1048,7 @@ public static boolean validateOutcomeObservationEntryRelationship(OutcomeObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OUTCOME_OBSERVATION_REFERENCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OUTCOME_OBSERVATION_REFERENCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1120,7 +1120,7 @@ public static boolean validateOutcomeObservationReferenceTypeCode(OutcomeObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OUTCOME_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_OUTCOME_OBSERVATION_REFERENCE_EXTERNAL_DOCUMENT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1219,7 +1219,7 @@ public static EList<EntryReference> getEntryReferenceGoalObss(OutcomeObservation
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_ENTRY_REFERENCE_GOAL_OBSS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EntryReference> result = (Collection<EntryReference>) query.evaluate(outcomeObservation);
-		return new BasicEList.UnmodifiableEList<EntryReference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1267,7 +1267,7 @@ public static EList<EntryReference> getEntryReferenceInterventionActs(OutcomeObs
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_ENTRY_REFERENCE_INTERVENTION_ACTS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EntryReference> result = (Collection<EntryReference>) query.evaluate(outcomeObservation);
-		return new BasicEList.UnmodifiableEList<EntryReference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PatientReferralActOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PatientReferralActOperations.java
index 67f886a21b..ffd3a093cf 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PatientReferralActOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PatientReferralActOperations.java
@@ -111,7 +111,7 @@ protected PatientReferralActOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -177,7 +177,7 @@ public static boolean validatePatientReferralActTemplateId(PatientReferralAct pa
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -242,7 +242,7 @@ public static boolean validatePatientReferralActClassCode(PatientReferralAct pat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_MOOD_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_MOOD_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -291,7 +291,7 @@ public static boolean validatePatientReferralActMoodCodeP(PatientReferralAct pat
 					"org.openhealthtools.mdht.uml.cda.consol.PatientReferralActMoodCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PatientReferralActMoodCodeP", passToken);
 				}
 				passToken.add(patientReferralAct);
@@ -323,7 +323,7 @@ public static boolean validatePatientReferralActMoodCodeP(PatientReferralAct pat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -396,7 +396,7 @@ public static boolean validatePatientReferralActMoodCode(PatientReferralAct pati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -461,7 +461,7 @@ public static boolean validatePatientReferralActId(PatientReferralAct patientRef
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -509,7 +509,7 @@ public static boolean validatePatientReferralActCodeP(PatientReferralAct patient
 					"org.openhealthtools.mdht.uml.cda.consol.PatientReferralActCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PatientReferralActCodeP", passToken);
 				}
 				passToken.add(patientReferralAct);
@@ -541,7 +541,7 @@ public static boolean validatePatientReferralActCodeP(PatientReferralAct patient
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -615,7 +615,7 @@ public static boolean validatePatientReferralActCode(PatientReferralAct patientR
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -681,7 +681,7 @@ public static boolean validatePatientReferralActStatusCode(PatientReferralAct pa
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -748,7 +748,7 @@ public static boolean validatePatientReferralActStatusCodeP(PatientReferralAct p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -815,7 +815,7 @@ public static boolean validatePatientReferralActEffectiveTime(PatientReferralAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_PRIORITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_PRIORITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -882,7 +882,7 @@ public static boolean validatePatientReferralActPriorityCode(PatientReferralAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -949,7 +949,7 @@ public static boolean validatePatientReferralActEntryRelationship(PatientReferra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1016,7 +1016,7 @@ public static boolean validatePatientReferralActAuthorParticipation(PatientRefer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_INDICATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_INDICATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1082,7 +1082,7 @@ public static boolean validatePatientReferralActIndication2(PatientReferralAct p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PATIENT_REFERRAL_ACT_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1148,7 +1148,7 @@ public static boolean validatePatientReferralActParticipant(PatientReferralAct p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1222,7 +1222,7 @@ public static boolean validatePatientReferralActEntryRelationshipObservationClas
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1296,7 +1296,7 @@ public static boolean validatePatientReferralActEntryRelationshipObservationMood
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1351,7 +1351,7 @@ public static boolean validatePatientReferralActEntryRelationshipObservationCode
 						"org.openhealthtools.mdht.uml.cda.consol.PatientReferralActEntryRelationshipObservationCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.PatientReferralActEntryRelationshipObservationCodeP",
 							passToken);
@@ -1386,7 +1386,7 @@ public static boolean validatePatientReferralActEntryRelationshipObservationCode
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1471,7 +1471,7 @@ public static boolean validatePatientReferralActEntryRelationshipObservationCode
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1545,7 +1545,7 @@ public static boolean validatePatientReferralActEntryRelationshipObservationStat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1619,7 +1619,7 @@ public static boolean validatePatientReferralActEntryRelationshipObservationStat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_PRIORITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_PRIORITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1674,7 +1674,7 @@ public static boolean validatePatientReferralActEntryRelationshipObservationPrio
 						"org.openhealthtools.mdht.uml.cda.consol.PatientReferralActEntryRelationshipObservationPriorityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.PatientReferralActEntryRelationshipObservationPriorityCodeP",
 							passToken);
@@ -1709,7 +1709,7 @@ public static boolean validatePatientReferralActEntryRelationshipObservationPrio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_PRIORITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_PRIORITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1795,7 +1795,7 @@ public static boolean validatePatientReferralActEntryRelationshipObservationPrio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1869,7 +1869,7 @@ public static boolean validatePatientReferralActEntryRelationshipObservationValu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1943,7 +1943,7 @@ public static boolean validatePatientReferralActEntryRelationshipObservationValu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2016,7 +2016,7 @@ public static boolean validatePatientReferralActEntryRelationshipTypeCode(Patien
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_ENTRY_RELATIONSHIP_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2089,7 +2089,7 @@ public static boolean validatePatientReferralActEntryRelationshipObservation(Pat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_PARTICIPANT_PARTICIPANT_ROLE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_PARTICIPANT_PARTICIPANT_ROLE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2143,7 +2143,7 @@ public static boolean validatePatientReferralActParticipantParticipantRoleCodeP(
 						"org.openhealthtools.mdht.uml.cda.consol.PatientReferralActParticipantParticipantRoleCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.PatientReferralActParticipantParticipantRoleCodeP",
 							passToken);
@@ -2178,7 +2178,7 @@ public static boolean validatePatientReferralActParticipantParticipantRoleCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_PARTICIPANT_PARTICIPANT_ROLE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_PARTICIPANT_PARTICIPANT_ROLE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2262,7 +2262,7 @@ public static boolean validatePatientReferralActParticipantParticipantRoleCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2334,7 +2334,7 @@ public static boolean validatePatientReferralActParticipantTypeCode(PatientRefer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_PARTICIPANT_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PATIENT_REFERRAL_ACT_PARTICIPANT_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2432,7 +2432,7 @@ public static EList<Indication2> getIndication2s(PatientReferralAct patientRefer
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INDICATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication2> result = (Collection<Indication2>) query.evaluate(patientReferralAct);
-		return new BasicEList.UnmodifiableEList<Indication2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // PatientReferralActOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PayersSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PayersSection2Operations.java
index ec6d2af179..452f94e078 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PayersSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PayersSection2Operations.java
@@ -80,7 +80,7 @@ protected PayersSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -170,7 +170,7 @@ public static EList<CoverageActivity2> getConsolCoverageActivity2s(PayersSection
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_COVERAGE_ACTIVITY2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<CoverageActivity2> result = (Collection<CoverageActivity2>) query.evaluate(payersSection2);
-		return new BasicEList.UnmodifiableEList<CoverageActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -192,7 +192,7 @@ public static EList<CoverageActivity2> getConsolCoverageActivity2s(PayersSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -240,7 +240,7 @@ public static boolean validatePayersSectionCodeP(PayersSection2 payersSection2,
 					"org.openhealthtools.mdht.uml.cda.consol.PayersSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PayersSectionCodeP", passToken);
 				}
 				passToken.add(payersSection2);
@@ -272,7 +272,7 @@ public static boolean validatePayersSectionCodeP(PayersSection2 payersSection2,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -345,7 +345,7 @@ public static boolean validatePayersSectionCode(PayersSection2 payersSection2, D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION_COVERAGE_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION_COVERAGE_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PayersSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PayersSectionOperations.java
index f63a8721b5..2ab101c8a7 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PayersSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PayersSectionOperations.java
@@ -87,7 +87,7 @@ protected PayersSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -154,7 +154,7 @@ public static boolean validatePayersSectionTemplateId(PayersSection payersSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -219,7 +219,7 @@ public static boolean validatePayersSectionCode(PayersSection payersSection, Dia
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -284,7 +284,7 @@ public static boolean validatePayersSectionCodeP(PayersSection payersSection, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -349,7 +349,7 @@ public static boolean validatePayersSectionTitle(PayersSection payersSection, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -414,7 +414,7 @@ public static boolean validatePayersSectionText(PayersSection payersSection, Dia
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION_COVERAGE_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PAYERS_SECTION_COVERAGE_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -504,7 +504,7 @@ public static EList<CoverageActivity> getCoverageActivities(PayersSection payers
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_COVERAGE_ACTIVITIES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<CoverageActivity> result = (Collection<CoverageActivity>) query.evaluate(payersSection);
-		return new BasicEList.UnmodifiableEList<CoverageActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // PayersSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicalExamSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicalExamSection2Operations.java
index 96dddbab59..438cdb28ba 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicalExamSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicalExamSection2Operations.java
@@ -97,7 +97,7 @@ protected PhysicalExamSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -164,7 +164,7 @@ public static boolean validatePhysicalExamSection2TemplateId(PhysicalExamSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION2_WOUND_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION2_WOUND_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -231,7 +231,7 @@ public static boolean validatePhysicalExamSection2WoundObservation(PhysicalExamS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION2_COMPONENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION2_COMPONENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -299,7 +299,7 @@ public static boolean validatePhysicalExamSection2Component(PhysicalExamSection2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICAL_EXAM_SECTION2_COMPONENT_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICAL_EXAM_SECTION2_COMPONENT_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -372,7 +372,7 @@ public static boolean validatePhysicalExamSection2ComponentSectionCode(PhysicalE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICAL_EXAM_SECTION2_COMPONENT_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICAL_EXAM_SECTION2_COMPONENT_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -445,7 +445,7 @@ public static boolean validatePhysicalExamSection2ComponentSectionCodeP(Physical
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICAL_EXAM_SECTION2_COMPONENT_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICAL_EXAM_SECTION2_COMPONENT_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -518,7 +518,7 @@ public static boolean validatePhysicalExamSection2ComponentSectionTitle(Physical
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICAL_EXAM_SECTION2_COMPONENT_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICAL_EXAM_SECTION2_COMPONENT_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -591,7 +591,7 @@ public static boolean validatePhysicalExamSection2ComponentSectionText(PhysicalE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICAL_EXAM_SECTION2_COMPONENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICAL_EXAM_SECTION2_COMPONENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -690,7 +690,7 @@ public static EList<LongitudinalCareWoundObservation> getWoundObservations(
 		@SuppressWarnings("unchecked")
 		Collection<LongitudinalCareWoundObservation> result = (Collection<LongitudinalCareWoundObservation>) query.evaluate(
 			physicalExamSection2);
-		return new BasicEList.UnmodifiableEList<LongitudinalCareWoundObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -740,7 +740,7 @@ public static EList<PressureUlcerObservation> getConsolPressureUlcerObservations
 		@SuppressWarnings("unchecked")
 		Collection<PressureUlcerObservation> result = (Collection<PressureUlcerObservation>) query.evaluate(
 			physicalExamSection2);
-		return new BasicEList.UnmodifiableEList<PressureUlcerObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -790,7 +790,7 @@ public static EList<HighestPressureUlcerStage> getConsolHighestPressureUlcerStag
 		@SuppressWarnings("unchecked")
 		Collection<HighestPressureUlcerStage> result = (Collection<HighestPressureUlcerStage>) query.evaluate(
 			physicalExamSection2);
-		return new BasicEList.UnmodifiableEList<HighestPressureUlcerStage>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -840,7 +840,7 @@ public static EList<NumberOfPressureUlcersObservation> getConsolNumberOfPressure
 		@SuppressWarnings("unchecked")
 		Collection<NumberOfPressureUlcersObservation> result = (Collection<NumberOfPressureUlcersObservation>) query.evaluate(
 			physicalExamSection2);
-		return new BasicEList.UnmodifiableEList<NumberOfPressureUlcersObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -862,7 +862,7 @@ public static EList<NumberOfPressureUlcersObservation> getConsolNumberOfPressure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -910,7 +910,7 @@ public static boolean validatePhysicalExamSectionCodeP(PhysicalExamSection2 phys
 					"org.openhealthtools.mdht.uml.cda.consol.PhysicalExamSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PhysicalExamSectionCodeP", passToken);
 				}
 				passToken.add(physicalExamSection2);
@@ -942,7 +942,7 @@ public static boolean validatePhysicalExamSectionCodeP(PhysicalExamSection2 phys
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1015,7 +1015,7 @@ public static boolean validatePhysicalExamSectionCode(PhysicalExamSection2 physi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_PRESSURE_ULCER_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_PRESSURE_ULCER_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1083,7 +1083,7 @@ public static boolean validatePhysicalExamSectionPressureUlcerObservation(Physic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_HIGHEST_PRESSURE_ULCER_STAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_HIGHEST_PRESSURE_ULCER_STAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1151,7 +1151,7 @@ public static boolean validatePhysicalExamSectionHighestPressureUlcerStage(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicalExamSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicalExamSectionOperations.java
index 3a491d53e5..b3a388e264 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicalExamSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicalExamSectionOperations.java
@@ -93,7 +93,7 @@ protected PhysicalExamSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -161,7 +161,7 @@ public static boolean validatePhysicalExamSectionTemplateId(PhysicalExamSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -226,7 +226,7 @@ public static boolean validatePhysicalExamSectionCode(PhysicalExamSection physic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -291,7 +291,7 @@ public static boolean validatePhysicalExamSectionCodeP(PhysicalExamSection physi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -356,7 +356,7 @@ public static boolean validatePhysicalExamSectionTitle(PhysicalExamSection physi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -421,7 +421,7 @@ public static boolean validatePhysicalExamSectionText(PhysicalExamSection physic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_PRESSURE_ULCER_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_PRESSURE_ULCER_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -489,7 +489,7 @@ public static boolean validatePhysicalExamSectionPressureUlcerObservation(Physic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_NUMBER_OF_PRESSURE_ULCERS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -558,7 +558,7 @@ public static boolean validatePhysicalExamSectionNumberOfPressureUlcersObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_HIGHEST_PRESSURE_ULCER_STAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_EXAM_SECTION_HIGHEST_PRESSURE_ULCER_STAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -654,7 +654,7 @@ public static EList<PressureUlcerObservation> getPressureUlcerObservations(
 		@SuppressWarnings("unchecked")
 		Collection<PressureUlcerObservation> result = (Collection<PressureUlcerObservation>) query.evaluate(
 			physicalExamSection);
-		return new BasicEList.UnmodifiableEList<PressureUlcerObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -704,7 +704,7 @@ public static EList<NumberOfPressureUlcersObservation> getNumberOfPressureUlcers
 		@SuppressWarnings("unchecked")
 		Collection<NumberOfPressureUlcersObservation> result = (Collection<NumberOfPressureUlcersObservation>) query.evaluate(
 			physicalExamSection);
-		return new BasicEList.UnmodifiableEList<NumberOfPressureUlcersObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -754,7 +754,7 @@ public static EList<HighestPressureUlcerStage> getHighestPressureUlcerStages(
 		@SuppressWarnings("unchecked")
 		Collection<HighestPressureUlcerStage> result = (Collection<HighestPressureUlcerStage>) query.evaluate(
 			physicalExamSection);
-		return new BasicEList.UnmodifiableEList<HighestPressureUlcerStage>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // PhysicalExamSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicalFindingsOfSkinSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicalFindingsOfSkinSectionOperations.java
index 6bb2e46a77..aa576e86b5 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicalFindingsOfSkinSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicalFindingsOfSkinSectionOperations.java
@@ -83,7 +83,7 @@ protected PhysicalFindingsOfSkinSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_FINDINGS_OF_SKIN_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_FINDINGS_OF_SKIN_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -155,7 +155,7 @@ public static boolean validatePhysicalFindingsOfSkinSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_FINDINGS_OF_SKIN_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_FINDINGS_OF_SKIN_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -224,7 +224,7 @@ public static boolean validatePhysicalFindingsOfSkinSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_FINDINGS_OF_SKIN_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_FINDINGS_OF_SKIN_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -293,7 +293,7 @@ public static boolean validatePhysicalFindingsOfSkinSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_FINDINGS_OF_SKIN_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_FINDINGS_OF_SKIN_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -362,7 +362,7 @@ public static boolean validatePhysicalFindingsOfSkinSectionTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_FINDINGS_OF_SKIN_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_FINDINGS_OF_SKIN_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -431,7 +431,7 @@ public static boolean validatePhysicalFindingsOfSkinSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_FINDINGS_OF_SKIN_SECTION_WOUND_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICAL_FINDINGS_OF_SKIN_SECTION_WOUND_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -528,7 +528,7 @@ public static EList<LongitudinalCareWoundObservation> getWoundObservations(
 		@SuppressWarnings("unchecked")
 		Collection<LongitudinalCareWoundObservation> result = (Collection<LongitudinalCareWoundObservation>) query.evaluate(
 			physicalFindingsOfSkinSection);
-		return new BasicEList.UnmodifiableEList<LongitudinalCareWoundObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // PhysicalFindingsOfSkinSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicianReadingStudyPerformer2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicianReadingStudyPerformer2Operations.java
index d7cb9e8e81..425888e637 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicianReadingStudyPerformer2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicianReadingStudyPerformer2Operations.java
@@ -66,7 +66,7 @@ protected PhysicianReadingStudyPerformer2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicianReadingStudyPerformerOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicianReadingStudyPerformerOperations.java
index 4ad1d52f3b..9ea77f36e5 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicianReadingStudyPerformerOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicianReadingStudyPerformerOperations.java
@@ -92,7 +92,7 @@ protected PhysicianReadingStudyPerformerOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -162,7 +162,7 @@ public static boolean validatePhysicianReadingStudyPerformerTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -231,7 +231,7 @@ public static boolean validatePhysicianReadingStudyPerformerTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -301,7 +301,7 @@ public static boolean validatePhysicianReadingStudyPerformerTypeCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -371,7 +371,7 @@ public static boolean validatePhysicianReadingStudyPerformerAssignedEntity(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_DAY_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_DAY_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -448,7 +448,7 @@ public static boolean validatePhysicianReadingStudyPerformerGeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_MINUTE_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_MINUTE_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -525,7 +525,7 @@ public static boolean validatePhysicianReadingStudyPerformerGeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_SECOND_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_PRECISE_TO_THE_SECOND_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -602,7 +602,7 @@ public static boolean validatePhysicianReadingStudyPerformerGeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_GENERAL_HEADER_CONSTRAINTS_US_REALM_DATE_AND_TIME_DT_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET_IVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -734,7 +734,7 @@ public static boolean validatePhysicianReadingStudyPerformerAssignedEntityHasNat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_ASSIGNED_ENTITY_HAS_DICOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_ASSIGNED_ENTITY_HAS_DICOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -809,7 +809,7 @@ public static boolean validatePhysicianReadingStudyPerformerAssignedEntityHasDIC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_ASSIGNED_ENTITY_HAS_ASSIGNED_PERSON_OR_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_ASSIGNED_ENTITY_HAS_ASSIGNED_PERSON_OR_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePhysicianReadingStudyPerformerAssignedEntityHasNationalProviderId(PhysicianReadingStudyPerformer, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Physician Reading Study Performer Assigned Entity Has National Provider Id</em>}' operation.
@@ -830,7 +830,7 @@ public static boolean validatePhysicianReadingStudyPerformerAssignedEntityHasDIC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -961,7 +961,7 @@ public static boolean validatePhysicianReadingStudyPerformerAssignedEntityCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePhysicianReadingStudyPerformerAssignedEntityCode(PhysicianReadingStudyPerformer, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Physician Reading Study Performer Assigned Entity Code</em>}' operation.
@@ -982,7 +982,7 @@ public static boolean validatePhysicianReadingStudyPerformerAssignedEntityCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIAN_READING_STUDY_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicianofRecordParticipant2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicianofRecordParticipant2Operations.java
index 69b820ac33..c12f3d4a12 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicianofRecordParticipant2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicianofRecordParticipant2Operations.java
@@ -82,7 +82,7 @@ protected PhysicianofRecordParticipant2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -152,7 +152,7 @@ public static boolean validatePhysicianofRecordParticipant2TemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT2_ASSIGNED_ENTITY_ASSIGNED_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT2_ASSIGNED_ENTITY_ASSIGNED_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -229,7 +229,7 @@ public static boolean validatePhysicianofRecordParticipant2AssignedEntityAssigne
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT2_ASSIGNED_ENTITY_REPRESENTED_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT2_ASSIGNED_ENTITY_REPRESENTED_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -306,7 +306,7 @@ public static boolean validatePhysicianofRecordParticipant2AssignedEntityReprese
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT2_ASSIGNED_ENTITY_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT2_ASSIGNED_ENTITY_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -382,7 +382,7 @@ public static boolean validatePhysicianofRecordParticipant2AssignedEntityReprese
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -452,7 +452,7 @@ public static boolean validatePhysicianofRecordParticipantAssignedEntity(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY_ASSIGNED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY_ASSIGNED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -528,7 +528,7 @@ public static boolean validatePhysicianofRecordParticipantAssignedEntityAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -604,7 +604,7 @@ public static boolean validatePhysicianofRecordParticipantAssignedEntityHasNatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicianofRecordParticipantOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicianofRecordParticipantOperations.java
index 9b81e95e8d..b74dc376da 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicianofRecordParticipantOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PhysicianofRecordParticipantOperations.java
@@ -88,7 +88,7 @@ protected PhysicianofRecordParticipantOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -157,7 +157,7 @@ public static boolean validatePhysicianofRecordParticipantTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -226,7 +226,7 @@ public static boolean validatePhysicianofRecordParticipantTypeCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -296,7 +296,7 @@ public static boolean validatePhysicianofRecordParticipantAssignedEntity(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY_ASSIGNED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY_ASSIGNED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -372,7 +372,7 @@ public static boolean validatePhysicianofRecordParticipantAssignedEntityAssigned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY_HAS_DICOM_OR_NUCC_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY_HAS_DICOM_OR_NUCC_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -448,7 +448,7 @@ public static boolean validatePhysicianofRecordParticipantAssignedEntityHasDICOM
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY_HAS_NATIONAL_PROVIDER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -524,7 +524,7 @@ public static boolean validatePhysicianofRecordParticipantAssignedEntityHasNatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -599,7 +599,7 @@ public static boolean validatePhysicianofRecordParticipantAssignedEntityCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -674,7 +674,7 @@ public static boolean validatePhysicianofRecordParticipantAssignedEntityId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PHYSICIANOF_RECORD_PARTICIPANT_ASSIGNED_ENTITY_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivityActOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivityActOperations.java
index 4a37fc4c88..b3605a4366 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivityActOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivityActOperations.java
@@ -78,7 +78,7 @@ protected PlanOfCareActivityActOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -145,7 +145,7 @@ public static boolean validatePlanOfCareActivityActTemplateId(PlanOfCareActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -214,7 +214,7 @@ public static boolean validatePlanOfCareActivityActClassCode(PlanOfCareActivityA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -281,7 +281,7 @@ public static boolean validatePlanOfCareActivityActMoodCode(PlanOfCareActivityAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivityEncounterOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivityEncounterOperations.java
index 0b73ee45c2..02fd03ef55 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivityEncounterOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivityEncounterOperations.java
@@ -78,7 +78,7 @@ protected PlanOfCareActivityEncounterOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ENCOUNTER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ENCOUNTER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -147,7 +147,7 @@ public static boolean validatePlanOfCareActivityEncounterTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ENCOUNTER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ENCOUNTER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -218,7 +218,7 @@ public static boolean validatePlanOfCareActivityEncounterClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ENCOUNTER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ENCOUNTER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -287,7 +287,7 @@ public static boolean validatePlanOfCareActivityEncounterMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivityObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivityObservationOperations.java
index 2093db193b..4d6501af84 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivityObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivityObservationOperations.java
@@ -78,7 +78,7 @@ protected PlanOfCareActivityObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validatePlanOfCareActivityObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -220,7 +220,7 @@ public static boolean validatePlanOfCareActivityObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -289,7 +289,7 @@ public static boolean validatePlanOfCareActivityObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivityProcedureOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivityProcedureOperations.java
index ac7c72ea94..a3956e0b81 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivityProcedureOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivityProcedureOperations.java
@@ -78,7 +78,7 @@ protected PlanOfCareActivityProcedureOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_PROCEDURE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_PROCEDURE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -147,7 +147,7 @@ public static boolean validatePlanOfCareActivityProcedureTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_PROCEDURE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_PROCEDURE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -218,7 +218,7 @@ public static boolean validatePlanOfCareActivityProcedureClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_PROCEDURE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_PROCEDURE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -287,7 +287,7 @@ public static boolean validatePlanOfCareActivityProcedureMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_PROCEDURE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_PROCEDURE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivitySubstanceAdministrationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivitySubstanceAdministrationOperations.java
index 8e1ce1b184..d7b4a2c57f 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivitySubstanceAdministrationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivitySubstanceAdministrationOperations.java
@@ -78,7 +78,7 @@ protected PlanOfCareActivitySubstanceAdministrationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUBSTANCE_ADMINISTRATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUBSTANCE_ADMINISTRATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -149,7 +149,7 @@ public static boolean validatePlanOfCareActivitySubstanceAdministrationTemplateI
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUBSTANCE_ADMINISTRATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUBSTANCE_ADMINISTRATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -222,7 +222,7 @@ public static boolean validatePlanOfCareActivitySubstanceAdministrationClassCode
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUBSTANCE_ADMINISTRATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUBSTANCE_ADMINISTRATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -293,7 +293,7 @@ public static boolean validatePlanOfCareActivitySubstanceAdministrationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUBSTANCE_ADMINISTRATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUBSTANCE_ADMINISTRATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivitySupplyOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivitySupplyOperations.java
index 2f74e08160..6ff1b02f9c 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivitySupplyOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareActivitySupplyOperations.java
@@ -78,7 +78,7 @@ protected PlanOfCareActivitySupplyOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUPPLY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUPPLY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -145,7 +145,7 @@ public static boolean validatePlanOfCareActivitySupplyTemplateId(PlanOfCareActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUPPLY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUPPLY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -214,7 +214,7 @@ public static boolean validatePlanOfCareActivitySupplyClassCode(PlanOfCareActivi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUPPLY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUPPLY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -281,7 +281,7 @@ public static boolean validatePlanOfCareActivitySupplyMoodCode(PlanOfCareActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUPPLY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUPPLY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareSectionOperations.java
index 6a2ad2600d..b6d1b7ac3a 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfCareSectionOperations.java
@@ -105,7 +105,7 @@ protected PlanOfCareSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -172,7 +172,7 @@ public static boolean validatePlanOfCareSectionTemplateId(PlanOfCareSection plan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -237,7 +237,7 @@ public static boolean validatePlanOfCareSectionCode(PlanOfCareSection planOfCare
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -302,7 +302,7 @@ public static boolean validatePlanOfCareSectionCodeP(PlanOfCareSection planOfCar
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -367,7 +367,7 @@ public static boolean validatePlanOfCareSectionTitle(PlanOfCareSection planOfCar
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -432,7 +432,7 @@ public static boolean validatePlanOfCareSectionText(PlanOfCareSection planOfCare
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -499,7 +499,7 @@ public static boolean validatePlanOfCareSectionPlanOfCareActivityAct(PlanOfCareS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -567,7 +567,7 @@ public static boolean validatePlanOfCareSectionPlanOfCareActivityEncounter(PlanO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -635,7 +635,7 @@ public static boolean validatePlanOfCareSectionPlanOfCareActivityObservation(Pla
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -703,7 +703,7 @@ public static boolean validatePlanOfCareSectionPlanOfCareActivityProcedure(PlanO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_SUBSTANCE_ADMINISTRATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_SUBSTANCE_ADMINISTRATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -772,7 +772,7 @@ public static boolean validatePlanOfCareSectionPlanOfCareActivitySubstanceAdmini
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_SUPPLY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_SUPPLY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -839,7 +839,7 @@ public static boolean validatePlanOfCareSectionPlanOfCareActivitySupply(PlanOfCa
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -931,7 +931,7 @@ public static EList<PlanOfCareActivityAct> getPlanOfCareActivityActs(PlanOfCareS
 		@SuppressWarnings("unchecked")
 		Collection<PlanOfCareActivityAct> result = (Collection<PlanOfCareActivityAct>) query.evaluate(
 			planOfCareSection);
-		return new BasicEList.UnmodifiableEList<PlanOfCareActivityAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -981,7 +981,7 @@ public static EList<PlanOfCareActivityEncounter> getPlanOfCareActivityEncounters
 		@SuppressWarnings("unchecked")
 		Collection<PlanOfCareActivityEncounter> result = (Collection<PlanOfCareActivityEncounter>) query.evaluate(
 			planOfCareSection);
-		return new BasicEList.UnmodifiableEList<PlanOfCareActivityEncounter>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1031,7 +1031,7 @@ public static EList<PlanOfCareActivityObservation> getPlanOfCareActivityObservat
 		@SuppressWarnings("unchecked")
 		Collection<PlanOfCareActivityObservation> result = (Collection<PlanOfCareActivityObservation>) query.evaluate(
 			planOfCareSection);
-		return new BasicEList.UnmodifiableEList<PlanOfCareActivityObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1081,7 +1081,7 @@ public static EList<PlanOfCareActivityProcedure> getPlanOfCareActivityProcedures
 		@SuppressWarnings("unchecked")
 		Collection<PlanOfCareActivityProcedure> result = (Collection<PlanOfCareActivityProcedure>) query.evaluate(
 			planOfCareSection);
-		return new BasicEList.UnmodifiableEList<PlanOfCareActivityProcedure>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1131,8 +1131,7 @@ public static EList<PlanOfCareActivitySubstanceAdministration> getPlanOfCareActi
 		@SuppressWarnings("unchecked")
 		Collection<PlanOfCareActivitySubstanceAdministration> result = (Collection<PlanOfCareActivitySubstanceAdministration>) query.evaluate(
 			planOfCareSection);
-		return new BasicEList.UnmodifiableEList<PlanOfCareActivitySubstanceAdministration>(
-			result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1181,7 +1180,7 @@ public static EList<PlanOfCareActivitySupply> getPlanOfCareActivitySupplies(Plan
 		@SuppressWarnings("unchecked")
 		Collection<PlanOfCareActivitySupply> result = (Collection<PlanOfCareActivitySupply>) query.evaluate(
 			planOfCareSection);
-		return new BasicEList.UnmodifiableEList<PlanOfCareActivitySupply>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1228,7 +1227,7 @@ public static EList<Instructions> getInstructionss(PlanOfCareSection planOfCareS
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INSTRUCTIONSS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Instructions> result = (Collection<Instructions>) query.evaluate(planOfCareSection);
-		return new BasicEList.UnmodifiableEList<Instructions>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // PlanOfCareSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfTreatmentSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfTreatmentSection2Operations.java
index ccaadc1716..43b37478c4 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfTreatmentSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlanOfTreatmentSection2Operations.java
@@ -110,7 +110,7 @@ protected PlanOfTreatmentSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_TREATMENT_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_TREATMENT_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -177,7 +177,7 @@ public static boolean validatePlanOfTreatmentSection2TemplateId(PlanOfTreatmentS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_TREATMENT_SECTION2_HANDOFF_COMMUNICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_TREATMENT_SECTION2_HANDOFF_COMMUNICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -245,7 +245,7 @@ public static boolean validatePlanOfTreatmentSection2HandoffCommunication(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_TREATMENT_SECTION2_NUTRITION_RECOMMENDATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_TREATMENT_SECTION2_NUTRITION_RECOMMENDATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -314,7 +314,7 @@ public static boolean validatePlanOfTreatmentSection2NutritionRecommendation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_TREATMENT_SECTION2_PLANNED_IMMUNIZATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_TREATMENT_SECTION2_PLANNED_IMMUNIZATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -383,7 +383,7 @@ public static boolean validatePlanOfTreatmentSection2PlannedImmunizationActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_TREATMENT_SECTION2_GOAL_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_TREATMENT_SECTION2_GOAL_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -479,7 +479,7 @@ public static EList<PlannedObservation2> getConsolPlannedObservation2s(
 		@SuppressWarnings("unchecked")
 		Collection<PlannedObservation2> result = (Collection<PlannedObservation2>) query.evaluate(
 			planOfTreatmentSection2);
-		return new BasicEList.UnmodifiableEList<PlannedObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -527,7 +527,7 @@ public static EList<PlannedEncounter2> getConsolPlannedEncounter2s(
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_PLANNED_ENCOUNTER2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PlannedEncounter2> result = (Collection<PlannedEncounter2>) query.evaluate(planOfTreatmentSection2);
-		return new BasicEList.UnmodifiableEList<PlannedEncounter2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -574,7 +574,7 @@ public static EList<PlannedAct2> getConsolPlannedAct2s(PlanOfTreatmentSection2 p
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_PLANNED_ACT2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PlannedAct2> result = (Collection<PlannedAct2>) query.evaluate(planOfTreatmentSection2);
-		return new BasicEList.UnmodifiableEList<PlannedAct2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -622,7 +622,7 @@ public static EList<PlannedProcedure2> getConsolPlannedProcedure2s(
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_PLANNED_PROCEDURE2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PlannedProcedure2> result = (Collection<PlannedProcedure2>) query.evaluate(planOfTreatmentSection2);
-		return new BasicEList.UnmodifiableEList<PlannedProcedure2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -672,7 +672,7 @@ public static EList<PlannedMedicationActivity2> getConsolPlannedMedicationActivi
 		@SuppressWarnings("unchecked")
 		Collection<PlannedMedicationActivity2> result = (Collection<PlannedMedicationActivity2>) query.evaluate(
 			planOfTreatmentSection2);
-		return new BasicEList.UnmodifiableEList<PlannedMedicationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -719,7 +719,7 @@ public static EList<PlannedSupply2> getConsolPlannedSupply2s(PlanOfTreatmentSect
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_PLANNED_SUPPLY2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PlannedSupply2> result = (Collection<PlannedSupply2>) query.evaluate(planOfTreatmentSection2);
-		return new BasicEList.UnmodifiableEList<PlannedSupply2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -766,7 +766,7 @@ public static EList<Instruction2> getConsolInstruction2s(PlanOfTreatmentSection2
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_INSTRUCTION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Instruction2> result = (Collection<Instruction2>) query.evaluate(planOfTreatmentSection2);
-		return new BasicEList.UnmodifiableEList<Instruction2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -815,7 +815,7 @@ public static EList<HandoffCommunicationParticipants> getHandoffCommunications(
 		@SuppressWarnings("unchecked")
 		Collection<HandoffCommunicationParticipants> result = (Collection<HandoffCommunicationParticipants>) query.evaluate(
 			planOfTreatmentSection2);
-		return new BasicEList.UnmodifiableEList<HandoffCommunicationParticipants>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -864,7 +864,7 @@ public static EList<NutritionRecommendation> getNutritionRecommendations(
 		@SuppressWarnings("unchecked")
 		Collection<NutritionRecommendation> result = (Collection<NutritionRecommendation>) query.evaluate(
 			planOfTreatmentSection2);
-		return new BasicEList.UnmodifiableEList<NutritionRecommendation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -914,7 +914,7 @@ public static EList<PlannedImmunizationActivity> getPlannedImmunizationActivitie
 		@SuppressWarnings("unchecked")
 		Collection<PlannedImmunizationActivity> result = (Collection<PlannedImmunizationActivity>) query.evaluate(
 			planOfTreatmentSection2);
-		return new BasicEList.UnmodifiableEList<PlannedImmunizationActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -961,7 +961,7 @@ public static EList<GoalObservation> getGoalObservations(PlanOfTreatmentSection2
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_GOAL_OBSERVATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<GoalObservation> result = (Collection<GoalObservation>) query.evaluate(planOfTreatmentSection2);
-		return new BasicEList.UnmodifiableEList<GoalObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -983,7 +983,7 @@ public static EList<GoalObservation> getGoalObservations(PlanOfTreatmentSection2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1032,7 +1032,7 @@ public static boolean validatePlanOfCareSectionCodeP(PlanOfTreatmentSection2 pla
 					"org.openhealthtools.mdht.uml.cda.consol.PlanOfCareSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PlanOfCareSectionCodeP", passToken);
 				}
 				passToken.add(planOfTreatmentSection2);
@@ -1064,7 +1064,7 @@ public static boolean validatePlanOfCareSectionCodeP(PlanOfTreatmentSection2 pla
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1137,7 +1137,7 @@ public static boolean validatePlanOfCareSectionCode(PlanOfTreatmentSection2 plan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1206,7 +1206,7 @@ public static boolean validatePlanOfCareSectionPlanOfCareActivityObservation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1274,7 +1274,7 @@ public static boolean validatePlanOfCareSectionPlanOfCareActivityEncounter(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1342,7 +1342,7 @@ public static boolean validatePlanOfCareSectionPlanOfCareActivityAct(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1410,7 +1410,7 @@ public static boolean validatePlanOfCareSectionPlanOfCareActivityProcedure(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_SUBSTANCE_ADMINISTRATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_SUBSTANCE_ADMINISTRATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1479,7 +1479,7 @@ public static boolean validatePlanOfCareSectionPlanOfCareActivitySubstanceAdmini
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_SUPPLY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_PLAN_OF_CARE_ACTIVITY_SUPPLY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1547,7 +1547,7 @@ public static boolean validatePlanOfCareSectionPlanOfCareActivitySupply(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_SECTION_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedAct2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedAct2Operations.java
index a91918c7c6..0af2686798 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedAct2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedAct2Operations.java
@@ -92,7 +92,7 @@ protected PlannedAct2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_CODE_FROM_LOINC_OR_SNOMED__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_CODE_FROM_LOINC_OR_SNOMED__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -158,7 +158,7 @@ public static boolean validatePlannedAct2CodeFromLoincOrSnomed(PlannedAct2 plann
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -223,7 +223,7 @@ public static boolean validatePlannedAct2TemplateId(PlannedAct2 plannedAct2, Dia
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -288,7 +288,7 @@ public static boolean validatePlannedAct2Code(PlannedAct2 plannedAct2, Diagnosti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -353,7 +353,7 @@ public static boolean validatePlannedAct2StatusCode(PlannedAct2 plannedAct2, Dia
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -418,7 +418,7 @@ public static boolean validatePlannedAct2StatusCodeP(PlannedAct2 plannedAct2, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -483,7 +483,7 @@ public static boolean validatePlannedAct2EffectiveTime(PlannedAct2 plannedAct2,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_INDICATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_INDICATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -548,7 +548,7 @@ public static boolean validatePlannedAct2Indication2(PlannedAct2 plannedAct2, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_INSTRUCTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_INSTRUCTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -613,7 +613,7 @@ public static boolean validatePlannedAct2Instruction2(PlannedAct2 plannedAct2, D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -678,7 +678,7 @@ public static boolean validatePlannedAct2AuthorParticipation(PlannedAct2 planned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -743,7 +743,7 @@ public static boolean validatePlannedAct2Performer(PlannedAct2 plannedAct2, Diag
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ACT2_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -832,7 +832,7 @@ public static EList<Indication2> getIndication2s(PlannedAct2 plannedAct2) {
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INDICATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication2> result = (Collection<Indication2>) query.evaluate(plannedAct2);
-		return new BasicEList.UnmodifiableEList<Indication2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -878,7 +878,7 @@ public static EList<Instruction2> getInstruction2s(PlannedAct2 plannedAct2) {
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INSTRUCTION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Instruction2> result = (Collection<Instruction2>) query.evaluate(plannedAct2);
-		return new BasicEList.UnmodifiableEList<Instruction2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -924,7 +924,7 @@ public static EList<PriorityPreference> getPriorityPreferences(PlannedAct2 plann
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PRIORITY_PREFERENCES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PriorityPreference> result = (Collection<PriorityPreference>) query.evaluate(plannedAct2);
-		return new BasicEList.UnmodifiableEList<PriorityPreference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -948,7 +948,7 @@ public static EList<PriorityPreference> getPriorityPreferences(PlannedAct2 plann
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedCoverageOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedCoverageOperations.java
index ab26087163..2be7f29a15 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedCoverageOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedCoverageOperations.java
@@ -95,7 +95,7 @@ protected PlannedCoverageOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -160,7 +160,7 @@ public static boolean validatePlannedCoverageTemplateId(PlannedCoverage plannedC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -225,7 +225,7 @@ public static boolean validatePlannedCoverageClassCode(PlannedCoverage plannedCo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -290,7 +290,7 @@ public static boolean validatePlannedCoverageMoodCode(PlannedCoverage plannedCov
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -355,7 +355,7 @@ public static boolean validatePlannedCoverageId(PlannedCoverage plannedCoverage,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -403,7 +403,7 @@ public static boolean validatePlannedCoverageCodeP(PlannedCoverage plannedCovera
 					"org.openhealthtools.mdht.uml.cda.consol.PlannedCoverageCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PlannedCoverageCodeP", passToken);
 				}
 				passToken.add(plannedCoverage);
@@ -435,7 +435,7 @@ public static boolean validatePlannedCoverageCodeP(PlannedCoverage plannedCovera
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -509,7 +509,7 @@ public static boolean validatePlannedCoverageCode(PlannedCoverage plannedCoverag
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -574,7 +574,7 @@ public static boolean validatePlannedCoverageStatusCode(PlannedCoverage plannedC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -639,7 +639,7 @@ public static boolean validatePlannedCoverageStatusCodeP(PlannedCoverage planned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -706,7 +706,7 @@ public static boolean validatePlannedCoverageEntryRelationship(PlannedCoverage p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_COVERAGE_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -773,7 +773,7 @@ public static boolean validatePlannedCoverageAuthorParticipation(PlannedCoverage
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -846,7 +846,7 @@ public static boolean validatePlannedCoverageEntryRelationshipActClassCode(Plann
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -919,7 +919,7 @@ public static boolean validatePlannedCoverageEntryRelationshipActMoodCode(Planne
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -991,7 +991,7 @@ public static boolean validatePlannedCoverageEntryRelationshipActId(PlannedCover
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1044,7 +1044,7 @@ public static boolean validatePlannedCoverageEntryRelationshipActCodeP(PlannedCo
 						"org.openhealthtools.mdht.uml.cda.consol.PlannedCoverageEntryRelationshipActCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.PlannedCoverageEntryRelationshipActCodeP",
 							passToken);
@@ -1079,7 +1079,7 @@ public static boolean validatePlannedCoverageEntryRelationshipActCodeP(PlannedCo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1161,7 +1161,7 @@ public static boolean validatePlannedCoverageEntryRelationshipActCode(PlannedCov
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1234,7 +1234,7 @@ public static boolean validatePlannedCoverageEntryRelationshipActStatusCode(Plan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1307,7 +1307,7 @@ public static boolean validatePlannedCoverageEntryRelationshipActStatusCodeP(Pla
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1379,7 +1379,7 @@ public static boolean validatePlannedCoverageEntryRelationshipTypeCode(PlannedCo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_COVERAGE_ENTRY_RELATIONSHIP_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedEncounter2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedEncounter2Operations.java
index 58e553f170..80fe23e8cd 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedEncounter2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedEncounter2Operations.java
@@ -96,7 +96,7 @@ protected PlannedEncounter2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_PARTICIPANT_SERVICE_DELIVERY_LOCATION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_PARTICIPANT_SERVICE_DELIVERY_LOCATION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -165,7 +165,7 @@ public static boolean validatePlannedEncounter2ParticipantServiceDeliveryLocatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -282,7 +282,7 @@ public static boolean validatePlannedEncounter2Code(PlannedEncounter2 plannedEnc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePlannedEncounter2Code(PlannedEncounter2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Planned Encounter2 Code</em>}' operation.
@@ -305,7 +305,7 @@ public static boolean validatePlannedEncounter2Code(PlannedEncounter2 plannedEnc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -353,7 +353,7 @@ public static boolean validatePlannedEncounter2CodeP(PlannedEncounter2 plannedEn
 					"org.openhealthtools.mdht.uml.cda.consol.PlannedEncounter2CodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PlannedEncounter2CodeP", passToken);
 				}
 				passToken.add(plannedEncounter2);
@@ -384,7 +384,7 @@ public static boolean validatePlannedEncounter2CodeP(PlannedEncounter2 plannedEn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -449,7 +449,7 @@ public static boolean validatePlannedEncounter2StatusCode(PlannedEncounter2 plan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -514,7 +514,7 @@ public static boolean validatePlannedEncounter2StatusCodeP(PlannedEncounter2 pla
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -580,7 +580,7 @@ public static boolean validatePlannedEncounter2EffectiveTime(PlannedEncounter2 p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -645,7 +645,7 @@ public static boolean validatePlannedEncounter2Performer(PlannedEncounter2 plann
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_SERVICE_DELIVERY_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_SERVICE_DELIVERY_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -712,7 +712,7 @@ public static boolean validatePlannedEncounter2ServiceDeliveryLocation(PlannedEn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -779,7 +779,7 @@ public static boolean validatePlannedEncounter2PriorityPreference(PlannedEncount
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_INDICATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_INDICATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -844,7 +844,7 @@ public static boolean validatePlannedEncounter2Indication2(PlannedEncounter2 pla
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_ENCOUNTER2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -911,7 +911,7 @@ public static boolean validatePlannedEncounter2AuthorParticipation(PlannedEncoun
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_ENCOUNTER2_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_ENCOUNTER2_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1010,7 +1010,7 @@ public static EList<ServiceDeliveryLocation> getServiceDeliveryLocations(Planned
 		@SuppressWarnings("unchecked")
 		Collection<ServiceDeliveryLocation> result = (Collection<ServiceDeliveryLocation>) query.evaluate(
 			plannedEncounter2);
-		return new BasicEList.UnmodifiableEList<ServiceDeliveryLocation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1102,7 +1102,7 @@ public static EList<Indication2> getIndication2s(PlannedEncounter2 plannedEncoun
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INDICATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication2> result = (Collection<Indication2>) query.evaluate(plannedEncounter2);
-		return new BasicEList.UnmodifiableEList<Indication2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1126,7 +1126,7 @@ public static EList<Indication2> getIndication2s(PlannedEncounter2 plannedEncoun
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ENCOUNTER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_ENCOUNTER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedImmunizationActivityOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedImmunizationActivityOperations.java
index f3caf8f7fd..da0bad88b7 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedImmunizationActivityOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedImmunizationActivityOperations.java
@@ -117,7 +117,7 @@ protected PlannedImmunizationActivityOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -186,7 +186,7 @@ public static boolean validatePlannedImmunizationActivityTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -255,7 +255,7 @@ public static boolean validatePlannedImmunizationActivityClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_MOOD_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_MOOD_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -307,7 +307,7 @@ public static boolean validatePlannedImmunizationActivityMoodCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.PlannedImmunizationActivityMoodCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.PlannedImmunizationActivityMoodCodeP", passToken);
 				}
@@ -340,7 +340,7 @@ public static boolean validatePlannedImmunizationActivityMoodCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -417,7 +417,7 @@ public static boolean validatePlannedImmunizationActivityMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -484,7 +484,7 @@ public static boolean validatePlannedImmunizationActivityId(PlannedImmunizationA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -553,7 +553,7 @@ public static boolean validatePlannedImmunizationActivityStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -622,7 +622,7 @@ public static boolean validatePlannedImmunizationActivityStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -692,7 +692,7 @@ public static boolean validatePlannedImmunizationActivityEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -761,7 +761,7 @@ public static boolean validatePlannedImmunizationActivityRepeatNumber(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_ROUTE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_ROUTE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -813,7 +813,7 @@ public static boolean validatePlannedImmunizationActivityRouteCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.PlannedImmunizationActivityRouteCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.PlannedImmunizationActivityRouteCodeP", passToken);
 				}
@@ -846,7 +846,7 @@ public static boolean validatePlannedImmunizationActivityRouteCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_ROUTE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_ROUTE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -980,7 +980,7 @@ public static boolean validatePlannedImmunizationActivityApproachSiteCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_APPROACH_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_APPROACH_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePlannedImmunizationActivityApproachSiteCode(PlannedImmunizationActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Planned Immunization Activity Approach Site Code</em>}' operation.
@@ -1003,7 +1003,7 @@ public static boolean validatePlannedImmunizationActivityApproachSiteCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_APPROACH_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_APPROACH_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1056,7 +1056,7 @@ public static boolean validatePlannedImmunizationActivityApproachSiteCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.PlannedImmunizationActivityApproachSiteCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.PlannedImmunizationActivityApproachSiteCodeP",
 						passToken);
@@ -1088,7 +1088,7 @@ public static boolean validatePlannedImmunizationActivityApproachSiteCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_DOSE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_DOSE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1157,7 +1157,7 @@ public static boolean validatePlannedImmunizationActivityDoseQuantity(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1226,7 +1226,7 @@ public static boolean validatePlannedImmunizationActivityPerformer(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1296,7 +1296,7 @@ public static boolean validatePlannedImmunizationActivityAuthorParticipation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1366,7 +1366,7 @@ public static boolean validatePlannedImmunizationActivityPriorityPreference(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_INDICATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_INDICATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1435,7 +1435,7 @@ public static boolean validatePlannedImmunizationActivityIndication2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_INSTRUCTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_INSTRUCTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1504,7 +1504,7 @@ public static boolean validatePlannedImmunizationActivityInstruction2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_PRECONDITION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_PRECONDITION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1573,7 +1573,7 @@ public static boolean validatePlannedImmunizationActivityPrecondition(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_CONSUMABLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_CONSUMABLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1642,7 +1642,7 @@ public static boolean validatePlannedImmunizationActivityConsumable(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_CE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_CE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1698,7 +1698,7 @@ public static boolean validatePlannedImmunizationActivityCETranslationP(
 						"org.openhealthtools.mdht.uml.cda.consol.PlannedImmunizationActivityCETranslationP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.PlannedImmunizationActivityCETranslationP",
 							passToken);
@@ -1733,7 +1733,7 @@ public static boolean validatePlannedImmunizationActivityCETranslationP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1817,7 +1817,7 @@ public static boolean validatePlannedImmunizationActivityCETranslation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_IVLPQ_UNIT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_IVLPQ_UNIT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1891,7 +1891,7 @@ public static boolean validatePlannedImmunizationActivityIVLPQUnit(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_CONSUMABLE_IMMUNIZATION_MEDICATION_INFORMATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_CONSUMABLE_IMMUNIZATION_MEDICATION_INFORMATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1968,7 +1968,7 @@ public static boolean validatePlannedImmunizationActivityConsumableImmunizationM
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_PRECONDITION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_PRECONDITION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2043,7 +2043,7 @@ public static boolean validatePlannedImmunizationActivityPreconditionTypeCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_PRECONDITION_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_IMMUNIZATION_ACTIVITY_PRECONDITION_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2147,7 +2147,7 @@ public static EList<PriorityPreference> getPriorityPreferences(
 		@SuppressWarnings("unchecked")
 		Collection<PriorityPreference> result = (Collection<PriorityPreference>) query.evaluate(
 			plannedImmunizationActivity);
-		return new BasicEList.UnmodifiableEList<PriorityPreference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2194,7 +2194,7 @@ public static EList<Indication2> getIndication2s(PlannedImmunizationActivity pla
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INDICATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication2> result = (Collection<Indication2>) query.evaluate(plannedImmunizationActivity);
-		return new BasicEList.UnmodifiableEList<Indication2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2241,7 +2241,7 @@ public static EList<Instruction2> getInstruction2s(PlannedImmunizationActivity p
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INSTRUCTION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Instruction2> result = (Collection<Instruction2>) query.evaluate(plannedImmunizationActivity);
-		return new BasicEList.UnmodifiableEList<Instruction2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // PlannedImmunizationActivityOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedInterventionActOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedInterventionActOperations.java
index af117d145f..4f1ed93f4b 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedInterventionActOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedInterventionActOperations.java
@@ -149,7 +149,7 @@ protected PlannedInterventionActOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -216,7 +216,7 @@ public static boolean validatePlannedInterventionActTemplateId(PlannedInterventi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -283,7 +283,7 @@ public static boolean validatePlannedInterventionActClassCode(PlannedInterventio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_MOOD_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_MOOD_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -333,7 +333,7 @@ public static boolean validatePlannedInterventionActMoodCodeP(PlannedInterventio
 					"org.openhealthtools.mdht.uml.cda.consol.PlannedInterventionActMoodCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PlannedInterventionActMoodCodeP", passToken);
 				}
 				passToken.add(plannedInterventionAct);
@@ -365,7 +365,7 @@ public static boolean validatePlannedInterventionActMoodCodeP(PlannedInterventio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -440,7 +440,7 @@ public static boolean validatePlannedInterventionActMoodCode(PlannedIntervention
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -505,7 +505,7 @@ public static boolean validatePlannedInterventionActId(PlannedInterventionAct pl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -554,7 +554,7 @@ public static boolean validatePlannedInterventionActCodeP(PlannedInterventionAct
 					"org.openhealthtools.mdht.uml.cda.consol.PlannedInterventionActCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PlannedInterventionActCodeP", passToken);
 				}
 				passToken.add(plannedInterventionAct);
@@ -586,7 +586,7 @@ public static boolean validatePlannedInterventionActCodeP(PlannedInterventionAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -661,7 +661,7 @@ public static boolean validatePlannedInterventionActCode(PlannedInterventionAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -728,7 +728,7 @@ public static boolean validatePlannedInterventionActStatusCode(PlannedInterventi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -795,7 +795,7 @@ public static boolean validatePlannedInterventionActStatusCodeP(PlannedIntervent
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -862,7 +862,7 @@ public static boolean validatePlannedInterventionActEffectiveTime(PlannedInterve
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -930,7 +930,7 @@ public static boolean validatePlannedInterventionActAuthorParticipation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_ADVANCE_DIRECTIVE_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_ADVANCE_DIRECTIVE_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -999,7 +999,7 @@ public static boolean validatePlannedInterventionActAdvanceDirectiveObservation2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_IMMUNIZATION_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_IMMUNIZATION_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1067,7 +1067,7 @@ public static boolean validatePlannedInterventionActImmunizationActivity2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_MEDICATION_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_MEDICATION_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1135,7 +1135,7 @@ public static boolean validatePlannedInterventionActMedicationActivity2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PROCEDURE_ACTIVITY_ACT2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PROCEDURE_ACTIVITY_ACT2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1203,7 +1203,7 @@ public static boolean validatePlannedInterventionActProcedureActivityAct2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_INTERVENTION_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_INTERVENTION_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1270,7 +1270,7 @@ public static boolean validatePlannedInterventionActInterventionAct(PlannedInter
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PROCEDURE_ACTIVITY_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PROCEDURE_ACTIVITY_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1339,7 +1339,7 @@ public static boolean validatePlannedInterventionActProcedureActivityObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PROCEDURE_ACTIVITY_PROCEDURE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PROCEDURE_ACTIVITY_PROCEDURE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1408,7 +1408,7 @@ public static boolean validatePlannedInterventionActProcedureActivityProcedure2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_ENCOUNTER_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_ENCOUNTER_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1476,7 +1476,7 @@ public static boolean validatePlannedInterventionActEncounterActivity2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_INSTRUCTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_INSTRUCTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1543,7 +1543,7 @@ public static boolean validatePlannedInterventionActInstruction2(PlannedInterven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_NON_MEDICINAL_SUPPLY_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_NON_MEDICINAL_SUPPLY_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1612,7 +1612,7 @@ public static boolean validatePlannedInterventionActNonMedicinalSupplyActivity2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PLANNED_ACT2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PLANNED_ACT2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1679,7 +1679,7 @@ public static boolean validatePlannedInterventionActPlannedAct2(PlannedIntervent
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PLANNED_ENCOUNTER2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PLANNED_ENCOUNTER2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1747,7 +1747,7 @@ public static boolean validatePlannedInterventionActPlannedEncounter2(PlannedInt
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PLANNED_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PLANNED_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1815,7 +1815,7 @@ public static boolean validatePlannedInterventionActPlannedObservation2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PLANNED_PROCEDURE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PLANNED_PROCEDURE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1883,7 +1883,7 @@ public static boolean validatePlannedInterventionActPlannedProcedure2(PlannedInt
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PLANNED_MEDICATION_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PLANNED_MEDICATION_ACTIVITY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1952,7 +1952,7 @@ public static boolean validatePlannedInterventionActPlannedMedicationActivity2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PLANNED_SUPPLY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PLANNED_SUPPLY2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2019,7 +2019,7 @@ public static boolean validatePlannedInterventionActPlannedSupply2(PlannedInterv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_NUTRITION_RECOMMENDATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_NUTRITION_RECOMMENDATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2087,7 +2087,7 @@ public static boolean validatePlannedInterventionActNutritionRecommendation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_ENTRY_REFERENCE_DOC_INSTANCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_ENTRY_REFERENCE_DOC_INSTANCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2156,7 +2156,7 @@ public static boolean validatePlannedInterventionActEntryReferenceDocInstance(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_ENTRY_REFERENCE_GOAL_OBS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_ENTRY_REFERENCE_GOAL_OBS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2224,7 +2224,7 @@ public static boolean validatePlannedInterventionActEntryReferenceGoalObs(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_HANDOFF_COMMUNICATION_PARTICIPANTS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_HANDOFF_COMMUNICATION_PARTICIPANTS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2293,7 +2293,7 @@ public static boolean validatePlannedInterventionActHandoffCommunicationParticip
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PLANNED_IMMUNIZATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_PLANNED_IMMUNIZATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2362,7 +2362,7 @@ public static boolean validatePlannedInterventionActPlannedImmunizationActivity(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_INTERVENTION_ACT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2429,7 +2429,7 @@ public static boolean validatePlannedInterventionActReference(PlannedInterventio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_INTERVENTION_ACT_REFERENCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_INTERVENTION_ACT_REFERENCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2502,7 +2502,7 @@ public static boolean validatePlannedInterventionActReferenceTypeCode(PlannedInt
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_INTERVENTION_ACT_REFERENCE_EXTERNAL_DOCUMENT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_INTERVENTION_ACT_REFERENCE_EXTERNAL_DOCUMENT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2604,7 +2604,7 @@ public static EList<AdvanceDirectiveObservation2> getAdvanceDirectiveObservation
 		@SuppressWarnings("unchecked")
 		Collection<AdvanceDirectiveObservation2> result = (Collection<AdvanceDirectiveObservation2>) query.evaluate(
 			plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<AdvanceDirectiveObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2653,7 +2653,7 @@ public static EList<ImmunizationActivity2> getImmunizationActivity2s(
 		@SuppressWarnings("unchecked")
 		Collection<ImmunizationActivity2> result = (Collection<ImmunizationActivity2>) query.evaluate(
 			plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<ImmunizationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2701,7 +2701,7 @@ public static EList<MedicationActivity2> getMedicationActivity2s(PlannedInterven
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity2> result = (Collection<MedicationActivity2>) query.evaluate(
 			plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<MedicationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2750,7 +2750,7 @@ public static EList<ProcedureActivityAct2> getProcedureActivityAct2s(
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityAct2> result = (Collection<ProcedureActivityAct2>) query.evaluate(
 			plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityAct2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2797,7 +2797,7 @@ public static EList<InterventionAct> getInterventionActs(PlannedInterventionAct
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INTERVENTION_ACTS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<InterventionAct> result = (Collection<InterventionAct>) query.evaluate(plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<InterventionAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2847,7 +2847,7 @@ public static EList<ProcedureActivityObservation2> getProcedureActivityObservati
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityObservation2> result = (Collection<ProcedureActivityObservation2>) query.evaluate(
 			plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2897,7 +2897,7 @@ public static EList<ProcedureActivityProcedure2> getProcedureActivityProcedure2s
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityProcedure2> result = (Collection<ProcedureActivityProcedure2>) query.evaluate(
 			plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityProcedure2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2944,7 +2944,7 @@ public static EList<EncounterActivity2> getEncounterActivity2s(PlannedInterventi
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_ENCOUNTER_ACTIVITY2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EncounterActivity2> result = (Collection<EncounterActivity2>) query.evaluate(plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<EncounterActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2991,7 +2991,7 @@ public static EList<Instruction2> getInstruction2s(PlannedInterventionAct planne
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INSTRUCTION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Instruction2> result = (Collection<Instruction2>) query.evaluate(plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<Instruction2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3041,7 +3041,7 @@ public static EList<NonMedicinalSupplyActivity2> getNonMedicinalSupplyActivity2s
 		@SuppressWarnings("unchecked")
 		Collection<NonMedicinalSupplyActivity2> result = (Collection<NonMedicinalSupplyActivity2>) query.evaluate(
 			plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<NonMedicinalSupplyActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3088,7 +3088,7 @@ public static EList<PlannedAct2> getPlannedAct2s(PlannedInterventionAct plannedI
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PLANNED_ACT2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PlannedAct2> result = (Collection<PlannedAct2>) query.evaluate(plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<PlannedAct2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3135,7 +3135,7 @@ public static EList<PlannedEncounter2> getPlannedEncounter2s(PlannedIntervention
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PLANNED_ENCOUNTER2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PlannedEncounter2> result = (Collection<PlannedEncounter2>) query.evaluate(plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<PlannedEncounter2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3183,7 +3183,7 @@ public static EList<PlannedObservation2> getPlannedObservation2s(PlannedInterven
 		@SuppressWarnings("unchecked")
 		Collection<PlannedObservation2> result = (Collection<PlannedObservation2>) query.evaluate(
 			plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<PlannedObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3230,7 +3230,7 @@ public static EList<PlannedProcedure2> getPlannedProcedure2s(PlannedIntervention
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PLANNED_PROCEDURE2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PlannedProcedure2> result = (Collection<PlannedProcedure2>) query.evaluate(plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<PlannedProcedure2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3280,7 +3280,7 @@ public static EList<PlannedMedicationActivity2> getPlannedMedicationActivity2s(
 		@SuppressWarnings("unchecked")
 		Collection<PlannedMedicationActivity2> result = (Collection<PlannedMedicationActivity2>) query.evaluate(
 			plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<PlannedMedicationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3327,7 +3327,7 @@ public static EList<PlannedSupply2> getPlannedSupply2s(PlannedInterventionAct pl
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PLANNED_SUPPLY2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PlannedSupply2> result = (Collection<PlannedSupply2>) query.evaluate(plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<PlannedSupply2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3376,7 +3376,7 @@ public static EList<NutritionRecommendation> getNutritionRecommendations(
 		@SuppressWarnings("unchecked")
 		Collection<NutritionRecommendation> result = (Collection<NutritionRecommendation>) query.evaluate(
 			plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<NutritionRecommendation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3424,7 +3424,7 @@ public static EList<EntryReference> getEntryReferenceDocInstances(PlannedInterve
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_ENTRY_REFERENCE_DOC_INSTANCES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EntryReference> result = (Collection<EntryReference>) query.evaluate(plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<EntryReference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3471,7 +3471,7 @@ public static EList<EntryReference> getEntryReferenceGoalObss(PlannedInterventio
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_ENTRY_REFERENCE_GOAL_OBSS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EntryReference> result = (Collection<EntryReference>) query.evaluate(plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<EntryReference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3521,7 +3521,7 @@ public static EList<HandoffCommunicationParticipants> getHandoffCommunicationPar
 		@SuppressWarnings("unchecked")
 		Collection<HandoffCommunicationParticipants> result = (Collection<HandoffCommunicationParticipants>) query.evaluate(
 			plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<HandoffCommunicationParticipants>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3571,7 +3571,7 @@ public static EList<PlannedImmunizationActivity> getPlannedImmunizationActivitie
 		@SuppressWarnings("unchecked")
 		Collection<PlannedImmunizationActivity> result = (Collection<PlannedImmunizationActivity>) query.evaluate(
 			plannedInterventionAct);
-		return new BasicEList.UnmodifiableEList<PlannedImmunizationActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // PlannedInterventionActOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedMedicationActivity2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedMedicationActivity2Operations.java
index 834483583b..194e141ac3 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedMedicationActivity2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedMedicationActivity2Operations.java
@@ -125,7 +125,7 @@ protected PlannedMedicationActivity2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_EFFECTIVE_TIME_IVLT_SOR_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_EFFECTIVE_TIME_IVLT_SOR_TS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -195,7 +195,7 @@ public static boolean validatePlannedMedicationActivity2EffectiveTimeIVLTSorTS(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_EFFECTIVE_TIME_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_EFFECTIVE_TIME_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -265,7 +265,7 @@ public static boolean validatePlannedMedicationActivity2EffectiveTimeIVLTSLow(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_EFFECTIVE_TIME_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_EFFECTIVE_TIME_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -335,7 +335,7 @@ public static boolean validatePlannedMedicationActivity2EffectiveTimeIVLTSHigh(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_EFFECTIVE_TIME_IVLTS_LOW_XOR_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_EFFECTIVE_TIME_IVLTS_LOW_XOR_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -405,7 +405,7 @@ public static boolean validatePlannedMedicationActivity2EffectiveTimeIVLTSLowXor
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_EFFECTIVE_TIME_PIVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_EFFECTIVE_TIME_PIVLTS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -475,7 +475,7 @@ public static boolean validatePlannedMedicationActivity2EffectiveTimePIVLTS(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -545,7 +545,7 @@ public static boolean validatePlannedMedicationActivity2TemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -614,7 +614,7 @@ public static boolean validatePlannedMedicationActivity2StatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -683,7 +683,7 @@ public static boolean validatePlannedMedicationActivity2StatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -752,7 +752,7 @@ public static boolean validatePlannedMedicationActivity2RepeatNumber(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_ROUTE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_ROUTE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -804,7 +804,7 @@ public static boolean validatePlannedMedicationActivity2RouteCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.PlannedMedicationActivity2RouteCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.PlannedMedicationActivity2RouteCodeP", passToken);
 				}
@@ -837,7 +837,7 @@ public static boolean validatePlannedMedicationActivity2RouteCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_ROUTE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_ROUTE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -914,7 +914,7 @@ public static boolean validatePlannedMedicationActivity2RouteCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_APPROACH_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_APPROACH_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -967,7 +967,7 @@ public static boolean validatePlannedMedicationActivity2ApproachSiteCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.PlannedMedicationActivity2ApproachSiteCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.PlannedMedicationActivity2ApproachSiteCodeP",
 						passToken);
@@ -1001,7 +1001,7 @@ public static boolean validatePlannedMedicationActivity2ApproachSiteCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_APPROACH_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_APPROACH_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1079,7 +1079,7 @@ public static boolean validatePlannedMedicationActivity2ApproachSiteCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_DOSE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_DOSE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1148,7 +1148,7 @@ public static boolean validatePlannedMedicationActivity2DoseQuantity(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_RATE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_RATE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1217,7 +1217,7 @@ public static boolean validatePlannedMedicationActivity2RateQuantity(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_MAX_DOSE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_MAX_DOSE_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1286,7 +1286,7 @@ public static boolean validatePlannedMedicationActivity2MaxDoseQuantity(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_ADMINISTRATION_UNIT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_ADMINISTRATION_UNIT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1339,7 +1339,7 @@ public static boolean validatePlannedMedicationActivity2AdministrationUnitCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.PlannedMedicationActivity2AdministrationUnitCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.PlannedMedicationActivity2AdministrationUnitCodeP",
 						passToken);
@@ -1373,7 +1373,7 @@ public static boolean validatePlannedMedicationActivity2AdministrationUnitCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_ADMINISTRATION_UNIT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_ADMINISTRATION_UNIT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1452,7 +1452,7 @@ public static boolean validatePlannedMedicationActivity2AdministrationUnitCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1521,7 +1521,7 @@ public static boolean validatePlannedMedicationActivity2Performer(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1591,7 +1591,7 @@ public static boolean validatePlannedMedicationActivity2AuthorParticipation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1661,7 +1661,7 @@ public static boolean validatePlannedMedicationActivity2PriorityPreference(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_INDICATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_INDICATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1730,7 +1730,7 @@ public static boolean validatePlannedMedicationActivity2Indication2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_INSTRUCTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_INSTRUCTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1799,7 +1799,7 @@ public static boolean validatePlannedMedicationActivity2Instruction2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_CONSUMABLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_CONSUMABLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1868,7 +1868,7 @@ public static boolean validatePlannedMedicationActivity2Consumable(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_PRECONDITION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_PRECONDITION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1937,7 +1937,7 @@ public static boolean validatePlannedMedicationActivity2Precondition(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_CE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_CE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1993,7 +1993,7 @@ public static boolean validatePlannedMedicationActivity2CETranslationP(
 						"org.openhealthtools.mdht.uml.cda.consol.PlannedMedicationActivity2CETranslationP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.PlannedMedicationActivity2CETranslationP",
 							passToken);
@@ -2028,7 +2028,7 @@ public static boolean validatePlannedMedicationActivity2CETranslationP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2111,7 +2111,7 @@ public static boolean validatePlannedMedicationActivity2CETranslation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_IVLP_QDOSE_QUANTITY_UNIT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_IVLP_QDOSE_QUANTITY_UNIT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2186,7 +2186,7 @@ public static boolean validatePlannedMedicationActivity2IVLPQdoseQuantityUnit(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_IVLP_QRATE_QUANTITY_UNIT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_IVLP_QRATE_QUANTITY_UNIT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2261,7 +2261,7 @@ public static boolean validatePlannedMedicationActivity2IVLPQrateQuantityUnit(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_CONSUMABLE_MEDICATION_INFORMATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_CONSUMABLE_MEDICATION_INFORMATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2336,7 +2336,7 @@ public static boolean validatePlannedMedicationActivity2ConsumableMedicationInfo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_PRECONDITION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_PRECONDITION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2411,7 +2411,7 @@ public static boolean validatePlannedMedicationActivity2PreconditionTypeCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_PRECONDITION_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_MEDICATION_ACTIVITY2_PRECONDITION_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2515,7 +2515,7 @@ public static EList<PriorityPreference> getPriorityPreferences(
 		@SuppressWarnings("unchecked")
 		Collection<PriorityPreference> result = (Collection<PriorityPreference>) query.evaluate(
 			plannedMedicationActivity2);
-		return new BasicEList.UnmodifiableEList<PriorityPreference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2562,7 +2562,7 @@ public static EList<Indication2> getIndication2s(PlannedMedicationActivity2 plan
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INDICATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication2> result = (Collection<Indication2>) query.evaluate(plannedMedicationActivity2);
-		return new BasicEList.UnmodifiableEList<Indication2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2609,7 +2609,7 @@ public static EList<Instruction2> getInstruction2s(PlannedMedicationActivity2 pl
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INSTRUCTION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Instruction2> result = (Collection<Instruction2>) query.evaluate(plannedMedicationActivity2);
-		return new BasicEList.UnmodifiableEList<Instruction2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2633,7 +2633,7 @@ public static EList<Instruction2> getInstruction2s(PlannedMedicationActivity2 pl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUBSTANCE_ADMINISTRATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUBSTANCE_ADMINISTRATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedObservation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedObservation2Operations.java
index bf7d03ac2d..6489b35815 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedObservation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedObservation2Operations.java
@@ -99,7 +99,7 @@ protected PlannedObservation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -165,7 +165,7 @@ public static boolean validatePlannedObservation2TemplateId(PlannedObservation2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -213,7 +213,7 @@ public static boolean validatePlannedObservation2CodeP(PlannedObservation2 plann
 					"org.openhealthtools.mdht.uml.cda.consol.PlannedObservation2CodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PlannedObservation2CodeP", passToken);
 				}
 				passToken.add(plannedObservation2);
@@ -245,7 +245,7 @@ public static boolean validatePlannedObservation2CodeP(PlannedObservation2 plann
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -319,7 +319,7 @@ public static boolean validatePlannedObservation2Code(PlannedObservation2 planne
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -385,7 +385,7 @@ public static boolean validatePlannedObservation2StatusCode(PlannedObservation2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -452,7 +452,7 @@ public static boolean validatePlannedObservation2StatusCodeP(PlannedObservation2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -519,7 +519,7 @@ public static boolean validatePlannedObservation2EffectiveTime(PlannedObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -584,7 +584,7 @@ public static boolean validatePlannedObservation2Value(PlannedObservation2 plann
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -650,7 +650,7 @@ public static boolean validatePlannedObservation2MethodCode(PlannedObservation2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_TARGET_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_TARGET_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -700,7 +700,7 @@ public static boolean validatePlannedObservation2TargetSiteCodeP(PlannedObservat
 					"org.openhealthtools.mdht.uml.cda.consol.PlannedObservation2TargetSiteCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.PlannedObservation2TargetSiteCodeP", passToken);
 				}
@@ -733,7 +733,7 @@ public static boolean validatePlannedObservation2TargetSiteCodeP(PlannedObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -808,7 +808,7 @@ public static boolean validatePlannedObservation2TargetSiteCode(PlannedObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -873,7 +873,7 @@ public static boolean validatePlannedObservation2Performer(PlannedObservation2 p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -940,7 +940,7 @@ public static boolean validatePlannedObservation2AuthorParticipation(PlannedObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1007,7 +1007,7 @@ public static boolean validatePlannedObservation2PriorityPreference(PlannedObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_INDICATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_INDICATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1073,7 +1073,7 @@ public static boolean validatePlannedObservation2Indication2(PlannedObservation2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_INSTRUCTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_INSTRUCTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1139,7 +1139,7 @@ public static boolean validatePlannedObservation2Instruction2(PlannedObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_PLANNED_COVERAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_OBSERVATION2_PLANNED_COVERAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1231,7 +1231,7 @@ public static EList<PriorityPreference> getPriorityPreferences(PlannedObservatio
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PRIORITY_PREFERENCES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PriorityPreference> result = (Collection<PriorityPreference>) query.evaluate(plannedObservation2);
-		return new BasicEList.UnmodifiableEList<PriorityPreference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1278,7 +1278,7 @@ public static EList<Indication2> getIndication2s(PlannedObservation2 plannedObse
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INDICATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication2> result = (Collection<Indication2>) query.evaluate(plannedObservation2);
-		return new BasicEList.UnmodifiableEList<Indication2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1325,7 +1325,7 @@ public static EList<Instruction2> getInstruction2s(PlannedObservation2 plannedOb
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INSTRUCTION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Instruction2> result = (Collection<Instruction2>) query.evaluate(plannedObservation2);
-		return new BasicEList.UnmodifiableEList<Instruction2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1372,7 +1372,7 @@ public static EList<PlannedCoverage> getPlannedCoverages(PlannedObservation2 pla
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PLANNED_COVERAGES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PlannedCoverage> result = (Collection<PlannedCoverage>) query.evaluate(plannedObservation2);
-		return new BasicEList.UnmodifiableEList<PlannedCoverage>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1396,7 +1396,7 @@ public static EList<PlannedCoverage> getPlannedCoverages(PlannedObservation2 pla
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedProcedure2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedProcedure2Operations.java
index f2a64fe676..c036e0f626 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedProcedure2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedProcedure2Operations.java
@@ -100,7 +100,7 @@ protected PlannedProcedure2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_CODE_FROM_LOINC_OR_SNOMED__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_CODE_FROM_LOINC_OR_SNOMED__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -167,7 +167,7 @@ public static boolean validatePlannedProcedure2CodeFromLoincOrSnomed(PlannedProc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_CODE_FROM_CPT_OR_ICD__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_CODE_FROM_CPT_OR_ICD__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -234,7 +234,7 @@ public static boolean validatePlannedProcedure2CodeFromCptOrIcd(PlannedProcedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_INSTRUCTION2_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_INSTRUCTION2_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -301,7 +301,7 @@ public static boolean validatePlannedProcedure2Instruction2InversionInd(PlannedP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -366,7 +366,7 @@ public static boolean validatePlannedProcedure2TemplateId(PlannedProcedure2 plan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -432,7 +432,7 @@ public static boolean validatePlannedProcedure2Code(PlannedProcedure2 plannedPro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -497,7 +497,7 @@ public static boolean validatePlannedProcedure2StatusCode(PlannedProcedure2 plan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -562,7 +562,7 @@ public static boolean validatePlannedProcedure2StatusCodeP(PlannedProcedure2 pla
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -628,7 +628,7 @@ public static boolean validatePlannedProcedure2EffectiveTime(PlannedProcedure2 p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -693,7 +693,7 @@ public static boolean validatePlannedProcedure2MethodCode(PlannedProcedure2 plan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_TARGET_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_TARGET_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -743,7 +743,7 @@ public static boolean validatePlannedProcedure2TargetSiteCodeP(PlannedProcedure2
 					"org.openhealthtools.mdht.uml.cda.consol.PlannedProcedure2TargetSiteCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PlannedProcedure2TargetSiteCodeP", passToken);
 				}
 				passToken.add(plannedProcedure2);
@@ -775,7 +775,7 @@ public static boolean validatePlannedProcedure2TargetSiteCodeP(PlannedProcedure2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -850,7 +850,7 @@ public static boolean validatePlannedProcedure2TargetSiteCode(PlannedProcedure2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -915,7 +915,7 @@ public static boolean validatePlannedProcedure2Performer(PlannedProcedure2 plann
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -982,7 +982,7 @@ public static boolean validatePlannedProcedure2AuthorParticipation(PlannedProced
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1049,7 +1049,7 @@ public static boolean validatePlannedProcedure2PriorityPreference(PlannedProcedu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_INDICATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_INDICATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1114,7 +1114,7 @@ public static boolean validatePlannedProcedure2Indication2(PlannedProcedure2 pla
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_INSTRUCTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_INSTRUCTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1179,7 +1179,7 @@ public static boolean validatePlannedProcedure2Instruction2(PlannedProcedure2 pl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_PLANNED_COVERAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE2_PLANNED_COVERAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1271,7 +1271,7 @@ public static EList<PriorityPreference> getPriorityPreferences(PlannedProcedure2
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PRIORITY_PREFERENCES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PriorityPreference> result = (Collection<PriorityPreference>) query.evaluate(plannedProcedure2);
-		return new BasicEList.UnmodifiableEList<PriorityPreference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1318,7 +1318,7 @@ public static EList<Indication2> getIndication2s(PlannedProcedure2 plannedProced
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INDICATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication2> result = (Collection<Indication2>) query.evaluate(plannedProcedure2);
-		return new BasicEList.UnmodifiableEList<Indication2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1365,7 +1365,7 @@ public static EList<Instruction2> getInstruction2s(PlannedProcedure2 plannedProc
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INSTRUCTION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Instruction2> result = (Collection<Instruction2>) query.evaluate(plannedProcedure2);
-		return new BasicEList.UnmodifiableEList<Instruction2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1412,7 +1412,7 @@ public static EList<PlannedCoverage> getPlannedCoverages(PlannedProcedure2 plann
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PLANNED_COVERAGES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PlannedCoverage> result = (Collection<PlannedCoverage>) query.evaluate(plannedProcedure2);
-		return new BasicEList.UnmodifiableEList<PlannedCoverage>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1436,7 +1436,7 @@ public static EList<PlannedCoverage> getPlannedCoverages(PlannedProcedure2 plann
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_PROCEDURE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_PROCEDURE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedProcedureSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedProcedureSection2Operations.java
index 014ddc1182..34b1ef8c06 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedProcedureSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedProcedureSection2Operations.java
@@ -80,7 +80,7 @@ protected PlannedProcedureSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -173,7 +173,7 @@ public static EList<PlannedProcedure2> getConsolPlannedProcedure2s(
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_PLANNED_PROCEDURE2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PlannedProcedure2> result = (Collection<PlannedProcedure2>) query.evaluate(plannedProcedureSection2);
-		return new BasicEList.UnmodifiableEList<PlannedProcedure2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -195,7 +195,7 @@ public static EList<PlannedProcedure2> getConsolPlannedProcedure2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -244,7 +244,7 @@ public static boolean validatePlannedProcedureSectionCodeP(PlannedProcedureSecti
 					"org.openhealthtools.mdht.uml.cda.consol.PlannedProcedureSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PlannedProcedureSectionCodeP", passToken);
 				}
 				passToken.add(plannedProcedureSection2);
@@ -276,7 +276,7 @@ public static boolean validatePlannedProcedureSectionCodeP(PlannedProcedureSecti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -350,7 +350,7 @@ public static boolean validatePlannedProcedureSectionCode(PlannedProcedureSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION_PLAN_OF_CARE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION_PLAN_OF_CARE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedProcedureSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedProcedureSectionOperations.java
index c2145e22ba..f1dbabc361 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedProcedureSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedProcedureSectionOperations.java
@@ -87,7 +87,7 @@ protected PlannedProcedureSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -156,7 +156,7 @@ public static boolean validatePlannedProcedureSectionTemplateId(PlannedProcedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -222,7 +222,7 @@ public static boolean validatePlannedProcedureSectionCode(PlannedProcedureSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -333,7 +333,7 @@ public static boolean validatePlannedProcedureSectionText(PlannedProcedureSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePlannedProcedureSectionText(PlannedProcedureSection, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Planned Procedure Section Text</em>}' operation.
@@ -354,7 +354,7 @@ public static boolean validatePlannedProcedureSectionText(PlannedProcedureSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -420,7 +420,7 @@ public static boolean validatePlannedProcedureSectionTitle(PlannedProcedureSecti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION_PLAN_OF_CARE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_PROCEDURE_SECTION_PLAN_OF_CARE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -517,7 +517,7 @@ public static EList<PlanOfCareActivityProcedure> getPlanOfCareActivityProcedures
 		@SuppressWarnings("unchecked")
 		Collection<PlanOfCareActivityProcedure> result = (Collection<PlanOfCareActivityProcedure>) query.evaluate(
 			plannedProcedureSection);
-		return new BasicEList.UnmodifiableEList<PlanOfCareActivityProcedure>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // PlannedProcedureSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedSupply2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedSupply2Operations.java
index c328bdb5b2..92b6ce72a8 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedSupply2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PlannedSupply2Operations.java
@@ -105,7 +105,7 @@ protected PlannedSupply2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_MED_INFO_XOR_IMMUN_XOR_PRODUCT_INSTANCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_MED_INFO_XOR_IMMUN_XOR_PRODUCT_INSTANCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -173,7 +173,7 @@ public static boolean validatePlannedSupply2MedInfoXorImmunXorProductInstance(Pl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -239,7 +239,7 @@ public static boolean validatePlannedSupply2TemplateId(PlannedSupply2 plannedSup
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -304,7 +304,7 @@ public static boolean validatePlannedSupply2StatusCode(PlannedSupply2 plannedSup
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -369,7 +369,7 @@ public static boolean validatePlannedSupply2StatusCodeP(PlannedSupply2 plannedSu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -434,7 +434,7 @@ public static boolean validatePlannedSupply2EffectiveTime(PlannedSupply2 planned
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_REPEAT_NUMBER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -499,7 +499,7 @@ public static boolean validatePlannedSupply2RepeatNumber(PlannedSupply2 plannedS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_QUANTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -564,7 +564,7 @@ public static boolean validatePlannedSupply2Quantity(PlannedSupply2 plannedSuppl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_PRODUCT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_PRODUCT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -629,7 +629,7 @@ public static boolean validatePlannedSupply2Product(PlannedSupply2 plannedSupply
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -694,7 +694,7 @@ public static boolean validatePlannedSupply2Performer(PlannedSupply2 plannedSupp
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -761,7 +761,7 @@ public static boolean validatePlannedSupply2AuthorParticipation(PlannedSupply2 p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_PRODUCT_INSTANCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_PRODUCT_INSTANCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -826,7 +826,7 @@ public static boolean validatePlannedSupply2ProductInstance(PlannedSupply2 plann
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -892,7 +892,7 @@ public static boolean validatePlannedSupply2PriorityPreference(PlannedSupply2 pl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_INDICATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_INDICATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -957,7 +957,7 @@ public static boolean validatePlannedSupply2Indication2(PlannedSupply2 plannedSu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_INSTRUCTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_INSTRUCTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1022,7 +1022,7 @@ public static boolean validatePlannedSupply2Instruction2(PlannedSupply2 plannedS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_PLANNED_COVERAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_PLANNED_COVERAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1087,7 +1087,7 @@ public static boolean validatePlannedSupply2PlannedCoverage(PlannedSupply2 plann
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_PRODUCT_RECOMMENDED__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLANNED_SUPPLY2_PRODUCT_RECOMMENDED__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1153,7 +1153,7 @@ public static boolean validatePlannedSupply2ProductRecommended(PlannedSupply2 pl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_SUPPLY2_PRODUCT_MANUFACTURED_PRODUCT_MED_INFO2_XOR_IMMUN_MED_INFO2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_SUPPLY2_PRODUCT_MANUFACTURED_PRODUCT_MED_INFO2_XOR_IMMUN_MED_INFO2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1227,7 +1227,7 @@ public static boolean validatePlannedSupply2ProductManufacturedProductMedInfo2Xo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_SUPPLY2_PRODUCT_MANUFACTURED_PRODUCT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PLANNED_SUPPLY2_PRODUCT_MANUFACTURED_PRODUCT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1369,7 +1369,7 @@ public static EList<PriorityPreference> getPriorityPreferences(PlannedSupply2 pl
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PRIORITY_PREFERENCES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PriorityPreference> result = (Collection<PriorityPreference>) query.evaluate(plannedSupply2);
-		return new BasicEList.UnmodifiableEList<PriorityPreference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1416,7 +1416,7 @@ public static EList<Indication2> getIndication2s(PlannedSupply2 plannedSupply2)
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INDICATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication2> result = (Collection<Indication2>) query.evaluate(plannedSupply2);
-		return new BasicEList.UnmodifiableEList<Indication2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1463,7 +1463,7 @@ public static EList<Instruction2> getInstruction2s(PlannedSupply2 plannedSupply2
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INSTRUCTION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Instruction2> result = (Collection<Instruction2>) query.evaluate(plannedSupply2);
-		return new BasicEList.UnmodifiableEList<Instruction2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1510,7 +1510,7 @@ public static EList<PlannedCoverage> getPlannedCoverages(PlannedSupply2 plannedS
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PLANNED_COVERAGES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PlannedCoverage> result = (Collection<PlannedCoverage>) query.evaluate(plannedSupply2);
-		return new BasicEList.UnmodifiableEList<PlannedCoverage>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1534,7 +1534,7 @@ public static EList<PlannedCoverage> getPlannedCoverages(PlannedSupply2 plannedS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUPPLY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PLAN_OF_CARE_ACTIVITY_SUPPLY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PolicyActivity2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PolicyActivity2Operations.java
index a36298b4ab..0b3d19f662 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PolicyActivity2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PolicyActivity2Operations.java
@@ -123,7 +123,7 @@ protected PolicyActivity2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -215,7 +215,7 @@ public static boolean validatePolicyActivityStatusCodeP(PolicyActivity2 policyAc
 					"org.openhealthtools.mdht.uml.cda.consol.PolicyActivityStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PolicyActivityStatusCodeP", passToken);
 				}
 				passToken.add(policyActivity2);
@@ -1578,7 +1578,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 					"org.openhealthtools.mdht.uml.cda.consol.PolicyActivityCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PolicyActivityCodeP", passToken);
 				}
 				passToken.add(policyActivity2);
@@ -1608,7 +1608,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Payer Payer Assigned Entity General Header Constraints US Realm Address US Realm Address Street</em>}' operation.
@@ -1629,7 +1629,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Payer Payer Assigned Entity General Header Constraints US Realm Address If Country Is Us Require State Element</em>}' operation.
@@ -1650,7 +1650,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Payer Payer Assigned Entity General Header Constraints US Realm Address If Country Is Us Require Postal Code Element</em>}' operation.
@@ -1671,7 +1671,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Payer Payer Assigned Entity General Header Constraints US Realm Address Use</em>}' operation.
@@ -1694,7 +1694,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Payer Payer Assigned Entity General Header Constraints US Realm Address Use P</em>}' operation.
@@ -1715,7 +1715,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Payer Payer Assigned Entity General Header Constraints US Realm Address Country</em>}' operation.
@@ -1736,7 +1736,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressState(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Payer Payer Assigned Entity General Header Constraints US Realm Address State</em>}' operation.
@@ -1757,7 +1757,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Payer Payer Assigned Entity General Header Constraints US Realm Address City</em>}' operation.
@@ -1778,7 +1778,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Payer Payer Assigned Entity General Header Constraints US Realm Address Postal Code</em>}' operation.
@@ -1799,7 +1799,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2PayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Payer Payer Assigned Entity General Header Constraints US Realm Address Street Address Line</em>}' operation.
@@ -1820,7 +1820,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Guarantor Guarantor Assigned Entity General Header Constraints US Realm Address US Realm Address Street</em>}' operation.
@@ -1841,7 +1841,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Guarantor Guarantor Assigned Entity General Header Constraints US Realm Address If Country Is Us Require State Element</em>}' operation.
@@ -1862,7 +1862,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Guarantor Guarantor Assigned Entity General Header Constraints US Realm Address If Country Is Us Require Postal Code Element</em>}' operation.
@@ -1883,7 +1883,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Guarantor Guarantor Assigned Entity General Header Constraints US Realm Address Use</em>}' operation.
@@ -1906,7 +1906,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Guarantor Guarantor Assigned Entity General Header Constraints US Realm Address Use P</em>}' operation.
@@ -1927,7 +1927,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Guarantor Guarantor Assigned Entity General Header Constraints US Realm Address Country</em>}' operation.
@@ -1948,7 +1948,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressState(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Guarantor Guarantor Assigned Entity General Header Constraints US Realm Address State</em>}' operation.
@@ -1969,7 +1969,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Guarantor Guarantor Assigned Entity General Header Constraints US Realm Address City</em>}' operation.
@@ -1990,7 +1990,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Guarantor Guarantor Assigned Entity General Header Constraints US Realm Address Postal Code</em>}' operation.
@@ -2011,7 +2011,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2GuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Guarantor Guarantor Assigned Entity General Header Constraints US Realm Address Street Address Line</em>}' operation.
@@ -2032,7 +2032,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivityCoverageCoverageRoleCoveragePlayingEntityDateOfBirthInSDTCbirthTime(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity Coverage Coverage Role Coverage Playing Entity Date Of Birth In SDT Cbirth Time</em>}' operation.
@@ -2053,7 +2053,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_COVERAGE_PLAYING_ENTITY_DATE_OF_BIRTH_IN_SDT_CBIRTH_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_COVERAGE_PLAYING_ENTITY_DATE_OF_BIRTH_IN_SDT_CBIRTH_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2CoverageCoverageRoleCoveragePlayingEntitySDTCBirthTime(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 Coverage Coverage Role Coverage Playing Entity SDTC Birth Time</em>}' operation.
@@ -2074,7 +2074,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_COVERAGE_COVERAGE_ROLE_COVERAGE_PLAYING_ENTITY_SDTC_BIRTH_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_COVERAGE_COVERAGE_ROLE_COVERAGE_PLAYING_ENTITY_SDTC_BIRTH_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2CDTranslation(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 CD Translation</em>}' operation.
@@ -2097,7 +2097,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_CD_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_CD_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivity2CDTranslationP(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity2 CD Translation P</em>}' operation.
@@ -2118,7 +2118,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_CD_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY2_CD_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivityCodeP(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity Code P</em>}' operation.
@@ -2139,7 +2139,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivityCode(PolicyActivity2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity Code</em>}' operation.
@@ -2162,7 +2162,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2236,7 +2236,7 @@ public static boolean validatePolicyActivityCode(PolicyActivity2 policyActivity2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2309,7 +2309,7 @@ public static boolean validatePolicyActivityStatusCode(PolicyActivity2 policyAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_PAYER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_PAYER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2374,7 +2374,7 @@ public static boolean validatePolicyActivityPayer(PolicyActivity2 policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_GUARANTOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_GUARANTOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2439,7 +2439,7 @@ public static boolean validatePolicyActivityGuarantor(PolicyActivity2 policyActi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_COVERAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_COVERAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2504,7 +2504,7 @@ public static boolean validatePolicyActivityCoverage(PolicyActivity2 policyActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2577,7 +2577,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityAddr(PolicyA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2650,7 +2650,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityTelecom(Poli
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2722,7 +2722,7 @@ public static boolean validatePolicyActivityPayerTemplateId(PolicyActivity2 poli
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2794,7 +2794,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntity(PolicyActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2848,7 +2848,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityCode
 						"org.openhealthtools.mdht.uml.cda.consol.PolicyActivityGuarantorGuarantorAssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.PolicyActivityGuarantorGuarantorAssignedEntityCodeP",
 							passToken);
@@ -2883,7 +2883,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityCode
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2966,7 +2966,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityCode
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3040,7 +3040,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityAddr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3114,7 +3114,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityTele
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3186,7 +3186,7 @@ public static boolean validatePolicyActivityGuarantorTemplateId(PolicyActivity2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3258,7 +3258,7 @@ public static boolean validatePolicyActivityGuarantorTypeCode(PolicyActivity2 po
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3331,7 +3331,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntity(Pol
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_COVERAGE_PLAYING_ENTITY_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_COVERAGE_PLAYING_ENTITY_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3405,7 +3405,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleCoveragePlayingE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3477,7 +3477,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleId(PolicyActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_COVERAGE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_COVERAGE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3551,7 +3551,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleCoveragePlayingE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3623,7 +3623,7 @@ public static boolean validatePolicyActivityCoverageTemplateId(PolicyActivity2 p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PolicyActivityOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PolicyActivityOperations.java
index c158c9ac5a..a3fbbcf0b1 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PolicyActivityOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PolicyActivityOperations.java
@@ -172,7 +172,7 @@ protected PolicyActivityOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -237,7 +237,7 @@ public static boolean validatePolicyActivityTemplateId(PolicyActivity policyActi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -329,7 +329,7 @@ public static boolean validatePolicyActivityCodeP(PolicyActivity policyActivity,
 					"org.openhealthtools.mdht.uml.cda.consol.PolicyActivityCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PolicyActivityCodeP", passToken);
 				}
 				passToken.add(policyActivity);
@@ -455,7 +455,7 @@ public static boolean validatePolicyActivityId(PolicyActivity policyActivity, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivityId(PolicyActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity Id</em>}' operation.
@@ -476,7 +476,7 @@ public static boolean validatePolicyActivityId(PolicyActivity policyActivity, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivityCodeP(PolicyActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity Code P</em>}' operation.
@@ -497,7 +497,7 @@ public static boolean validatePolicyActivityId(PolicyActivity policyActivity, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivityCode(PolicyActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity Code</em>}' operation.
@@ -520,7 +520,7 @@ public static boolean validatePolicyActivityId(PolicyActivity policyActivity, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -586,7 +586,7 @@ public static boolean validatePolicyActivityMoodCode(PolicyActivity policyActivi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -651,7 +651,7 @@ public static boolean validatePolicyActivityStatusCode(PolicyActivity policyActi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_PAYER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_PAYER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -716,7 +716,7 @@ public static boolean validatePolicyActivityPayer(PolicyActivity policyActivity,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_GUARANTOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_GUARANTOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -781,7 +781,7 @@ public static boolean validatePolicyActivityGuarantor(PolicyActivity policyActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_COVERAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_COVERAGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -846,7 +846,7 @@ public static boolean validatePolicyActivityCoverage(PolicyActivity policyActivi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_HOLDER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_HOLDER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -911,7 +911,7 @@ public static boolean validatePolicyActivityHolder(PolicyActivity policyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POLICY_ACTIVITY_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -977,7 +977,7 @@ public static boolean validatePolicyActivityEntryRelationship(PolicyActivity pol
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1053,7 +1053,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityGeneralHeade
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1129,7 +1129,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityGeneralHeade
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1261,7 +1261,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityGeneralHeade
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivityPayerPayerAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP(PolicyActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity Payer Payer Assigned Entity General Header Constraints US Realm Address Use P</em>}' operation.
@@ -1282,7 +1282,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityGeneralHeade
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1357,7 +1357,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityGeneralHeade
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1433,7 +1433,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityGeneralHeade
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1508,7 +1508,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityGeneralHeade
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1583,7 +1583,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityGeneralHeade
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1659,7 +1659,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityGeneralHeade
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1735,7 +1735,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityGeneralHeade
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_PAYER_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_PAYER_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1809,7 +1809,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityPayerOrganiz
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1942,7 +1942,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityCode(PolicyA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivityPayerPayerAssignedEntityCode(PolicyActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity Payer Payer Assigned Entity Code</em>}' operation.
@@ -1965,7 +1965,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityCode(PolicyA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2019,7 +2019,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityCodeP(Policy
 						"org.openhealthtools.mdht.uml.cda.consol.PolicyActivityPayerPayerAssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.PolicyActivityPayerPayerAssignedEntityCodeP",
 							passToken);
@@ -2052,7 +2052,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityCodeP(Policy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2124,7 +2124,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityAddr(PolicyA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2197,7 +2197,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityTelecom(Poli
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_PAYER_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY_PAYER_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2271,7 +2271,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntityPayerOrganiz
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2343,7 +2343,7 @@ public static boolean validatePolicyActivityPayerTemplateId(PolicyActivity polic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2415,7 +2415,7 @@ public static boolean validatePolicyActivityPayerTypeCode(PolicyActivity policyA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_PAYER_PAYER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2487,7 +2487,7 @@ public static boolean validatePolicyActivityPayerPayerAssignedEntity(PolicyActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2563,7 +2563,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2639,7 +2639,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2772,7 +2772,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivityGuarantorGuarantorAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP(PolicyActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity Guarantor Guarantor Assigned Entity General Header Constraints US Realm Address Use P</em>}' operation.
@@ -2793,7 +2793,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2869,7 +2869,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2945,7 +2945,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3021,7 +3021,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3097,7 +3097,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3173,7 +3173,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3249,7 +3249,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityGene
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_PERSON_NAME_AND_OR_ORG_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_PERSON_NAME_AND_OR_ORG_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3325,7 +3325,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityPers
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3398,7 +3398,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityCode
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3471,7 +3471,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityCode
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3544,7 +3544,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityAddr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3618,7 +3618,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntityTele
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3690,7 +3690,7 @@ public static boolean validatePolicyActivityGuarantorTemplateId(PolicyActivity p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3762,7 +3762,7 @@ public static boolean validatePolicyActivityGuarantorTime(PolicyActivity policyA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3834,7 +3834,7 @@ public static boolean validatePolicyActivityGuarantorTypeCode(PolicyActivity pol
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_GUARANTOR_GUARANTOR_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3907,7 +3907,7 @@ public static boolean validatePolicyActivityGuarantorGuarantorAssignedEntity(Pol
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3983,7 +3983,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleGeneralHeaderCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4059,7 +4059,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleGeneralHeaderCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4191,7 +4191,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleGeneralHeaderCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivityCoverageCoverageRoleGeneralHeaderConstraintsUSRealmAddressUseP(PolicyActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity Coverage Coverage Role General Header Constraints US Realm Address Use P</em>}' operation.
@@ -4212,7 +4212,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleGeneralHeaderCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4287,7 +4287,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleGeneralHeaderCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4362,7 +4362,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleGeneralHeaderCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4437,7 +4437,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleGeneralHeaderCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4512,7 +4512,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleGeneralHeaderCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4587,7 +4587,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleGeneralHeaderCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4663,7 +4663,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleGeneralHeaderCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_COVERAGE_PLAYING_ENTITY_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_COVERAGE_PLAYING_ENTITY_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4737,7 +4737,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleCoveragePlayingE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4811,7 +4811,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleId(PolicyActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4883,7 +4883,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleCode(PolicyActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4955,7 +4955,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleCodeP(PolicyActi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5027,7 +5027,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleAddr(PolicyActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_COVERAGE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE_COVERAGE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5101,7 +5101,7 @@ public static boolean validatePolicyActivityCoverageCoverageRoleCoveragePlayingE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_LOW_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_LOW_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5173,7 +5173,7 @@ public static boolean validatePolicyActivityCoverageLowTime(PolicyActivity polic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_HIGH_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_HIGH_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5245,7 +5245,7 @@ public static boolean validatePolicyActivityCoverageHighTime(PolicyActivity poli
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5317,7 +5317,7 @@ public static boolean validatePolicyActivityCoverageTemplateId(PolicyActivity po
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5389,7 +5389,7 @@ public static boolean validatePolicyActivityCoverageTypeCode(PolicyActivity poli
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5461,7 +5461,7 @@ public static boolean validatePolicyActivityCoverageTime(PolicyActivity policyAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_COVERAGE_COVERAGE_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5533,7 +5533,7 @@ public static boolean validatePolicyActivityCoverageCoverageRole(PolicyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5609,7 +5609,7 @@ public static boolean validatePolicyActivityHolderHolderRoleGeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5685,7 +5685,7 @@ public static boolean validatePolicyActivityHolderHolderRoleGeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5817,7 +5817,7 @@ public static boolean validatePolicyActivityHolderHolderRoleGeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePolicyActivityHolderHolderRoleGeneralHeaderConstraintsUSRealmAddressUseP(PolicyActivity, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Policy Activity Holder Holder Role General Header Constraints US Realm Address Use P</em>}' operation.
@@ -5838,7 +5838,7 @@ public static boolean validatePolicyActivityHolderHolderRoleGeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5912,7 +5912,7 @@ public static boolean validatePolicyActivityHolderHolderRoleGeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5987,7 +5987,7 @@ public static boolean validatePolicyActivityHolderHolderRoleGeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6062,7 +6062,7 @@ public static boolean validatePolicyActivityHolderHolderRoleGeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6136,7 +6136,7 @@ public static boolean validatePolicyActivityHolderHolderRoleGeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6211,7 +6211,7 @@ public static boolean validatePolicyActivityHolderHolderRoleGeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6287,7 +6287,7 @@ public static boolean validatePolicyActivityHolderHolderRoleGeneralHeaderConstra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6359,7 +6359,7 @@ public static boolean validatePolicyActivityHolderHolderRoleId(PolicyActivity po
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6431,7 +6431,7 @@ public static boolean validatePolicyActivityHolderHolderRoleAddr(PolicyActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6503,7 +6503,7 @@ public static boolean validatePolicyActivityHolderTemplateId(PolicyActivity poli
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6575,7 +6575,7 @@ public static boolean validatePolicyActivityHolderTypeCode(PolicyActivity policy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6647,7 +6647,7 @@ public static boolean validatePolicyActivityHolderTime(PolicyActivity policyActi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_HOLDER_HOLDER_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6719,7 +6719,7 @@ public static boolean validatePolicyActivityHolderHolderRole(PolicyActivity poli
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_ENTRY_RELATIONSHIP_TARGET_ACT_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_ENTRY_RELATIONSHIP_TARGET_ACT_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6792,7 +6792,7 @@ public static boolean validatePolicyActivityEntryRelationshipTargetActActivity(P
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_ENTRY_RELATIONSHIP_DESCRIPTION_COVERAGE_PLAN__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_ENTRY_RELATIONSHIP_DESCRIPTION_COVERAGE_PLAN__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6866,7 +6866,7 @@ public static boolean validatePolicyActivityEntryRelationshipDescriptionCoverage
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_POLICY_ACTIVITY_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostoperativeDiagnosisSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostoperativeDiagnosisSectionOperations.java
index e69289603c..79c0ecb5f7 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostoperativeDiagnosisSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostoperativeDiagnosisSectionOperations.java
@@ -79,7 +79,7 @@ protected PostoperativeDiagnosisSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTOPERATIVE_DIAGNOSIS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTOPERATIVE_DIAGNOSIS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validatePostoperativeDiagnosisSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTOPERATIVE_DIAGNOSIS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTOPERATIVE_DIAGNOSIS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -220,7 +220,7 @@ public static boolean validatePostoperativeDiagnosisSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTOPERATIVE_DIAGNOSIS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTOPERATIVE_DIAGNOSIS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -289,7 +289,7 @@ public static boolean validatePostoperativeDiagnosisSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTOPERATIVE_DIAGNOSIS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTOPERATIVE_DIAGNOSIS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -358,7 +358,7 @@ public static boolean validatePostoperativeDiagnosisSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTOPERATIVE_DIAGNOSIS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTOPERATIVE_DIAGNOSIS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostprocedureDiagnosis2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostprocedureDiagnosis2Operations.java
index 4f20b51632..6b50d5cc94 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostprocedureDiagnosis2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostprocedureDiagnosis2Operations.java
@@ -80,7 +80,7 @@ protected PostprocedureDiagnosis2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -175,7 +175,7 @@ public static boolean validatePostprocedureDiagnosisCodeP(PostprocedureDiagnosis
 					"org.openhealthtools.mdht.uml.cda.consol.PostprocedureDiagnosisCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PostprocedureDiagnosisCodeP", passToken);
 				}
 				passToken.add(postprocedureDiagnosis2);
@@ -213,7 +213,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation2> result = (Collection<ProblemObservation2>) query.evaluate(
 			postprocedureDiagnosis2);
-		return new BasicEList.UnmodifiableEList<ProblemObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -235,7 +235,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #getConsolProblemObservation2s(PostprocedureDiagnosis2) <em>Get Consol Problem Observation2s</em>}' operation.
@@ -278,7 +278,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -352,7 +352,7 @@ public static boolean validatePostprocedureDiagnosisCode(PostprocedureDiagnosis2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostprocedureDiagnosisOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostprocedureDiagnosisOperations.java
index d8cb64c84c..5201cf2130 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostprocedureDiagnosisOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostprocedureDiagnosisOperations.java
@@ -86,7 +86,7 @@ protected PostprocedureDiagnosisOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -153,7 +153,7 @@ public static boolean validatePostprocedureDiagnosisTemplateId(PostprocedureDiag
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -220,7 +220,7 @@ public static boolean validatePostprocedureDiagnosisClassCode(PostprocedureDiagn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -288,7 +288,7 @@ public static boolean validatePostprocedureDiagnosisMoodCode(PostprocedureDiagno
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -354,7 +354,7 @@ public static boolean validatePostprocedureDiagnosisCode(PostprocedureDiagnosis
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -447,7 +447,7 @@ public static EList<ProblemObservation> getProblemObservations(PostprocedureDiag
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PROBLEM_OBSERVATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation> result = (Collection<ProblemObservation>) query.evaluate(postprocedureDiagnosis);
-		return new BasicEList.UnmodifiableEList<ProblemObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // PostprocedureDiagnosisOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostprocedureDiagnosisSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostprocedureDiagnosisSection2Operations.java
index 7bb4f1e3d3..0c33491308 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostprocedureDiagnosisSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostprocedureDiagnosisSection2Operations.java
@@ -78,7 +78,7 @@ protected PostprocedureDiagnosisSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -195,7 +195,7 @@ public static PostprocedureDiagnosis2 getConsolPostprocedureDiagnosis2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -247,7 +247,7 @@ public static boolean validatePostprocedureDiagnosisSectionCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.PostprocedureDiagnosisSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.PostprocedureDiagnosisSectionCodeP", passToken);
 				}
@@ -280,7 +280,7 @@ public static boolean validatePostprocedureDiagnosisSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -358,7 +358,7 @@ public static boolean validatePostprocedureDiagnosisSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION_POSTPROCEDURE_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION_POSTPROCEDURE_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostprocedureDiagnosisSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostprocedureDiagnosisSectionOperations.java
index 122d6ca11a..6be5c979fe 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostprocedureDiagnosisSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PostprocedureDiagnosisSectionOperations.java
@@ -84,7 +84,7 @@ protected PostprocedureDiagnosisSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -204,7 +204,7 @@ public static boolean validatePostprocedureDiagnosisSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePostprocedureDiagnosisSectionCodeP(PostprocedureDiagnosisSection, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Postprocedure Diagnosis Section Code P</em>}' operation.
@@ -225,7 +225,7 @@ public static boolean validatePostprocedureDiagnosisSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -342,7 +342,7 @@ public static boolean validatePostprocedureDiagnosisSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePostprocedureDiagnosisSectionText(PostprocedureDiagnosisSection, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Postprocedure Diagnosis Section Text</em>}' operation.
@@ -363,7 +363,7 @@ public static boolean validatePostprocedureDiagnosisSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -432,7 +432,7 @@ public static boolean validatePostprocedureDiagnosisSectionTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION_POSTPROCEDURE_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_POSTPROCEDURE_DIAGNOSIS_SECTION_POSTPROCEDURE_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreconditionForSubstanceAdministration2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreconditionForSubstanceAdministration2Operations.java
index 85066cdcfd..17b8db0e9f 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreconditionForSubstanceAdministration2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreconditionForSubstanceAdministration2Operations.java
@@ -72,7 +72,7 @@ protected PreconditionForSubstanceAdministration2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -143,7 +143,7 @@ public static boolean validatePreconditionForSubstanceAdministration2TemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -213,7 +213,7 @@ public static boolean validatePreconditionForSubstanceAdministrationCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -285,7 +285,7 @@ public static boolean validatePreconditionForSubstanceAdministrationValueP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -355,7 +355,7 @@ public static boolean validatePreconditionForSubstanceAdministrationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -427,7 +427,7 @@ public static boolean validatePreconditionForSubstanceAdministrationText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreconditionForSubstanceAdministrationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreconditionForSubstanceAdministrationOperations.java
index 5e79468dd1..c6d7e9c01e 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreconditionForSubstanceAdministrationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreconditionForSubstanceAdministrationOperations.java
@@ -78,7 +78,7 @@ protected PreconditionForSubstanceAdministrationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validatePreconditionForSubstanceAdministrationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -218,7 +218,7 @@ public static boolean validatePreconditionForSubstanceAdministrationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -288,7 +288,7 @@ public static boolean validatePreconditionForSubstanceAdministrationText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRECONDITION_FOR_SUBSTANCE_ADMINISTRATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PregnancyObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PregnancyObservationOperations.java
index d062f04536..c7a0cc54b8 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PregnancyObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PregnancyObservationOperations.java
@@ -89,7 +89,7 @@ protected PregnancyObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -155,7 +155,7 @@ public static boolean validatePregnancyObservationTemplateId(PregnancyObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validatePregnancyObservationClassCode(PregnancyObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -287,7 +287,7 @@ public static boolean validatePregnancyObservationMoodCode(PregnancyObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -335,7 +335,7 @@ public static boolean validatePregnancyObservationCodeP(PregnancyObservation pre
 					"org.openhealthtools.mdht.uml.cda.consol.PregnancyObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PregnancyObservationCodeP", passToken);
 				}
 				passToken.add(pregnancyObservation);
@@ -367,7 +367,7 @@ public static boolean validatePregnancyObservationCodeP(PregnancyObservation pre
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -441,7 +441,7 @@ public static boolean validatePregnancyObservationCode(PregnancyObservation preg
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -509,7 +509,7 @@ public static boolean validatePregnancyObservationStatusCode(PregnancyObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -574,7 +574,7 @@ public static boolean validatePregnancyObservationValue(PregnancyObservation pre
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -639,7 +639,7 @@ public static boolean validatePregnancyObservationValueP(PregnancyObservation pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -706,7 +706,7 @@ public static boolean validatePregnancyObservationEffectiveTime(PregnancyObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_ESTIMATED_DATE_OF_DELIVERY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREGNANCY_OBSERVATION_ESTIMATED_DATE_OF_DELIVERY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreoperativeDiagnosis2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreoperativeDiagnosis2Operations.java
index ba50bb1df8..1f549c6611 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreoperativeDiagnosis2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreoperativeDiagnosis2Operations.java
@@ -80,7 +80,7 @@ protected PreoperativeDiagnosis2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -175,7 +175,7 @@ public static boolean validatePreoperativeDiagnosisCodeP(PreoperativeDiagnosis2
 					"org.openhealthtools.mdht.uml.cda.consol.PreoperativeDiagnosisCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PreoperativeDiagnosisCodeP", passToken);
 				}
 				passToken.add(preoperativeDiagnosis2);
@@ -213,7 +213,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation2> result = (Collection<ProblemObservation2>) query.evaluate(
 			preoperativeDiagnosis2);
-		return new BasicEList.UnmodifiableEList<ProblemObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -235,7 +235,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #getConsolProblemObservation2s(PreoperativeDiagnosis2) <em>Get Consol Problem Observation2s</em>}' operation.
@@ -278,7 +278,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -351,7 +351,7 @@ public static boolean validatePreoperativeDiagnosisCode(PreoperativeDiagnosis2 p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreoperativeDiagnosisOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreoperativeDiagnosisOperations.java
index 4043c2ec07..d15d8eefb3 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreoperativeDiagnosisOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreoperativeDiagnosisOperations.java
@@ -86,7 +86,7 @@ protected PreoperativeDiagnosisOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -153,7 +153,7 @@ public static boolean validatePreoperativeDiagnosisTemplateId(PreoperativeDiagno
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -263,7 +263,7 @@ public static boolean validatePreoperativeDiagnosisCode(PreoperativeDiagnosis pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -331,7 +331,7 @@ public static boolean validatePreoperativeDiagnosisMoodCode(PreoperativeDiagnosi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePreoperativeDiagnosisProblemObservation(PreoperativeDiagnosis, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Preoperative Diagnosis Problem Observation</em>}' operation.
@@ -352,7 +352,7 @@ public static boolean validatePreoperativeDiagnosisMoodCode(PreoperativeDiagnosi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -444,7 +444,7 @@ public static EList<ProblemObservation> getProblemObservations(PreoperativeDiagn
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PROBLEM_OBSERVATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation> result = (Collection<ProblemObservation>) query.evaluate(preoperativeDiagnosis);
-		return new BasicEList.UnmodifiableEList<ProblemObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // PreoperativeDiagnosisOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreoperativeDiagnosisSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreoperativeDiagnosisSection2Operations.java
index 6195348215..2af557f233 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreoperativeDiagnosisSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreoperativeDiagnosisSection2Operations.java
@@ -78,7 +78,7 @@ protected PreoperativeDiagnosisSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -195,7 +195,7 @@ public static PreoperativeDiagnosis2 getConsolPreoperativeDiagnosis2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -247,7 +247,7 @@ public static boolean validatePreoperativeDiagnosisSectionCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.PreoperativeDiagnosisSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PreoperativeDiagnosisSectionCodeP", passToken);
 				}
 				passToken.add(preoperativeDiagnosisSection2);
@@ -279,7 +279,7 @@ public static boolean validatePreoperativeDiagnosisSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -357,7 +357,7 @@ public static boolean validatePreoperativeDiagnosisSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION_PREOPERATIVE_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION_PREOPERATIVE_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreoperativeDiagnosisSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreoperativeDiagnosisSectionOperations.java
index a7ea11041f..31cc36adcc 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreoperativeDiagnosisSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PreoperativeDiagnosisSectionOperations.java
@@ -84,7 +84,7 @@ protected PreoperativeDiagnosisSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -155,7 +155,7 @@ public static boolean validatePreoperativeDiagnosisSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -223,7 +223,7 @@ public static boolean validatePreoperativeDiagnosisSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -339,7 +339,7 @@ public static boolean validatePreoperativeDiagnosisSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePreoperativeDiagnosisSectionText(PreoperativeDiagnosisSection, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Preoperative Diagnosis Section Text</em>}' operation.
@@ -360,7 +360,7 @@ public static boolean validatePreoperativeDiagnosisSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -429,7 +429,7 @@ public static boolean validatePreoperativeDiagnosisSectionTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION_PREOPERATIVE_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PREOPERATIVE_DIAGNOSIS_SECTION_PREOPERATIVE_DIAGNOSIS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PressureUlcerObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PressureUlcerObservationOperations.java
index e11983acec..9bcb7d84bd 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PressureUlcerObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PressureUlcerObservationOperations.java
@@ -123,7 +123,7 @@ protected PressureUlcerObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_HAS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_HAS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -192,7 +192,7 @@ public static boolean validatePressureUlcerObservationHasTextReference(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -261,7 +261,7 @@ public static boolean validatePressureUlcerObservationTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_HAS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_HAS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -331,7 +331,7 @@ public static boolean validatePressureUlcerObservationHasTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_VALUE_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_VALUE_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -400,7 +400,7 @@ public static boolean validatePressureUlcerObservationValueNullFlavor(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TARGET_SITE_QUALIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TARGET_SITE_QUALIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -470,7 +470,7 @@ public static boolean validatePressureUlcerObservationTargetSiteQualifier(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TARGET_SITE_QUALIFIER_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TARGET_SITE_QUALIFIER_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -540,7 +540,7 @@ public static boolean validatePressureUlcerObservationTargetSiteQualifierName(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TARGET_SITE_QUALIFIER_NAME_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TARGET_SITE_QUALIFIER_NAME_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -610,7 +610,7 @@ public static boolean validatePressureUlcerObservationTargetSiteQualifierNameCod
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TARGET_SITE_QUALIFIER_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TARGET_SITE_QUALIFIER_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -680,7 +680,7 @@ public static boolean validatePressureUlcerObservationTargetSiteQualifierValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TARGET_SITE_QUALIFIER_VALUE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TARGET_SITE_QUALIFIER_VALUE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -750,7 +750,7 @@ public static boolean validatePressureUlcerObservationTargetSiteQualifierValueCo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -817,7 +817,7 @@ public static boolean validatePressureUlcerObservationTemplateId(PressureUlcerOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -884,7 +884,7 @@ public static boolean validatePressureUlcerObservationClassCode(PressureUlcerObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -951,7 +951,7 @@ public static boolean validatePressureUlcerObservationMoodCode(PressureUlcerObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_NEGATION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_NEGATION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1018,7 +1018,7 @@ public static boolean validatePressureUlcerObservationNegationInd(PressureUlcerO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1084,7 +1084,7 @@ public static boolean validatePressureUlcerObservationId(PressureUlcerObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1133,7 +1133,7 @@ public static boolean validatePressureUlcerObservationCodeP(PressureUlcerObserva
 					"org.openhealthtools.mdht.uml.cda.consol.PressureUlcerObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PressureUlcerObservationCodeP", passToken);
 				}
 				passToken.add(pressureUlcerObservation);
@@ -1165,7 +1165,7 @@ public static boolean validatePressureUlcerObservationCodeP(PressureUlcerObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1239,7 +1239,7 @@ public static boolean validatePressureUlcerObservationCode(PressureUlcerObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1306,7 +1306,7 @@ public static boolean validatePressureUlcerObservationText(PressureUlcerObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1373,7 +1373,7 @@ public static boolean validatePressureUlcerObservationStatusCode(PressureUlcerOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1444,7 +1444,7 @@ public static boolean validatePressureUlcerObservationEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1510,7 +1510,7 @@ public static boolean validatePressureUlcerObservationValue(PressureUlcerObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1633,7 +1633,7 @@ public static boolean validatePressureUlcerObservationTargetSiteCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TARGET_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TARGET_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validatePressureUlcerObservationTargetSiteCode(PressureUlcerObservation, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Pressure Ulcer Observation Target Site Code</em>}' operation.
@@ -1656,7 +1656,7 @@ public static boolean validatePressureUlcerObservationTargetSiteCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1708,7 +1708,7 @@ public static boolean validatePressureUlcerObservationTargetSiteCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.PressureUlcerObservationTargetSiteCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.PressureUlcerObservationTargetSiteCodeP", passToken);
 				}
@@ -1739,7 +1739,7 @@ public static boolean validatePressureUlcerObservationTargetSiteCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1809,7 +1809,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1879,7 +1879,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP3__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP3__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1949,7 +1949,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship3(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP1_OBSERVATION1_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP1_OBSERVATION1_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2025,7 +2025,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship1Observat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP1_OBSERVATION1_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP1_OBSERVATION1_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2100,7 +2100,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship1Observat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP1_OBSERVATION1_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP1_OBSERVATION1_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2156,7 +2156,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship1Observat
 						"org.openhealthtools.mdht.uml.cda.consol.PressureUlcerObservationEntryRelationship1Observation1CodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.PressureUlcerObservationEntryRelationship1Observation1CodeP",
 							passToken);
@@ -2191,7 +2191,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship1Observat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP1_OBSERVATION1_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP1_OBSERVATION1_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2276,7 +2276,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship1Observat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP1_OBSERVATION1_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP1_OBSERVATION1_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2351,7 +2351,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship1Observat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP1_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP1_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2426,7 +2426,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship1TypeCode
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP1_OBSERVATION1__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP1_OBSERVATION1__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2501,7 +2501,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship1Observat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP2_OBSERVATION2_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP2_OBSERVATION2_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2577,7 +2577,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship2Observat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP2_OBSERVATION2_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP2_OBSERVATION2_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2652,7 +2652,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship2Observat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP2_OBSERVATION2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP2_OBSERVATION2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2708,7 +2708,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship2Observat
 						"org.openhealthtools.mdht.uml.cda.consol.PressureUlcerObservationEntryRelationship2Observation2CodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.PressureUlcerObservationEntryRelationship2Observation2CodeP",
 							passToken);
@@ -2743,7 +2743,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship2Observat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP2_OBSERVATION2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP2_OBSERVATION2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2828,7 +2828,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship2Observat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP2_OBSERVATION2_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP2_OBSERVATION2_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2903,7 +2903,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship2Observat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP2_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP2_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2978,7 +2978,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship2TypeCode
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP2_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP2_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3053,7 +3053,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship2Observat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP3_OBSERVATION3_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP3_OBSERVATION3_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3129,7 +3129,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship3Observat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP3_OBSERVATION3_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP3_OBSERVATION3_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3204,7 +3204,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship3Observat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP3_OBSERVATION3_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP3_OBSERVATION3_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3260,7 +3260,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship3Observat
 						"org.openhealthtools.mdht.uml.cda.consol.PressureUlcerObservationEntryRelationship3Observation3CodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.PressureUlcerObservationEntryRelationship3Observation3CodeP",
 							passToken);
@@ -3295,7 +3295,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship3Observat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP3_OBSERVATION3_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP3_OBSERVATION3_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3380,7 +3380,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship3Observat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP3_OBSERVATION3_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP3_OBSERVATION3_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3455,7 +3455,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship3Observat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP3_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP3_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3530,7 +3530,7 @@ public static boolean validatePressureUlcerObservationEntryRelationship3TypeCode
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP3_OBSERVATION3__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRESSURE_ULCER_OBSERVATION_ENTRY_RELATIONSHIP3_OBSERVATION3__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PriorityPreferenceOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PriorityPreferenceOperations.java
index 763536d0e4..f740034ce6 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PriorityPreferenceOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PriorityPreferenceOperations.java
@@ -77,7 +77,7 @@ protected PriorityPreferenceOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -142,7 +142,7 @@ public static boolean validatePriorityPreferenceTemplateId(PriorityPreference pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -207,7 +207,7 @@ public static boolean validatePriorityPreferenceClassCode(PriorityPreference pri
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -272,7 +272,7 @@ public static boolean validatePriorityPreferenceMoodCode(PriorityPreference prio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -337,7 +337,7 @@ public static boolean validatePriorityPreferenceId(PriorityPreference priorityPr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -385,7 +385,7 @@ public static boolean validatePriorityPreferenceCodeP(PriorityPreference priorit
 					"org.openhealthtools.mdht.uml.cda.consol.PriorityPreferenceCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PriorityPreferenceCodeP", passToken);
 				}
 				passToken.add(priorityPreference);
@@ -417,7 +417,7 @@ public static boolean validatePriorityPreferenceCodeP(PriorityPreference priorit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -490,7 +490,7 @@ public static boolean validatePriorityPreferenceCode(PriorityPreference priority
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -559,7 +559,7 @@ public static boolean validatePriorityPreferenceEffectiveTime(PriorityPreference
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -624,7 +624,7 @@ public static boolean validatePriorityPreferenceValue(PriorityPreference priorit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -689,7 +689,7 @@ public static boolean validatePriorityPreferenceValueP(PriorityPreference priori
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRIORITY_PREFERENCE_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemConcernAct2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemConcernAct2Operations.java
index bc9818512b..570f40a106 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemConcernAct2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemConcernAct2Operations.java
@@ -89,7 +89,7 @@ protected ProblemConcernAct2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -183,7 +183,7 @@ public static boolean validateProblemConcernActStatusCodeP(ProblemConcernAct2 pr
 					"org.openhealthtools.mdht.uml.cda.consol.ProblemConcernActStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ProblemConcernActStatusCodeP", passToken);
 				}
 				passToken.add(problemConcernAct2);
@@ -310,7 +310,7 @@ public static EList<PriorityPreference> getPriorityPreferences(ProblemConcernAct
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PRIORITY_PREFERENCES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PriorityPreference> result = (Collection<PriorityPreference>) query.evaluate(problemConcernAct2);
-		return new BasicEList.UnmodifiableEList<PriorityPreference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -338,7 +338,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(ProblemCo
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_PROBLEM_OBSERVATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation2> result = (Collection<ProblemObservation2>) query.evaluate(problemConcernAct2);
-		return new BasicEList.UnmodifiableEList<ProblemObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -452,7 +452,7 @@ public static boolean validateProblemConcernActEffectiveTimeHigh(ProblemConcernA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemConcernAct2AuthorParticipation(ProblemConcernAct2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Concern Act2 Author Participation</em>}' operation.
@@ -473,7 +473,7 @@ public static boolean validateProblemConcernActEffectiveTimeHigh(ProblemConcernA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemConcernAct2PriorityPreference(ProblemConcernAct2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Concern Act2 Priority Preference</em>}' operation.
@@ -494,7 +494,7 @@ public static boolean validateProblemConcernActEffectiveTimeHigh(ProblemConcernA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT2_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT2_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #getPriorityPreferences(ProblemConcernAct2) <em>Get Priority Preferences</em>}' operation.
@@ -555,7 +555,7 @@ public static boolean validateProblemConcernActEffectiveTimeHigh(ProblemConcernA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemConcernActEffectiveTimeHigh(ProblemConcernAct2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Concern Act Effective Time High</em>}' operation.
@@ -576,7 +576,7 @@ public static boolean validateProblemConcernActEffectiveTimeHigh(ProblemConcernA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_EFFECTIVE_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_EFFECTIVE_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemConcernActStatusCode(ProblemConcernAct2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Concern Act Status Code</em>}' operation.
@@ -599,7 +599,7 @@ public static boolean validateProblemConcernActEffectiveTimeHigh(ProblemConcernA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -672,7 +672,7 @@ public static boolean validateProblemConcernActStatusCode(ProblemConcernAct2 pro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -739,7 +739,7 @@ public static boolean validateProblemConcernActEffectiveTime(ProblemConcernAct2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -787,7 +787,7 @@ public static boolean validateProblemConcernActCodeP(ProblemConcernAct2 problemC
 					"org.openhealthtools.mdht.uml.cda.consol.ProblemConcernActCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ProblemConcernActCodeP", passToken);
 				}
 				passToken.add(problemConcernAct2);
@@ -819,7 +819,7 @@ public static boolean validateProblemConcernActCodeP(ProblemConcernAct2 problemC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -892,7 +892,7 @@ public static boolean validateProblemConcernActCode(ProblemConcernAct2 problemCo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemConcernActOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemConcernActOperations.java
index 194ab6ab72..896c697b6e 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemConcernActOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemConcernActOperations.java
@@ -92,7 +92,7 @@ protected ProblemConcernActOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -159,7 +159,7 @@ public static boolean validateProblemConcernActEffectiveTimeLow(ProblemConcernAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_EFFECTIVE_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_EFFECTIVE_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -226,7 +226,7 @@ public static boolean validateProblemConcernActEffectiveTimeHigh(ProblemConcernA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -291,7 +291,7 @@ public static boolean validateProblemConcernActTemplateId(ProblemConcernAct prob
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -356,7 +356,7 @@ public static boolean validateProblemConcernActClassCode(ProblemConcernAct probl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -421,7 +421,7 @@ public static boolean validateProblemConcernActMoodCode(ProblemConcernAct proble
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -486,7 +486,7 @@ public static boolean validateProblemConcernActId(ProblemConcernAct problemConce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -534,7 +534,7 @@ public static boolean validateProblemConcernActCodeP(ProblemConcernAct problemCo
 					"org.openhealthtools.mdht.uml.cda.consol.ProblemConcernActCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ProblemConcernActCodeP", passToken);
 				}
 				passToken.add(problemConcernAct);
@@ -566,7 +566,7 @@ public static boolean validateProblemConcernActCodeP(ProblemConcernAct problemCo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -641,7 +641,7 @@ public static boolean validateProblemConcernActCode(ProblemConcernAct problemCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -706,7 +706,7 @@ public static boolean validateProblemConcernActStatusCode(ProblemConcernAct prob
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -773,7 +773,7 @@ public static boolean validateProblemConcernActEffectiveTime(ProblemConcernAct p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_CONCERN_ACT_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -865,7 +865,7 @@ public static EList<ProblemObservation> getProblemObservations(ProblemConcernAct
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PROBLEM_OBSERVATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation> result = (Collection<ProblemObservation>) query.evaluate(problemConcernAct);
-		return new BasicEList.UnmodifiableEList<ProblemObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // ProblemConcernActOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemObservation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemObservation2Operations.java
index ba21a6525a..040dde1c00 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemObservation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemObservation2Operations.java
@@ -118,7 +118,7 @@ protected ProblemObservation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_NULL_FLAVOR_UNKNOWN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_NULL_FLAVOR_UNKNOWN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -185,7 +185,7 @@ public static boolean validateProblemObservationValueNullFlavorUnknown(ProblemOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION2_IF_SNOMED_REQUIRE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION2_IF_SNOMED_REQUIRE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -253,7 +253,7 @@ public static boolean validateProblemObservation2IfSnomedRequireTranslation(Prob
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION2_IF_SNOMED_REQUIRE_TRANSLATION_FROM_LOINC__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION2_IF_SNOMED_REQUIRE_TRANSLATION_FROM_LOINC__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -322,7 +322,7 @@ public static boolean validateProblemObservation2IfSnomedRequireTranslationFromL
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -416,7 +416,7 @@ public static boolean validateProblemObservationStatusCodeP(ProblemObservation2
 					"org.openhealthtools.mdht.uml.cda.consol.ProblemObservationStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ProblemObservationStatusCodeP", passToken);
 				}
 				passToken.add(problemObservation2);
@@ -818,7 +818,7 @@ public static EList<PriorityPreference> getPriorityPreferences(ProblemObservatio
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PRIORITY_PREFERENCES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PriorityPreference> result = (Collection<PriorityPreference>) query.evaluate(problemObservation2);
-		return new BasicEList.UnmodifiableEList<PriorityPreference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1285,7 +1285,7 @@ public static boolean validateProblemObservationValueP(ProblemObservation2 probl
 					"org.openhealthtools.mdht.uml.cda.consol.ProblemObservationValueP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ProblemObservationValueP", passToken);
 				}
 				passToken.add(problemObservation2);
@@ -1394,7 +1394,7 @@ public static boolean validateProblemObservationCodeP(ProblemObservation2 proble
 					"org.openhealthtools.mdht.uml.cda.consol.ProblemObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ProblemObservationCodeP", passToken);
 				}
 				passToken.add(problemObservation2);
@@ -1476,7 +1476,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservation2PrognosisObservation(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation2 Prognosis Observation</em>}' operation.
@@ -1497,7 +1497,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION2_PROGNOSIS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION2_PROGNOSIS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservation2PriorityPreference(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation2 Priority Preference</em>}' operation.
@@ -1518,7 +1518,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION2_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION2_PRIORITY_PREFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservation2AuthorParticipation(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation2 Author Participation</em>}' operation.
@@ -1539,7 +1539,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservation2CDQualifier(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation2 CD Qualifier</em>}' operation.
@@ -1561,7 +1561,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROBLEM_OBSERVATION2_CD_QUALIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROBLEM_OBSERVATION2_CD_QUALIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservation2CDCode(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation2 CD Code</em>}' operation.
@@ -1582,7 +1582,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROBLEM_OBSERVATION2_CD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROBLEM_OBSERVATION2_CD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservation2CDCodeTranslation(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation2 CD Code Translation</em>}' operation.
@@ -1605,7 +1605,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROBLEM_OBSERVATION2_CD_CODE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROBLEM_OBSERVATION2_CD_CODE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservation2CDCodeTranslationP(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation2 CD Code Translation P</em>}' operation.
@@ -1626,7 +1626,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROBLEM_OBSERVATION2_CD_CODE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROBLEM_OBSERVATION2_CD_CODE_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #getPrognosisObservation(ProblemObservation2) <em>Get Prognosis Observation</em>}' operation.
@@ -1727,7 +1727,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservationTextReferenceValue(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation Text Reference Value</em>}' operation.
@@ -1748,7 +1748,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservationHasTextReferenceValue(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation Has Text Reference Value</em>}' operation.
@@ -1769,7 +1769,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservationHasOnsetDate(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation Has Onset Date</em>}' operation.
@@ -1790,7 +1790,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_ONSET_DATE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_ONSET_DATE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservationHasResolutionDate(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation Has Resolution Date</em>}' operation.
@@ -1811,7 +1811,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_RESOLUTION_DATE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_RESOLUTION_DATE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservationValueNullFlavor(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation Value Null Flavor</em>}' operation.
@@ -1832,7 +1832,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservationNegationInd(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation Negation Ind</em>}' operation.
@@ -1853,7 +1853,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_NEGATION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_NEGATION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservationEffectiveTime(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation Effective Time</em>}' operation.
@@ -1874,7 +1874,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservationValueP(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation Value P</em>}' operation.
@@ -1895,7 +1895,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservationValue(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation Value</em>}' operation.
@@ -1918,7 +1918,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservationCodeP(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation Code P</em>}' operation.
@@ -1939,7 +1939,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservationCode(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation Code</em>}' operation.
@@ -1962,7 +1962,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProblemObservationText(ProblemObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Problem Observation Text</em>}' operation.
@@ -1983,7 +1983,7 @@ public static boolean validateProblemObservationCode(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2049,7 +2049,7 @@ public static boolean validateProblemObservationText(ProblemObservation2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2123,7 +2123,7 @@ public static boolean validateProblemObservationStatusCode(ProblemObservation2 p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HEALTH_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HEALTH_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2190,7 +2190,7 @@ public static boolean validateProblemObservationHealthStatusObservation(ProblemO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_PROBLEM_STATUS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_PROBLEM_STATUS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemObservationOperations.java
index 828a469048..b3ed8216b8 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemObservationOperations.java
@@ -107,7 +107,7 @@ protected ProblemObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -174,7 +174,7 @@ public static boolean validateProblemObservationHasTextReference(ProblemObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -241,7 +241,7 @@ public static boolean validateProblemObservationTextReferenceValue(ProblemObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -308,7 +308,7 @@ public static boolean validateProblemObservationHasTextReferenceValue(ProblemObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_ONSET_DATE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_ONSET_DATE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -375,7 +375,7 @@ public static boolean validateProblemObservationHasOnsetDate(ProblemObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_RESOLUTION_DATE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HAS_RESOLUTION_DATE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -442,7 +442,7 @@ public static boolean validateProblemObservationHasResolutionDate(ProblemObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -509,7 +509,7 @@ public static boolean validateProblemObservationValueNullFlavor(ProblemObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_AGE_OBSERVATION_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_AGE_OBSERVATION_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -576,7 +576,7 @@ public static boolean validateProblemObservationAgeObservationInversion(ProblemO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -643,7 +643,7 @@ public static boolean validateProblemObservationValueTranslation(ProblemObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_TRANSLATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_TRANSLATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -710,7 +710,7 @@ public static boolean validateProblemObservationValueTranslationCode(ProblemObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -775,7 +775,7 @@ public static boolean validateProblemObservationTemplateId(ProblemObservation pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -840,7 +840,7 @@ public static boolean validateProblemObservationClassCode(ProblemObservation pro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -905,7 +905,7 @@ public static boolean validateProblemObservationMoodCode(ProblemObservation prob
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_NEGATION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_NEGATION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -971,7 +971,7 @@ public static boolean validateProblemObservationNegationInd(ProblemObservation p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1036,7 +1036,7 @@ public static boolean validateProblemObservationId(ProblemObservation problemObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1084,7 +1084,7 @@ public static boolean validateProblemObservationCodeP(ProblemObservation problem
 					"org.openhealthtools.mdht.uml.cda.consol.ProblemObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ProblemObservationCodeP", passToken);
 				}
 				passToken.add(problemObservation);
@@ -1116,7 +1116,7 @@ public static boolean validateProblemObservationCodeP(ProblemObservation problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1189,7 +1189,7 @@ public static boolean validateProblemObservationCode(ProblemObservation problemO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1255,7 +1255,7 @@ public static boolean validateProblemObservationText(ProblemObservation problemO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1320,7 +1320,7 @@ public static boolean validateProblemObservationStatusCode(ProblemObservation pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1389,7 +1389,7 @@ public static boolean validateProblemObservationEffectiveTime(ProblemObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1454,7 +1454,7 @@ public static boolean validateProblemObservationValue(ProblemObservation problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1519,7 +1519,7 @@ public static boolean validateProblemObservationValueP(ProblemObservation proble
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_AGE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_AGE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1586,7 +1586,7 @@ public static boolean validateProblemObservationAgeObservation(ProblemObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HEALTH_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_HEALTH_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1653,7 +1653,7 @@ public static boolean validateProblemObservationHealthStatusObservation(ProblemO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_PROBLEM_STATUS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_OBSERVATION_PROBLEM_STATUS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemSection2Operations.java
index 8147658220..618db456a7 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemSection2Operations.java
@@ -86,7 +86,7 @@ protected ProblemSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateProblemSection2NullFlavor(ProblemSection2 problemS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -216,7 +216,7 @@ public static boolean validateProblemSection2Title(ProblemSection2 problemSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -327,7 +327,7 @@ public static HealthStatusObservation2 getConsolHealthStatusObservation2(Problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -394,7 +394,7 @@ public static boolean validateProblemSectionEntriesOptionalTemplateId(ProblemSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -444,7 +444,7 @@ public static boolean validateProblemSectionEntriesOptionalCodeP(ProblemSection2
 					"org.openhealthtools.mdht.uml.cda.consol.ProblemSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ProblemSectionEntriesOptionalCodeP", passToken);
 				}
@@ -477,7 +477,7 @@ public static boolean validateProblemSectionEntriesOptionalCodeP(ProblemSection2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -552,7 +552,7 @@ public static boolean validateProblemSectionEntriesOptionalCode(ProblemSection2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_PROBLEM_CONCERN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_PROBLEM_CONCERN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -619,7 +619,7 @@ public static boolean validateProblemSectionEntriesOptionalProblemConcern(Proble
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL2_HEALTH_STATUS_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL2_HEALTH_STATUS_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -714,7 +714,7 @@ public static EList<ProblemConcernAct2> getConsolProblemConcernAct2s(ProblemSect
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_PROBLEM_CONCERN_ACT2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ProblemConcernAct2> result = (Collection<ProblemConcernAct2>) query.evaluate(problemSection2);
-		return new BasicEList.UnmodifiableEList<ProblemConcernAct2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // ProblemSection2Operations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemSectionEntriesOptional2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemSectionEntriesOptional2Operations.java
index 63d7180077..ca5e7ca43b 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemSectionEntriesOptional2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemSectionEntriesOptional2Operations.java
@@ -83,7 +83,7 @@ protected ProblemSectionEntriesOptional2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL2_HEALTH_STATUS_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL2_HEALTH_STATUS_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -181,7 +181,7 @@ public static EList<ProblemConcernAct2> getConsolProblemConcernAct2s(
 		@SuppressWarnings("unchecked")
 		Collection<ProblemConcernAct2> result = (Collection<ProblemConcernAct2>) query.evaluate(
 			problemSectionEntriesOptional2);
-		return new BasicEList.UnmodifiableEList<ProblemConcernAct2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -249,7 +249,7 @@ public static HealthStatusObservation2 getHealthStatusObservation2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -319,7 +319,7 @@ public static boolean validateProblemSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -371,7 +371,7 @@ public static boolean validateProblemSectionEntriesOptionalCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ProblemSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ProblemSectionEntriesOptionalCodeP", passToken);
 				}
@@ -404,7 +404,7 @@ public static boolean validateProblemSectionEntriesOptionalCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -482,7 +482,7 @@ public static boolean validateProblemSectionEntriesOptionalCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_PROBLEM_CONCERN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_PROBLEM_CONCERN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemSectionEntriesOptionalOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemSectionEntriesOptionalOperations.java
index 2d700344d0..92ca56931a 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemSectionEntriesOptionalOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemSectionEntriesOptionalOperations.java
@@ -87,7 +87,7 @@ protected ProblemSectionEntriesOptionalOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -159,7 +159,7 @@ public static boolean validateProblemSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -228,7 +228,7 @@ public static boolean validateProblemSectionEntriesOptionalCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -297,7 +297,7 @@ public static boolean validateProblemSectionEntriesOptionalCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -366,7 +366,7 @@ public static boolean validateProblemSectionEntriesOptionalTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -435,7 +435,7 @@ public static boolean validateProblemSectionEntriesOptionalText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_PROBLEM_CONCERN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_PROBLEM_CONCERN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -532,7 +532,7 @@ public static EList<ProblemConcernAct> getProblemConcerns(
 		@SuppressWarnings("unchecked")
 		Collection<ProblemConcernAct> result = (Collection<ProblemConcernAct>) query.evaluate(
 			problemSectionEntriesOptional);
-		return new BasicEList.UnmodifiableEList<ProblemConcernAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // ProblemSectionEntriesOptionalOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemSectionOperations.java
index 7da33736fa..6a9aae1c18 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemSectionOperations.java
@@ -111,7 +111,7 @@ public static EList<ProblemConcernAct> getConsolProblemConcerns(ProblemSection p
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_PROBLEM_CONCERNS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ProblemConcernAct> result = (Collection<ProblemConcernAct>) query.evaluate(problemSection);
-		return new BasicEList.UnmodifiableEList<ProblemConcernAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -133,7 +133,7 @@ public static EList<ProblemConcernAct> getConsolProblemConcerns(ProblemSection p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -200,7 +200,7 @@ public static boolean validateProblemSectionEntriesOptionalTemplateId(ProblemSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -250,7 +250,7 @@ public static boolean validateProblemSectionEntriesOptionalCodeP(ProblemSection
 					"org.openhealthtools.mdht.uml.cda.consol.ProblemSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ProblemSectionEntriesOptionalCodeP", passToken);
 				}
@@ -283,7 +283,7 @@ public static boolean validateProblemSectionEntriesOptionalCodeP(ProblemSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -358,7 +358,7 @@ public static boolean validateProblemSectionEntriesOptionalCode(ProblemSection p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -425,7 +425,7 @@ public static boolean validateProblemSectionEntriesOptionalText(ProblemSection p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -492,7 +492,7 @@ public static boolean validateProblemSectionEntriesOptionalTitle(ProblemSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_PROBLEM_CONCERN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_SECTION_ENTRIES_OPTIONAL_PROBLEM_CONCERN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemStatus2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemStatus2Operations.java
index 436b453b44..de435bc663 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemStatus2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemStatus2Operations.java
@@ -72,7 +72,7 @@ protected ProblemStatus2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -137,7 +137,7 @@ public static boolean validateProblemStatus2TemplateId(ProblemStatus2 problemSta
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -202,7 +202,7 @@ public static boolean validateProblemStatusTextReference(ProblemStatus2 problemS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -267,7 +267,7 @@ public static boolean validateProblemStatusReferenceValue(ProblemStatus2 problem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -333,7 +333,7 @@ public static boolean validateProblemStatusTextReferenceValue(ProblemStatus2 pro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -400,7 +400,7 @@ public static boolean validateProblemStatusText(ProblemStatus2 problemStatus2, D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemStatusOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemStatusOperations.java
index ac59f4b121..57ba6143f1 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemStatusOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProblemStatusOperations.java
@@ -84,7 +84,7 @@ protected ProblemStatusOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -149,7 +149,7 @@ public static boolean validateProblemStatusTextReference(ProblemStatus problemSt
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -214,7 +214,7 @@ public static boolean validateProblemStatusReferenceValue(ProblemStatus problemS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -280,7 +280,7 @@ public static boolean validateProblemStatusTextReferenceValue(ProblemStatus prob
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -345,7 +345,7 @@ public static boolean validateProblemStatusTemplateId(ProblemStatus problemStatu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -410,7 +410,7 @@ public static boolean validateProblemStatusClassCode(ProblemStatus problemStatus
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -477,7 +477,7 @@ public static boolean validateProblemStatusMoodCode(ProblemStatus problemStatus,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -542,7 +542,7 @@ public static boolean validateProblemStatusCode(ProblemStatus problemStatus, Dia
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -608,7 +608,7 @@ public static boolean validateProblemStatusText(ProblemStatus problemStatus, Dia
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -675,7 +675,7 @@ public static boolean validateProblemStatusStatusCode(ProblemStatus problemStatu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROBLEM_STATUS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityAct2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityAct2Operations.java
index 7dc448619b..b00bf04f2a 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityAct2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityAct2Operations.java
@@ -99,7 +99,7 @@ protected ProcedureActivityAct2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT2_CODE_SUGGESTED_CODE_SYSTEMS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT2_CODE_SUGGESTED_CODE_SYSTEMS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -167,7 +167,7 @@ public static boolean validateProcedureActivityAct2CodeSuggestedCodeSystems(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -263,7 +263,7 @@ public static boolean validateProcedureActivityActStatusCodeP(ProcedureActivityA
 					"org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityActStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityActStatusCodeP", passToken);
 				}
 				passToken.add(procedureActivityAct2);
@@ -370,7 +370,7 @@ public static EList<Indication2> getConsolIndication2s(ProcedureActivityAct2 pro
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_INDICATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication2> result = (Collection<Indication2>) query.evaluate(procedureActivityAct2);
-		return new BasicEList.UnmodifiableEList<Indication2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -400,7 +400,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity2> result = (Collection<MedicationActivity2>) query.evaluate(
 			procedureActivityAct2);
-		return new BasicEList.UnmodifiableEList<MedicationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -514,7 +514,7 @@ public static boolean validateProcedureActivityActMoodCode(ProcedureActivityAct2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityAct2AuthorParticipation(ProcedureActivityAct2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Act2 Author Participation</em>}' operation.
@@ -535,7 +535,7 @@ public static boolean validateProcedureActivityActMoodCode(ProcedureActivityAct2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #getConsolInstruction2(ProcedureActivityAct2) <em>Get Consol Instruction2</em>}' operation.
@@ -616,7 +616,7 @@ public static boolean validateProcedureActivityActMoodCode(ProcedureActivityAct2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_INSTRUCTIONS_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_INSTRUCTIONS_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityActMoodCode(ProcedureActivityAct2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Act Mood Code</em>}' operation.
@@ -637,7 +637,7 @@ public static boolean validateProcedureActivityActMoodCode(ProcedureActivityAct2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityActStatusCode(ProcedureActivityAct2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Act Status Code</em>}' operation.
@@ -660,7 +660,7 @@ public static boolean validateProcedureActivityActMoodCode(ProcedureActivityAct2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -735,7 +735,7 @@ public static boolean validateProcedureActivityActStatusCode(ProcedureActivityAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -802,7 +802,7 @@ public static boolean validateProcedureActivityActEffectiveTime(ProcedureActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -869,7 +869,7 @@ public static boolean validateProcedureActivityActInstructions(ProcedureActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -935,7 +935,7 @@ public static boolean validateProcedureActivityActIndication(ProcedureActivityAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1002,7 +1002,7 @@ public static boolean validateProcedureActivityActMedicationActivity(ProcedureAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1068,7 +1068,7 @@ public static boolean validateProcedureActivityActPerformer(ProcedureActivityAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_PROCEDURE_ACT_REPRESENTED_ORGANIZATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_PROCEDURE_ACT_REPRESENTED_ORGANIZATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1144,7 +1144,7 @@ public static boolean validateProcedureActivityActProcedureActPerformerProcedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_PROCEDURE_ACT_REPRESENTED_ORGANIZATION_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_PROCEDURE_ACT_REPRESENTED_ORGANIZATION_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1220,7 +1220,7 @@ public static boolean validateProcedureActivityActProcedureActPerformerProcedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1295,7 +1295,7 @@ public static boolean validateProcedureActivityActProcedureActPerformerProcedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1371,7 +1371,7 @@ public static boolean validateProcedureActivityActProcedureActPerformerProcedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityActOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityActOperations.java
index acc635f58e..07a81ae2dd 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityActOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityActOperations.java
@@ -173,7 +173,7 @@ public static boolean validateProcedureActivityActCodeCodeSystems(ProcedureActiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_CODE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_CODE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -240,7 +240,7 @@ public static boolean validateProcedureActivityActCodeOriginalText(ProcedureActi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -308,7 +308,7 @@ public static boolean validateProcedureActivityActOriginalTextReference(Procedur
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -376,7 +376,7 @@ public static boolean validateProcedureActivityActOriginalTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityActCodeCodeSystems(ProcedureActivityAct, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Act Code Code Systems</em>}' operation.
@@ -397,7 +397,7 @@ public static boolean validateProcedureActivityActOriginalTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_CODE_CODE_SYSTEMS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_CODE_CODE_SYSTEMS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -510,7 +510,7 @@ public static boolean validateProcedureActivityActEncounterInversion(ProcedureAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_SERVICE_DELIVERY_LOCATION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_SERVICE_DELIVERY_LOCATION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityActEncounterInversion(ProcedureActivityAct, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Act Encounter Inversion</em>}' operation.
@@ -531,7 +531,7 @@ public static boolean validateProcedureActivityActEncounterInversion(ProcedureAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_ENCOUNTER_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_ENCOUNTER_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -600,7 +600,7 @@ public static boolean validateProcedureActivityActServiceDeliveryLocationTypeCod
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_INSTRUCTIONS_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_INSTRUCTIONS_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -668,7 +668,7 @@ public static boolean validateProcedureActivityActInstructionsInversion(Procedur
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -735,7 +735,7 @@ public static boolean validateProcedureActivityActTemplateId(ProcedureActivityAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -803,7 +803,7 @@ public static boolean validateProcedureActivityActClassCode(ProcedureActivityAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -869,7 +869,7 @@ public static boolean validateProcedureActivityActMoodCode(ProcedureActivityAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -934,7 +934,7 @@ public static boolean validateProcedureActivityActId(ProcedureActivityAct proced
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1001,7 +1001,7 @@ public static boolean validateProcedureActivityActCode(ProcedureActivityAct proc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1068,7 +1068,7 @@ public static boolean validateProcedureActivityActStatusCode(ProcedureActivityAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1135,7 +1135,7 @@ public static boolean validateProcedureActivityActEffectiveTime(ProcedureActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_PRIORITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_PRIORITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1185,7 +1185,7 @@ public static boolean validateProcedureActivityActPriorityCodeP(ProcedureActivit
 					"org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityActPriorityCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityActPriorityCodeP", passToken);
 				}
 				passToken.add(procedureActivityAct);
@@ -1217,7 +1217,7 @@ public static boolean validateProcedureActivityActPriorityCodeP(ProcedureActivit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_PRIORITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_PRIORITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1292,7 +1292,7 @@ public static boolean validateProcedureActivityActPriorityCode(ProcedureActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1358,7 +1358,7 @@ public static boolean validateProcedureActivityActPerformer(ProcedureActivityAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_SERVICE_DELIVERY_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_SERVICE_DELIVERY_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1426,7 +1426,7 @@ public static boolean validateProcedureActivityActServiceDeliveryLocation(Proced
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1493,7 +1493,7 @@ public static boolean validateProcedureActivityActInstructions(ProcedureActivity
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1559,7 +1559,7 @@ public static boolean validateProcedureActivityActIndication(ProcedureActivityAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1626,7 +1626,7 @@ public static boolean validateProcedureActivityActMedicationActivity(ProcedureAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_ACT_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1693,7 +1693,7 @@ public static boolean validateProcedureActivityActEntryRelationship(ProcedureAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_PROCEDURE_ACT_REPRESENTED_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_PROCEDURE_ACT_REPRESENTED_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1769,7 +1769,7 @@ public static boolean validateProcedureActivityActProcedureActPerformerProcedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_PROCEDURE_ACT_REPRESENTED_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_PROCEDURE_ACT_REPRESENTED_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1845,7 +1845,7 @@ public static boolean validateProcedureActivityActProcedureActPerformerProcedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_PROCEDURE_ACT_REPRESENTED_ORGANIZATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_PROCEDURE_ACT_REPRESENTED_ORGANIZATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1921,7 +1921,7 @@ public static boolean validateProcedureActivityActProcedureActPerformerProcedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_PROCEDURE_ACT_REPRESENTED_ORGANIZATION_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_PROCEDURE_ACT_REPRESENTED_ORGANIZATION_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1997,7 +1997,7 @@ public static boolean validateProcedureActivityActProcedureActPerformerProcedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2072,7 +2072,7 @@ public static boolean validateProcedureActivityActProcedureActPerformerProcedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2147,7 +2147,7 @@ public static boolean validateProcedureActivityActProcedureActPerformerProcedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2222,7 +2222,7 @@ public static boolean validateProcedureActivityActProcedureActPerformerProcedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_PROCEDURE_ACT_ASSIGNED_ENTITY_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2298,7 +2298,7 @@ public static boolean validateProcedureActivityActProcedureActPerformerProcedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_PROCEDURE_ACT_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2372,7 +2372,7 @@ public static boolean validateProcedureActivityActProcedureActPerformerAssignedE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_ENTRY_RELATIONSHIP_PROCEDURE_ACT_ENCOUNTER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_ENTRY_RELATIONSHIP_PROCEDURE_ACT_ENCOUNTER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2447,7 +2447,7 @@ public static boolean validateProcedureActivityActEntryRelationshipProcedureActE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_ENTRY_RELATIONSHIP_PROCEDURE_ACT_ENCOUNTER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_ENTRY_RELATIONSHIP_PROCEDURE_ACT_ENCOUNTER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2521,7 +2521,7 @@ public static boolean validateProcedureActivityActEntryRelationshipProcedureActE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_ENTRY_RELATIONSHIP_PROCEDURE_ACT_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_ENTRY_RELATIONSHIP_PROCEDURE_ACT_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2595,7 +2595,7 @@ public static boolean validateProcedureActivityActEntryRelationshipProcedureActE
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_ENTRY_RELATIONSHIP_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_ENTRY_RELATIONSHIP_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2669,7 +2669,7 @@ public static boolean validateProcedureActivityActEntryRelationshipInversionInd(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2742,7 +2742,7 @@ public static boolean validateProcedureActivityActEntryRelationshipTypeCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_ENTRY_RELATIONSHIP_PROCEDURE_ACT_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_ACT_ENTRY_RELATIONSHIP_PROCEDURE_ACT_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2843,7 +2843,7 @@ public static EList<ServiceDeliveryLocation> getServiceDeliveryLocations(
 		@SuppressWarnings("unchecked")
 		Collection<ServiceDeliveryLocation> result = (Collection<ServiceDeliveryLocation>) query.evaluate(
 			procedureActivityAct);
-		return new BasicEList.UnmodifiableEList<ServiceDeliveryLocation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2935,7 +2935,7 @@ public static EList<Indication> getIndications(ProcedureActivityAct procedureAct
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INDICATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication> result = (Collection<Indication>) query.evaluate(procedureActivityAct);
-		return new BasicEList.UnmodifiableEList<Indication>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -2982,7 +2982,7 @@ public static EList<MedicationActivity> getMedicationActivities(ProcedureActivit
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_MEDICATION_ACTIVITIES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity> result = (Collection<MedicationActivity>) query.evaluate(procedureActivityAct);
-		return new BasicEList.UnmodifiableEList<MedicationActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // ProcedureActivityActOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityObservation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityObservation2Operations.java
index 8a683d1cd2..7143e5f81b 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityObservation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityObservation2Operations.java
@@ -104,7 +104,7 @@ protected ProcedureActivityObservation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION2_CODE_SUGGESTED_CODE_SYSTEMS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION2_CODE_SUGGESTED_CODE_SYSTEMS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -174,7 +174,7 @@ public static boolean validateProcedureActivityObservation2CodeSuggestedCodeSyst
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -276,7 +276,7 @@ public static boolean validateProcedureActivityObservationStatusCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityObservationStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityObservationStatusCodeP", passToken);
 				}
@@ -465,7 +465,7 @@ public static EList<Indication2> getConsolIndication2s(
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_INDICATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication2> result = (Collection<Indication2>) query.evaluate(procedureActivityObservation2);
-		return new BasicEList.UnmodifiableEList<Indication2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -495,7 +495,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity2> result = (Collection<MedicationActivity2>) query.evaluate(
 			procedureActivityObservation2);
-		return new BasicEList.UnmodifiableEList<MedicationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -549,7 +549,7 @@ public static EList<ReactionObservation2> getReactionObservation2s(
 		@SuppressWarnings("unchecked")
 		Collection<ReactionObservation2> result = (Collection<ReactionObservation2>) query.evaluate(
 			procedureActivityObservation2);
-		return new BasicEList.UnmodifiableEList<ReactionObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -701,7 +701,7 @@ public static boolean validateProcedureActivityObservationTargetSiteCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityObservationTargetSiteCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityObservationTargetSiteCodeP",
 						passToken);
@@ -839,7 +839,7 @@ public static boolean validateProcedureActivityObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityObservation2AuthorParticipation(ProcedureActivityObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Observation2 Author Participation</em>}' operation.
@@ -860,7 +860,7 @@ public static boolean validateProcedureActivityObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityObservation2ReactionObservation2(ProcedureActivityObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Observation2 Reaction Observation2</em>}' operation.
@@ -881,7 +881,7 @@ public static boolean validateProcedureActivityObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION2_REACTION_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION2_REACTION_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityObservation2ANYNullFlavor(ProcedureActivityObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Observation2 ANY Null Flavor</em>}' operation.
@@ -902,7 +902,7 @@ public static boolean validateProcedureActivityObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION2_ANY_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION2_ANY_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #getConsolIndication2s(ProcedureActivityObservation2) <em>Get Consol Indication2s</em>}' operation.
@@ -1003,7 +1003,7 @@ public static boolean validateProcedureActivityObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_INSTRUCTIONS_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_INSTRUCTIONS_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityObservationCodeCodeSystems(ProcedureActivityObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Observation Code Code Systems</em>}' operation.
@@ -1024,7 +1024,7 @@ public static boolean validateProcedureActivityObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_CODE_CODE_SYSTEMS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_CODE_CODE_SYSTEMS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityObservationTargetSiteCodeP(ProcedureActivityObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Observation Target Site Code P</em>}' operation.
@@ -1045,7 +1045,7 @@ public static boolean validateProcedureActivityObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_TARGET_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_TARGET_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityObservationTargetSiteCode(ProcedureActivityObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Observation Target Site Code</em>}' operation.
@@ -1068,7 +1068,7 @@ public static boolean validateProcedureActivityObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityObservationMoodCode(ProcedureActivityObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Observation Mood Code</em>}' operation.
@@ -1089,7 +1089,7 @@ public static boolean validateProcedureActivityObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityObservationStatusCode(ProcedureActivityObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Observation Status Code</em>}' operation.
@@ -1112,7 +1112,7 @@ public static boolean validateProcedureActivityObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1191,7 +1191,7 @@ public static boolean validateProcedureActivityObservationStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1260,7 +1260,7 @@ public static boolean validateProcedureActivityObservationValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1329,7 +1329,7 @@ public static boolean validateProcedureActivityObservationIndication(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1399,7 +1399,7 @@ public static boolean validateProcedureActivityObservationMedicationActivity(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1469,7 +1469,7 @@ public static boolean validateProcedureActivityObservationInstructions(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1539,7 +1539,7 @@ public static boolean validateProcedureActivityObservationPerformer(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1616,7 +1616,7 @@ public static boolean validateProcedureActivityObservationProcedureObservationPe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1693,7 +1693,7 @@ public static boolean validateProcedureActivityObservationProcedureObservationPe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityObservationOperations.java
index 9d484111c6..78e3d3fa11 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityObservationOperations.java
@@ -131,7 +131,7 @@ protected ProcedureActivityObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_CODE_CODE_SYSTEMS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_CODE_CODE_SYSTEMS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -201,7 +201,7 @@ public static boolean validateProcedureActivityObservationCodeCodeSystems(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_CODE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_CODE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -271,7 +271,7 @@ public static boolean validateProcedureActivityObservationCodeOriginalText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -341,7 +341,7 @@ public static boolean validateProcedureActivityObservationOriginalTextReference(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -411,7 +411,7 @@ public static boolean validateProcedureActivityObservationOriginalTextReferenceV
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -481,7 +481,7 @@ public static boolean validateProcedureActivityObservationReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ENCOUNTER_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ENCOUNTER_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -551,7 +551,7 @@ public static boolean validateProcedureActivityObservationEncounterInversion(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_SERVICE_DELIVERY_LOCATION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_SERVICE_DELIVERY_LOCATION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -622,7 +622,7 @@ public static boolean validateProcedureActivityObservationServiceDeliveryLocatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_INSTRUCTIONS_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_INSTRUCTIONS_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -692,7 +692,7 @@ public static boolean validateProcedureActivityObservationInstructionsInversion(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -761,7 +761,7 @@ public static boolean validateProcedureActivityObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -832,7 +832,7 @@ public static boolean validateProcedureActivityObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -901,7 +901,7 @@ public static boolean validateProcedureActivityObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -968,7 +968,7 @@ public static boolean validateProcedureActivityObservationId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1038,7 +1038,7 @@ public static boolean validateProcedureActivityObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1155,7 +1155,7 @@ public static boolean validateProcedureActivityObservationValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1225,7 +1225,7 @@ public static boolean validateProcedureActivityObservationEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PRIORITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PRIORITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1278,7 +1278,7 @@ public static boolean validateProcedureActivityObservationPriorityCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityObservationPriorityCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityObservationPriorityCodeP", passToken);
 				}
@@ -1311,7 +1311,7 @@ public static boolean validateProcedureActivityObservationPriorityCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PRIORITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PRIORITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityObservationValue(ProcedureActivityObservation, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Observation Value</em>}' operation.
@@ -1332,7 +1332,7 @@ public static boolean validateProcedureActivityObservationPriorityCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1411,7 +1411,7 @@ public static boolean validateProcedureActivityObservationPriorityCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1480,7 +1480,7 @@ public static boolean validateProcedureActivityObservationMethodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_TARGET_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_TARGET_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1533,7 +1533,7 @@ public static boolean validateProcedureActivityObservationTargetSiteCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityObservationTargetSiteCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityObservationTargetSiteCodeP",
 						passToken);
@@ -1567,7 +1567,7 @@ public static boolean validateProcedureActivityObservationTargetSiteCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1646,7 +1646,7 @@ public static boolean validateProcedureActivityObservationTargetSiteCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1716,7 +1716,7 @@ public static boolean validateProcedureActivityObservationPerformer(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_SERVICE_DELIVERY_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_SERVICE_DELIVERY_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1786,7 +1786,7 @@ public static boolean validateProcedureActivityObservationServiceDeliveryLocatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_INSTRUCTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1856,7 +1856,7 @@ public static boolean validateProcedureActivityObservationInstructions(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1925,7 +1925,7 @@ public static boolean validateProcedureActivityObservationIndication(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1995,7 +1995,7 @@ public static boolean validateProcedureActivityObservationMedicationActivity(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2065,7 +2065,7 @@ public static boolean validateProcedureActivityObservationEntryRelationship(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_PROCEDURE_OBSERVATION_REPRESENTED_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_PROCEDURE_OBSERVATION_REPRESENTED_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2142,7 +2142,7 @@ public static boolean validateProcedureActivityObservationProcedureObservationPe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_PROCEDURE_OBSERVATION_REPRESENTED_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_PROCEDURE_OBSERVATION_REPRESENTED_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2219,7 +2219,7 @@ public static boolean validateProcedureActivityObservationProcedureObservationPe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_PROCEDURE_OBSERVATION_REPRESENTED_ORGANIZATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_PROCEDURE_OBSERVATION_REPRESENTED_ORGANIZATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2296,7 +2296,7 @@ public static boolean validateProcedureActivityObservationProcedureObservationPe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_PROCEDURE_OBSERVATION_REPRESENTED_ORGANIZATION_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_PROCEDURE_OBSERVATION_REPRESENTED_ORGANIZATION_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2373,7 +2373,7 @@ public static boolean validateProcedureActivityObservationProcedureObservationPe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2450,7 +2450,7 @@ public static boolean validateProcedureActivityObservationProcedureObservationPe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2527,7 +2527,7 @@ public static boolean validateProcedureActivityObservationProcedureObservationPe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2604,7 +2604,7 @@ public static boolean validateProcedureActivityObservationProcedureObservationPe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_PROCEDURE_OBSERVATION_ASSIGNED_ENTITY_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2681,7 +2681,7 @@ public static boolean validateProcedureActivityObservationProcedureObservationPe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_PROCEDURE_OBSERVATION_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2758,7 +2758,7 @@ public static boolean validateProcedureActivityObservationProcedureObservationPe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ENTRY_RELATIONSHIP_PROCEDURE_OBSERVATION_ENCOUNTER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ENTRY_RELATIONSHIP_PROCEDURE_OBSERVATION_ENCOUNTER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2835,7 +2835,7 @@ public static boolean validateProcedureActivityObservationEntryRelationshipProce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ENTRY_RELATIONSHIP_PROCEDURE_OBSERVATION_ENCOUNTER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ENTRY_RELATIONSHIP_PROCEDURE_OBSERVATION_ENCOUNTER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2912,7 +2912,7 @@ public static boolean validateProcedureActivityObservationEntryRelationshipProce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ENTRY_RELATIONSHIP_PROCEDURE_OBSERVATION_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ENTRY_RELATIONSHIP_PROCEDURE_OBSERVATION_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2989,7 +2989,7 @@ public static boolean validateProcedureActivityObservationEntryRelationshipProce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ENTRY_RELATIONSHIP_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ENTRY_RELATIONSHIP_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3064,7 +3064,7 @@ public static boolean validateProcedureActivityObservationEntryRelationshipInver
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3139,7 +3139,7 @@ public static boolean validateProcedureActivityObservationEntryRelationshipTypeC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ENTRY_RELATIONSHIP_PROCEDURE_OBSERVATION_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_OBSERVATION_ENTRY_RELATIONSHIP_PROCEDURE_OBSERVATION_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3243,7 +3243,7 @@ public static EList<ServiceDeliveryLocation> getServiceDeliveryLocations(
 		@SuppressWarnings("unchecked")
 		Collection<ServiceDeliveryLocation> result = (Collection<ServiceDeliveryLocation>) query.evaluate(
 			procedureActivityObservation);
-		return new BasicEList.UnmodifiableEList<ServiceDeliveryLocation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3335,7 +3335,7 @@ public static EList<Indication> getIndications(ProcedureActivityObservation proc
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INDICATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication> result = (Collection<Indication>) query.evaluate(procedureActivityObservation);
-		return new BasicEList.UnmodifiableEList<Indication>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3384,7 +3384,7 @@ public static EList<MedicationActivity> getMedicationActivities(
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity> result = (Collection<MedicationActivity>) query.evaluate(
 			procedureActivityObservation);
-		return new BasicEList.UnmodifiableEList<MedicationActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // ProcedureActivityObservationOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityProcedure2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityProcedure2Operations.java
index 1d62be09af..c51a4fb6b6 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityProcedure2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityProcedure2Operations.java
@@ -104,7 +104,7 @@ protected ProcedureActivityProcedure2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE2_CODE_SUGGESTED_CODE_SYSTEMS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE2_CODE_SUGGESTED_CODE_SYSTEMS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -174,7 +174,7 @@ public static boolean validateProcedureActivityProcedure2CodeSuggestedCodeSystem
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -274,7 +274,7 @@ public static boolean validateProcedureActivityProcedureStatusCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityProcedureStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityProcedureStatusCodeP", passToken);
 				}
@@ -408,7 +408,7 @@ public static EList<Indication2> getConsolIndication2s(ProcedureActivityProcedur
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_INDICATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication2> result = (Collection<Indication2>) query.evaluate(procedureActivityProcedure2);
-		return new BasicEList.UnmodifiableEList<Indication2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -438,7 +438,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity2> result = (Collection<MedicationActivity2>) query.evaluate(
 			procedureActivityProcedure2);
-		return new BasicEList.UnmodifiableEList<MedicationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -492,7 +492,7 @@ public static EList<ReactionObservation2> getReactionObservation2s(
 		@SuppressWarnings("unchecked")
 		Collection<ReactionObservation2> result = (Collection<ReactionObservation2>) query.evaluate(
 			procedureActivityProcedure2);
-		return new BasicEList.UnmodifiableEList<ReactionObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -693,7 +693,7 @@ public static boolean validateProcedureActivityProcedureTargetSiteCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityProcedureTargetSiteCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityProcedureTargetSiteCodeP", passToken);
 				}
@@ -829,7 +829,7 @@ public static boolean validateProcedureActivityProcedureMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityProcedure2AuthorParticipation(ProcedureActivityProcedure2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Procedure2 Author Participation</em>}' operation.
@@ -850,7 +850,7 @@ public static boolean validateProcedureActivityProcedureMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityProcedure2ReactionObservation2(ProcedureActivityProcedure2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Procedure2 Reaction Observation2</em>}' operation.
@@ -871,7 +871,7 @@ public static boolean validateProcedureActivityProcedureMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE2_REACTION_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE2_REACTION_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #getConsolIndication2s(ProcedureActivityProcedure2) <em>Get Consol Indication2s</em>}' operation.
@@ -972,7 +972,7 @@ public static boolean validateProcedureActivityProcedureMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_INSTRUCTIONS_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_INSTRUCTIONS_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityProcedureCodeCodeSystems(ProcedureActivityProcedure2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Procedure Code Code Systems</em>}' operation.
@@ -993,7 +993,7 @@ public static boolean validateProcedureActivityProcedureMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_CODE_CODE_SYSTEMS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_CODE_CODE_SYSTEMS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityProcedureServiceDeliveryLocationTypeCode(ProcedureActivityProcedure2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Procedure Service Delivery Location Type Code</em>}' operation.
@@ -1014,7 +1014,7 @@ public static boolean validateProcedureActivityProcedureMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_SERVICE_DELIVERY_LOCATION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_SERVICE_DELIVERY_LOCATION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityProcedureTargetSiteCodeP(ProcedureActivityProcedure2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Procedure Target Site Code P</em>}' operation.
@@ -1035,7 +1035,7 @@ public static boolean validateProcedureActivityProcedureMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_TARGET_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_TARGET_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityProcedureTargetSiteCode(ProcedureActivityProcedure2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Procedure Target Site Code</em>}' operation.
@@ -1058,7 +1058,7 @@ public static boolean validateProcedureActivityProcedureMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityProcedureMoodCode(ProcedureActivityProcedure2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Procedure Mood Code</em>}' operation.
@@ -1079,7 +1079,7 @@ public static boolean validateProcedureActivityProcedureMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureActivityProcedureStatusCode(ProcedureActivityProcedure2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Activity Procedure Status Code</em>}' operation.
@@ -1102,7 +1102,7 @@ public static boolean validateProcedureActivityProcedureMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1179,7 +1179,7 @@ public static boolean validateProcedureActivityProcedureStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1248,7 +1248,7 @@ public static boolean validateProcedureActivityProcedureIndication(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1318,7 +1318,7 @@ public static boolean validateProcedureActivityProcedureMedicationActivity(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PATIENT_INSTRUCTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PATIENT_INSTRUCTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1388,7 +1388,7 @@ public static boolean validateProcedureActivityProcedurePatientInstruction(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_SPECIMEN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_SPECIMEN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1457,7 +1457,7 @@ public static boolean validateProcedureActivityProcedureSpecimen(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1526,7 +1526,7 @@ public static boolean validateProcedureActivityProcedurePerformer(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1603,7 +1603,7 @@ public static boolean validateProcedureActivityProcedureProcedureActivityPerform
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1680,7 +1680,7 @@ public static boolean validateProcedureActivityProcedureProcedureActivityPerform
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityProcedureOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityProcedureOperations.java
index f28c2e6f0e..86cf323194 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityProcedureOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureActivityProcedureOperations.java
@@ -137,7 +137,7 @@ protected ProcedureActivityProcedureOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_CODE_CODE_SYSTEMS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_CODE_CODE_SYSTEMS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -207,7 +207,7 @@ public static boolean validateProcedureActivityProcedureCodeCodeSystems(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_CODE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_CODE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -277,7 +277,7 @@ public static boolean validateProcedureActivityProcedureCodeOriginalText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -347,7 +347,7 @@ public static boolean validateProcedureActivityProcedureOriginalTextReference(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -417,7 +417,7 @@ public static boolean validateProcedureActivityProcedureOriginalTextReferenceVal
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -486,7 +486,7 @@ public static boolean validateProcedureActivityProcedureReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ENCOUNTER_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ENCOUNTER_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -556,7 +556,7 @@ public static boolean validateProcedureActivityProcedureEncounterInversion(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PRODUCT_INSTANCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PRODUCT_INSTANCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -626,7 +626,7 @@ public static boolean validateProcedureActivityProcedureProductInstanceTypeCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_SERVICE_DELIVERY_LOCATION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_SERVICE_DELIVERY_LOCATION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -696,7 +696,7 @@ public static boolean validateProcedureActivityProcedureServiceDeliveryLocationT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_INSTRUCTIONS_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_INSTRUCTIONS_INVERSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -766,7 +766,7 @@ public static boolean validateProcedureActivityProcedureInstructionsInversion(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -835,7 +835,7 @@ public static boolean validateProcedureActivityProcedureTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -906,7 +906,7 @@ public static boolean validateProcedureActivityProcedureClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -974,7 +974,7 @@ public static boolean validateProcedureActivityProcedureMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1040,7 +1040,7 @@ public static boolean validateProcedureActivityProcedureId(ProcedureActivityProc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1108,7 +1108,7 @@ public static boolean validateProcedureActivityProcedureCode(ProcedureActivityPr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1177,7 +1177,7 @@ public static boolean validateProcedureActivityProcedureStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1247,7 +1247,7 @@ public static boolean validateProcedureActivityProcedureEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PRIORITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PRIORITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1299,7 +1299,7 @@ public static boolean validateProcedureActivityProcedurePriorityCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityProcedurePriorityCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityProcedurePriorityCodeP", passToken);
 				}
@@ -1332,7 +1332,7 @@ public static boolean validateProcedureActivityProcedurePriorityCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PRIORITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PRIORITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1409,7 +1409,7 @@ public static boolean validateProcedureActivityProcedurePriorityCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1478,7 +1478,7 @@ public static boolean validateProcedureActivityProcedureMethodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_TARGET_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_TARGET_SITE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1531,7 +1531,7 @@ public static boolean validateProcedureActivityProcedureTargetSiteCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityProcedureTargetSiteCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ProcedureActivityProcedureTargetSiteCodeP", passToken);
 				}
@@ -1564,7 +1564,7 @@ public static boolean validateProcedureActivityProcedureTargetSiteCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1641,7 +1641,7 @@ public static boolean validateProcedureActivityProcedureTargetSiteCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1710,7 +1710,7 @@ public static boolean validateProcedureActivityProcedureIndication(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_SPECIMEN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_SPECIMEN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1778,7 +1778,7 @@ public static boolean validateProcedureActivityProcedureSpecimen(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_SERVICE_DELIVERY_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_SERVICE_DELIVERY_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1848,7 +1848,7 @@ public static boolean validateProcedureActivityProcedureServiceDeliveryLocation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1917,7 +1917,7 @@ public static boolean validateProcedureActivityProcedurePerformer(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1987,7 +1987,7 @@ public static boolean validateProcedureActivityProcedureMedicationActivity(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PATIENT_INSTRUCTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PATIENT_INSTRUCTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2057,7 +2057,7 @@ public static boolean validateProcedureActivityProcedurePatientInstruction(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PRODUCT_INSTANCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PRODUCT_INSTANCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2126,7 +2126,7 @@ public static boolean validateProcedureActivityProcedureProductInstance(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ENTRY_RELATIONSHIP__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2196,7 +2196,7 @@ public static boolean validateProcedureActivityProcedureEntryRelationship(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_SPECIMEN_SPECIMEN_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_SPECIMEN_SPECIMEN_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2271,7 +2271,7 @@ public static boolean validateProcedureActivityProcedureProcedureSpecimenSpecime
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_SPECIMEN_SPECIMENT_ROLE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_SPECIMEN_SPECIMENT_ROLE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2346,7 +2346,7 @@ public static boolean validateProcedureActivityProcedureProcedureSpecimenSpecime
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_PROCEDURE_ACTIVITY_REPRESENTED_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_PROCEDURE_ACTIVITY_REPRESENTED_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2423,7 +2423,7 @@ public static boolean validateProcedureActivityProcedureProcedureActivityPerform
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_PROCEDURE_ACTIVITY_REPRESENTED_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_PROCEDURE_ACTIVITY_REPRESENTED_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2500,7 +2500,7 @@ public static boolean validateProcedureActivityProcedureProcedureActivityPerform
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_PROCEDURE_ACTIVITY_REPRESENTED_ORGANIZATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_PROCEDURE_ACTIVITY_REPRESENTED_ORGANIZATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2577,7 +2577,7 @@ public static boolean validateProcedureActivityProcedureProcedureActivityPerform
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_PROCEDURE_ACTIVITY_REPRESENTED_ORGANIZATION_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_PROCEDURE_ACTIVITY_REPRESENTED_ORGANIZATION_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2654,7 +2654,7 @@ public static boolean validateProcedureActivityProcedureProcedureActivityPerform
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2731,7 +2731,7 @@ public static boolean validateProcedureActivityProcedureProcedureActivityPerform
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2808,7 +2808,7 @@ public static boolean validateProcedureActivityProcedureProcedureActivityPerform
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2885,7 +2885,7 @@ public static boolean validateProcedureActivityProcedureProcedureActivityPerform
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_PROCEDURE_ACTIVITY_ASSIGNED_ENTITY_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2962,7 +2962,7 @@ public static boolean validateProcedureActivityProcedureProcedureActivityPerform
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_PROCEDURE_ACTIVITY_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3038,7 +3038,7 @@ public static boolean validateProcedureActivityProcedureProcedureActivityPerform
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ENTRY_RELATIONSHIP_PROCEDURE_ACTIVITY_ENCOUNTER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ENTRY_RELATIONSHIP_PROCEDURE_ACTIVITY_ENCOUNTER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3115,7 +3115,7 @@ public static boolean validateProcedureActivityProcedureEntryRelationshipProcedu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ENTRY_RELATIONSHIP_PROCEDURE_ACTIVITY_ENCOUNTER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ENTRY_RELATIONSHIP_PROCEDURE_ACTIVITY_ENCOUNTER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3192,7 +3192,7 @@ public static boolean validateProcedureActivityProcedureEntryRelationshipProcedu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ENTRY_RELATIONSHIP_PROCEDURE_ACTIVITY_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ENTRY_RELATIONSHIP_PROCEDURE_ACTIVITY_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3269,7 +3269,7 @@ public static boolean validateProcedureActivityProcedureEntryRelationshipProcedu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ENTRY_RELATIONSHIP_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ENTRY_RELATIONSHIP_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3344,7 +3344,7 @@ public static boolean validateProcedureActivityProcedureEntryRelationshipInversi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ENTRY_RELATIONSHIP_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3419,7 +3419,7 @@ public static boolean validateProcedureActivityProcedureEntryRelationshipTypeCod
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ENTRY_RELATIONSHIP_PROCEDURE_ACTIVITY_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_ACTIVITY_PROCEDURE_ENTRY_RELATIONSHIP_PROCEDURE_ACTIVITY_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3520,7 +3520,7 @@ public static EList<Indication> getIndications(ProcedureActivityProcedure proced
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INDICATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication> result = (Collection<Indication>) query.evaluate(procedureActivityProcedure);
-		return new BasicEList.UnmodifiableEList<Indication>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3569,7 +3569,7 @@ public static EList<ServiceDeliveryLocation> getServiceDeliveryLocations(
 		@SuppressWarnings("unchecked")
 		Collection<ServiceDeliveryLocation> result = (Collection<ServiceDeliveryLocation>) query.evaluate(
 			procedureActivityProcedure);
-		return new BasicEList.UnmodifiableEList<ServiceDeliveryLocation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3618,7 +3618,7 @@ public static EList<MedicationActivity> getMedicationActivities(
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity> result = (Collection<MedicationActivity>) query.evaluate(
 			procedureActivityProcedure);
-		return new BasicEList.UnmodifiableEList<MedicationActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3710,7 +3710,7 @@ public static EList<ProductInstance> getProductInstances(ProcedureActivityProced
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PRODUCT_INSTANCES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ProductInstance> result = (Collection<ProductInstance>) query.evaluate(procedureActivityProcedure);
-		return new BasicEList.UnmodifiableEList<ProductInstance>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // ProcedureActivityProcedureOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureContextOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureContextOperations.java
index ddfa63ba12..6ac6fc608a 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureContextOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureContextOperations.java
@@ -80,7 +80,7 @@ protected ProcedureContextOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_CONTEXT_EFFECTIVE_TIME_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_CONTEXT_EFFECTIVE_TIME_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -147,7 +147,7 @@ public static boolean validateProcedureContextEffectiveTimeValue(ProcedureContex
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_CONTEXT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_CONTEXT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -212,7 +212,7 @@ public static boolean validateProcedureContextTemplateId(ProcedureContext proced
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_CONTEXT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_CONTEXT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -277,7 +277,7 @@ public static boolean validateProcedureContextClassCode(ProcedureContext procedu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_CONTEXT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_CONTEXT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -342,7 +342,7 @@ public static boolean validateProcedureContextMoodCode(ProcedureContext procedur
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_CONTEXT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_CONTEXT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -407,7 +407,7 @@ public static boolean validateProcedureContextCode(ProcedureContext procedureCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_CONTEXT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_CONTEXT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureDescriptionSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureDescriptionSectionOperations.java
index fdea692fda..608da4bcf8 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureDescriptionSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureDescriptionSectionOperations.java
@@ -79,7 +79,7 @@ protected ProcedureDescriptionSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DESCRIPTION_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DESCRIPTION_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -150,7 +150,7 @@ public static boolean validateProcedureDescriptionSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DESCRIPTION_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DESCRIPTION_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -218,7 +218,7 @@ public static boolean validateProcedureDescriptionSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DESCRIPTION_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DESCRIPTION_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -286,7 +286,7 @@ public static boolean validateProcedureDescriptionSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DESCRIPTION_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DESCRIPTION_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -354,7 +354,7 @@ public static boolean validateProcedureDescriptionSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DESCRIPTION_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DESCRIPTION_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureDispositionSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureDispositionSectionOperations.java
index f509d1f20e..1a60bd2865 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureDispositionSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureDispositionSectionOperations.java
@@ -79,7 +79,7 @@ protected ProcedureDispositionSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DISPOSITION_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DISPOSITION_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -150,7 +150,7 @@ public static boolean validateProcedureDispositionSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DISPOSITION_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DISPOSITION_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -218,7 +218,7 @@ public static boolean validateProcedureDispositionSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DISPOSITION_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DISPOSITION_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -286,7 +286,7 @@ public static boolean validateProcedureDispositionSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DISPOSITION_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DISPOSITION_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -354,7 +354,7 @@ public static boolean validateProcedureDispositionSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DISPOSITION_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_DISPOSITION_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureEstimatedBloodLossSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureEstimatedBloodLossSectionOperations.java
index a343549b65..4ad38057e0 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureEstimatedBloodLossSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureEstimatedBloodLossSectionOperations.java
@@ -79,7 +79,7 @@ protected ProcedureEstimatedBloodLossSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ESTIMATED_BLOOD_LOSS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ESTIMATED_BLOOD_LOSS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateProcedureEstimatedBloodLossSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ESTIMATED_BLOOD_LOSS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ESTIMATED_BLOOD_LOSS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateProcedureEstimatedBloodLossSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ESTIMATED_BLOOD_LOSS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ESTIMATED_BLOOD_LOSS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -291,7 +291,7 @@ public static boolean validateProcedureEstimatedBloodLossSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ESTIMATED_BLOOD_LOSS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ESTIMATED_BLOOD_LOSS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -361,7 +361,7 @@ public static boolean validateProcedureEstimatedBloodLossSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ESTIMATED_BLOOD_LOSS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_ESTIMATED_BLOOD_LOSS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureFindingsSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureFindingsSection2Operations.java
index 37b12e5d72..33dbd759b9 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureFindingsSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureFindingsSection2Operations.java
@@ -80,7 +80,7 @@ protected ProcedureFindingsSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -176,7 +176,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation2> result = (Collection<ProblemObservation2>) query.evaluate(
 			procedureFindingsSection2);
-		return new BasicEList.UnmodifiableEList<ProblemObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -198,7 +198,7 @@ public static EList<ProblemObservation2> getConsolProblemObservation2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -247,7 +247,7 @@ public static boolean validateProcedureFindingsSectionCodeP(ProcedureFindingsSec
 					"org.openhealthtools.mdht.uml.cda.consol.ProcedureFindingsSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ProcedureFindingsSectionCodeP", passToken);
 				}
 				passToken.add(procedureFindingsSection2);
@@ -279,7 +279,7 @@ public static boolean validateProcedureFindingsSectionCodeP(ProcedureFindingsSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -353,7 +353,7 @@ public static boolean validateProcedureFindingsSectionCode(ProcedureFindingsSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureFindingsSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureFindingsSectionOperations.java
index 912d1bed18..a2fa12aec6 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureFindingsSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureFindingsSectionOperations.java
@@ -87,7 +87,7 @@ protected ProcedureFindingsSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -156,7 +156,7 @@ public static boolean validateProcedureFindingsSectionTemplateId(ProcedureFindin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -222,7 +222,7 @@ public static boolean validateProcedureFindingsSectionCode(ProcedureFindingsSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -333,7 +333,7 @@ public static boolean validateProcedureFindingsSectionText(ProcedureFindingsSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureFindingsSectionText(ProcedureFindingsSection, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Findings Section Text</em>}' operation.
@@ -354,7 +354,7 @@ public static boolean validateProcedureFindingsSectionText(ProcedureFindingsSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -420,7 +420,7 @@ public static boolean validateProcedureFindingsSectionTitle(ProcedureFindingsSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_FINDINGS_SECTION_PROBLEM_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -515,7 +515,7 @@ public static EList<ProblemObservation> getProblemObservations(ProcedureFindings
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation> result = (Collection<ProblemObservation>) query.evaluate(
 			procedureFindingsSection);
-		return new BasicEList.UnmodifiableEList<ProblemObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // ProcedureFindingsSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureImplantsSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureImplantsSectionOperations.java
index 84f6847d7f..105a46eba5 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureImplantsSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureImplantsSectionOperations.java
@@ -79,7 +79,7 @@ protected ProcedureImplantsSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_IMPLANTS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_IMPLANTS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateProcedureImplantsSectionTemplateId(ProcedureImplan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_IMPLANTS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_IMPLANTS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -214,7 +214,7 @@ public static boolean validateProcedureImplantsSectionCode(ProcedureImplantsSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_IMPLANTS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_IMPLANTS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -280,7 +280,7 @@ public static boolean validateProcedureImplantsSectionCodeP(ProcedureImplantsSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_IMPLANTS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_IMPLANTS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -346,7 +346,7 @@ public static boolean validateProcedureImplantsSectionText(ProcedureImplantsSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_IMPLANTS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_IMPLANTS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureIndicationsSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureIndicationsSection2Operations.java
index 0539e1604f..44a8b8ceb0 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureIndicationsSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureIndicationsSection2Operations.java
@@ -80,7 +80,7 @@ protected ProcedureIndicationsSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -174,7 +174,7 @@ public static EList<Indication2> getConsolIndication2s(ProcedureIndicationsSecti
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_INDICATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication2> result = (Collection<Indication2>) query.evaluate(procedureIndicationsSection2);
-		return new BasicEList.UnmodifiableEList<Indication2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -196,7 +196,7 @@ public static EList<Indication2> getConsolIndication2s(ProcedureIndicationsSecti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -247,7 +247,7 @@ public static boolean validateProcedureIndicationsSectionCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ProcedureIndicationsSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ProcedureIndicationsSectionCodeP", passToken);
 				}
 				passToken.add(procedureIndicationsSection2);
@@ -279,7 +279,7 @@ public static boolean validateProcedureIndicationsSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -356,7 +356,7 @@ public static boolean validateProcedureIndicationsSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureIndicationsSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureIndicationsSectionOperations.java
index bb75b0135f..cb25adbd87 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureIndicationsSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureIndicationsSectionOperations.java
@@ -87,7 +87,7 @@ protected ProcedureIndicationsSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -158,7 +158,7 @@ public static boolean validateProcedureIndicationsSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -226,7 +226,7 @@ public static boolean validateProcedureIndicationsSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -341,7 +341,7 @@ public static boolean validateProcedureIndicationsSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateProcedureIndicationsSectionText(ProcedureIndicationsSection, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Procedure Indications Section Text</em>}' operation.
@@ -362,7 +362,7 @@ public static boolean validateProcedureIndicationsSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -430,7 +430,7 @@ public static boolean validateProcedureIndicationsSectionTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_INDICATIONS_SECTION_INDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -524,7 +524,7 @@ public static EList<Indication> getIndications(ProcedureIndicationsSection proce
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_INDICATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<Indication> result = (Collection<Indication>) query.evaluate(procedureIndicationsSection);
-		return new BasicEList.UnmodifiableEList<Indication>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // ProcedureIndicationsSectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureNote2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureNote2Operations.java
index 5987275832..133396dd5c 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureNote2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureNote2Operations.java
@@ -201,7 +201,7 @@ protected ProcedureNote2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_HAS_AN_ASSEMENT_AND_PLAN_SECTION2_OR_BOTH_ASSEMENT_SECTION_AND_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_HAS_AN_ASSEMENT_AND_PLAN_SECTION2_OR_BOTH_ASSEMENT_SECTION_AND_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -272,7 +272,7 @@ public static boolean validateProcedureNote2HasAnAssementAndPlanSection2OrBothAs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_DOES_NOT_HAVE_ASSEMENT_AND_PLAN_SECTION2_WHEN_ASSEMENT_OR_PLAN_OF_TREATMENT2_ARE_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_DOES_NOT_HAVE_ASSEMENT_AND_PLAN_SECTION2_WHEN_ASSEMENT_OR_PLAN_OF_TREATMENT2_ARE_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -343,7 +343,7 @@ public static boolean validateProcedureNote2DoesNotHaveAssementAndPlanSection2Wh
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_DOES_NOT_HAVE_CHIEF_COMPLAINT_WITH_CHIEF_COMPLAINT_OR_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_DOES_NOT_HAVE_CHIEF_COMPLAINT_WITH_CHIEF_COMPLAINT_OR_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -413,7 +413,7 @@ public static boolean validateProcedureNote2DoesNotHaveChiefComplaintWithChiefCo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -461,7 +461,7 @@ public static boolean validateProcedureNote2CodeP(ProcedureNote2 procedureNote2,
 					"org.openhealthtools.mdht.uml.cda.consol.ProcedureNote2CodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ProcedureNote2CodeP", passToken);
 				}
 				passToken.add(procedureNote2);
@@ -493,7 +493,7 @@ public static boolean validateProcedureNote2CodeP(ProcedureNote2 procedureNote2,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -566,7 +566,7 @@ public static boolean validateProcedureNote2Code(ProcedureNote2 procedureNote2,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -631,7 +631,7 @@ public static boolean validateProcedureNote2Participant(ProcedureNote2 procedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -696,7 +696,7 @@ public static boolean validateProcedureNote2DocumentationOf(ProcedureNote2 proce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_AUTHORIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_AUTHORIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -761,7 +761,7 @@ public static boolean validateProcedureNote2Authorization(ProcedureNote2 procedu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -826,7 +826,7 @@ public static boolean validateProcedureNote2ComponentOf(ProcedureNote2 procedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_COMPLICATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_COMPLICATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -893,7 +893,7 @@ public static boolean validateProcedureNote2ComplicationsSection2(ProcedureNote2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PROCEDURE_DESCRIPTION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PROCEDURE_DESCRIPTION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -960,7 +960,7 @@ public static boolean validateProcedureNote2ProcedureDescriptionSection(Procedur
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PROCEDURE_INDICATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PROCEDURE_INDICATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1027,7 +1027,7 @@ public static boolean validateProcedureNote2ProcedureIndicationsSection2(Procedu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_POSTPROCEDURE_DIAGNOSIS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_POSTPROCEDURE_DIAGNOSIS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1094,7 +1094,7 @@ public static boolean validateProcedureNote2PostprocedureDiagnosisSection2(Proce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1160,7 +1160,7 @@ public static boolean validateProcedureNote2AssessmentSection(ProcedureNote2 pro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_ASSESSMENT_AND_PLAN_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_ASSESSMENT_AND_PLAN_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1227,7 +1227,7 @@ public static boolean validateProcedureNote2AssessmentAndPlanSection2(ProcedureN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1294,7 +1294,7 @@ public static boolean validateProcedureNote2PlanOfTreatmentSection2(ProcedureNot
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_ALLERGIES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_ALLERGIES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1361,7 +1361,7 @@ public static boolean validateProcedureNote2AllergiesSectionEntriesOptional2(Pro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_ANESTHESIA_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_ANESTHESIA_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1427,7 +1427,7 @@ public static boolean validateProcedureNote2AnesthesiaSection2(ProcedureNote2 pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1494,7 +1494,7 @@ public static boolean validateProcedureNote2ChiefComplaintSection(ProcedureNote2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1562,7 +1562,7 @@ public static boolean validateProcedureNote2ChiefComplaintAndReasonForVisitSecti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_FAMILY_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_FAMILY_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1629,7 +1629,7 @@ public static boolean validateProcedureNote2FamilyHistorySection2(ProcedureNote2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_HISTORY_OF_PAST_ILLNESS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_HISTORY_OF_PAST_ILLNESS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1696,7 +1696,7 @@ public static boolean validateProcedureNote2HistoryOfPastIllnessSection2(Procedu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_HISTORY_OF_PRESENT_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_HISTORY_OF_PRESENT_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1763,7 +1763,7 @@ public static boolean validateProcedureNote2HistoryOfPresentIllnessSection(Proce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_MEDICAL_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_MEDICAL_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1830,7 +1830,7 @@ public static boolean validateProcedureNote2MedicalHistorySection(ProcedureNote2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_MEDICATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_MEDICATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1898,7 +1898,7 @@ public static boolean validateProcedureNote2MedicationsSectionEntriesOptional2(P
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_MEDICATIONS_ADMINISTERED_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_MEDICATIONS_ADMINISTERED_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1965,7 +1965,7 @@ public static boolean validateProcedureNote2MedicationsAdministeredSection2(Proc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PHYSICAL_EXAM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PHYSICAL_EXAM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2032,7 +2032,7 @@ public static boolean validateProcedureNote2PhysicalExamSection2(ProcedureNote2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PLANNED_PROCEDURE_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PLANNED_PROCEDURE_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2099,7 +2099,7 @@ public static boolean validateProcedureNote2PlannedProcedureSection2(ProcedureNo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PROCEDURE_DISPOSITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PROCEDURE_DISPOSITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2166,7 +2166,7 @@ public static boolean validateProcedureNote2ProcedureDispositionSection(Procedur
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PROCEDURE_ESTIMATED_BLOOD_LOSS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PROCEDURE_ESTIMATED_BLOOD_LOSS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2234,7 +2234,7 @@ public static boolean validateProcedureNote2ProcedureEstimatedBloodLossSection(P
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PROCEDURE_FINDINGS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PROCEDURE_FINDINGS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2301,7 +2301,7 @@ public static boolean validateProcedureNote2ProcedureFindingsSection2(ProcedureN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PROCEDURE_IMPLANTS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PROCEDURE_IMPLANTS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2368,7 +2368,7 @@ public static boolean validateProcedureNote2ProcedureImplantsSection(ProcedureNo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PROCEDURE_SPECIMENS_TAKEN_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PROCEDURE_SPECIMENS_TAKEN_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2435,7 +2435,7 @@ public static boolean validateProcedureNote2ProcedureSpecimensTakenSection(Proce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PROCEDURES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_PROCEDURES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2503,7 +2503,7 @@ public static boolean validateProcedureNote2ProceduresSectionEntriesOptional2(Pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2570,7 +2570,7 @@ public static boolean validateProcedureNote2ReasonForVisitSection(ProcedureNote2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2637,7 +2637,7 @@ public static boolean validateProcedureNote2ReviewOfSystemsSection(ProcedureNote
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_SOCIAL_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE2_SOCIAL_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2704,7 +2704,7 @@ public static boolean validateProcedureNote2SocialHistorySection2(ProcedureNote2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2777,7 +2777,7 @@ public static boolean validateProcedureNote2ParticipantAssociatedEntityClassCode
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2851,7 +2851,7 @@ public static boolean validateProcedureNote2ParticipantAssociatedEntityAssociate
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2925,7 +2925,7 @@ public static boolean validateProcedureNote2ParticipantTypeCode(ProcedureNote2 p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_PARTICIPANT_FUNCTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_PARTICIPANT_FUNCTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2997,7 +2997,7 @@ public static boolean validateProcedureNote2ParticipantFunctionCode(ProcedureNot
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_PARTICIPANT_FUNCTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_PARTICIPANT_FUNCTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3069,7 +3069,7 @@ public static boolean validateProcedureNote2ParticipantFunctionCodeP(ProcedureNo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_PARTICIPANT_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3141,7 +3141,7 @@ public static boolean validateProcedureNote2ParticipantAssociatedEntity(Procedur
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_US_REALM_DATE_AND_TIME_DT_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_US_REALM_DATE_AND_TIME_DT_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3215,7 +3215,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEventUSRealmDa
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3270,7 +3270,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEventPerformer
 						"org.openhealthtools.mdht.uml.cda.consol.ProcedureNote2DocumentationOfServiceEventPerformerAssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.ProcedureNote2DocumentationOfServiceEventPerformerAssignedEntityCodeP",
 							passToken);
@@ -3305,7 +3305,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3389,7 +3389,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3463,7 +3463,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3537,7 +3537,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3593,7 +3593,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEventPerformer
 						"org.openhealthtools.mdht.uml.cda.consol.ProcedureNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.ProcedureNote2DocumentationOfServiceEventPerformerAssistantsAssignedEntityCodeP",
 							passToken);
@@ -3628,7 +3628,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3713,7 +3713,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3787,7 +3787,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3862,7 +3862,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_HAS_HIGH_WHEN_NO_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_HAS_HIGH_WHEN_NO_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3936,7 +3936,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEventEffective
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_NO_HIGH_IF_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_NO_HIGH_IF_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4010,7 +4010,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEventEffective
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PROCEDURE_CODES__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PROCEDURE_CODES__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4084,7 +4084,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEventProcedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4158,7 +4158,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEventEffective
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4231,7 +4231,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEventCode(Proc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4304,7 +4304,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSISTANTS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4378,7 +4378,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEventPerformer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4450,7 +4450,7 @@ public static boolean validateProcedureNote2DocumentationOfServiceEvent(Procedur
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_AUTHORIZATION_CONSENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_AUTHORIZATION_CONSENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4523,7 +4523,7 @@ public static boolean validateProcedureNote2AuthorizationConsentClassCode(Proced
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_AUTHORIZATION_CONSENT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_AUTHORIZATION_CONSENT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4595,7 +4595,7 @@ public static boolean validateProcedureNote2AuthorizationConsentMoodCode(Procedu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_AUTHORIZATION_CONSENT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_AUTHORIZATION_CONSENT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4668,7 +4668,7 @@ public static boolean validateProcedureNote2AuthorizationConsentStatusCode(Proce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_AUTHORIZATION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_AUTHORIZATION_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4740,7 +4740,7 @@ public static boolean validateProcedureNote2AuthorizationTypeCode(ProcedureNote2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_AUTHORIZATION_CONSENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_AUTHORIZATION_CONSENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4812,7 +4812,7 @@ public static boolean validateProcedureNote2AuthorizationConsent(ProcedureNote2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4887,7 +4887,7 @@ public static boolean validateProcedureNote2ComponentOfEncompassingEncounterEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_LOCATION_HEALTH_CARE_FACILITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_LOCATION_HEALTH_CARE_FACILITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4962,7 +4962,7 @@ public static boolean validateProcedureNote2ComponentOfEncompassingEncounterLoca
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_LOCATION_HEALTH_CARE_FACILITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_LOCATION_HEALTH_CARE_FACILITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5036,7 +5036,7 @@ public static boolean validateProcedureNote2ComponentOfEncompassingEncounterLoca
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5109,7 +5109,7 @@ public static boolean validateProcedureNote2ComponentOfEncompassingEncounterId(P
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5182,7 +5182,7 @@ public static boolean validateProcedureNote2ComponentOfEncompassingEncounterCode
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ENCOUNTER_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5256,7 +5256,7 @@ public static boolean validateProcedureNote2ComponentOfEncompassingEncounterEnco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5330,7 +5330,7 @@ public static boolean validateProcedureNote2ComponentOfEncompassingEncounterLoca
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6682,7 +6682,7 @@ public static SocialHistorySection2 getSocialHistorySection2(ProcedureNote2 proc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureNoteOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureNoteOperations.java
index 6200dd10c5..9496b76309 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureNoteOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureNoteOperations.java
@@ -196,7 +196,7 @@ protected ProcedureNoteOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_HAS_AN_ASSEMENT_AND_PLAN_SECTION_OR_INDIVIDUAL_ASSEMENT_AND_PLAN_SECTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_HAS_AN_ASSEMENT_AND_PLAN_SECTION_OR_INDIVIDUAL_ASSEMENT_AND_PLAN_SECTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -266,7 +266,7 @@ public static boolean validateProcedureNoteHasAnAssementAndPlanSectionOrIndividu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_DOES_NOT_HAVE_INDIVIDUAL_ASSEMENT_AND_PLAN_SECTIONS_WHEN_ASSEMENT_AND_PLAN_SECTION_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_DOES_NOT_HAVE_INDIVIDUAL_ASSEMENT_AND_PLAN_SECTIONS_WHEN_ASSEMENT_AND_PLAN_SECTION_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -337,7 +337,7 @@ public static boolean validateProcedureNoteDoesNotHaveIndividualAssementAndPlanS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_DOES_NOT_HAVE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_WITH_CHIEF_COMPLAINT_SECTION_OR_REASON_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_DOES_NOT_HAVE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_WITH_CHIEF_COMPLAINT_SECTION_OR_REASON_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -408,7 +408,7 @@ public static boolean validateProcedureNoteDoesNotHaveChiefComplaintAndReasonFor
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_SECTION_TITLES__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_SECTION_TITLES__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -473,7 +473,7 @@ public static boolean validateProcedureNoteSectionTitles(ProcedureNote procedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -521,7 +521,7 @@ public static boolean validateGeneralHeaderConstraintsCodeP(ProcedureNote proced
 					"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsCodeP", passToken);
 				}
 				passToken.add(procedureNote);
@@ -551,7 +551,7 @@ public static boolean validateGeneralHeaderConstraintsCodeP(ProcedureNote proced
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -616,7 +616,7 @@ public static boolean validateProcedureNoteComponentOf(ProcedureNote procedureNo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -681,7 +681,7 @@ public static boolean validateProcedureNoteAssessmentSection(ProcedureNote proce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PLAN_OF_CARE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PLAN_OF_CARE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -747,7 +747,7 @@ public static boolean validateProcedureNotePlanOfCareSection(ProcedureNote proce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_ASSESSMENT_AND_PLAN_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_ASSESSMENT_AND_PLAN_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -814,7 +814,7 @@ public static boolean validateProcedureNoteAssessmentAndPlanSection(ProcedureNot
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_COMPLICATIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_COMPLICATIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -880,7 +880,7 @@ public static boolean validateProcedureNoteComplicationsSection(ProcedureNote pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_POSTPROCEDURE_DIAGNOSIS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_POSTPROCEDURE_DIAGNOSIS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -947,7 +947,7 @@ public static boolean validateProcedureNotePostprocedureDiagnosisSection(Procedu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PROCEDURE_DESCRIPTION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PROCEDURE_DESCRIPTION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1014,7 +1014,7 @@ public static boolean validateProcedureNoteProcedureDescriptionSection(Procedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PROCEDURE_INDICATIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PROCEDURE_INDICATIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1081,7 +1081,7 @@ public static boolean validateProcedureNoteProcedureIndicationsSection(Procedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_ALLERGIES_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_ALLERGIES_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1148,7 +1148,7 @@ public static boolean validateProcedureNoteAllergiesSectionEntriesOptional(Proce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_ANESTHESIA_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_ANESTHESIA_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1213,7 +1213,7 @@ public static boolean validateProcedureNoteAnesthesiaSection(ProcedureNote proce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1280,7 +1280,7 @@ public static boolean validateProcedureNoteChiefComplaintSection(ProcedureNote p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_CHIEF_COMPLAINT_AND_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1348,7 +1348,7 @@ public static boolean validateProcedureNoteChiefComplaintAndReasonForVisitSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_FAMILY_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_FAMILY_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1415,7 +1415,7 @@ public static boolean validateProcedureNoteFamilyHistorySection(ProcedureNote pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_HISTORY_OF_PAST_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_HISTORY_OF_PAST_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1482,7 +1482,7 @@ public static boolean validateProcedureNoteHistoryOfPastIllnessSection(Procedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_HISTORY_OF_PRESENT_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_HISTORY_OF_PRESENT_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1549,7 +1549,7 @@ public static boolean validateProcedureNoteHistoryOfPresentIllnessSection(Proced
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_MEDICAL_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_MEDICAL_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1616,7 +1616,7 @@ public static boolean validateProcedureNoteMedicalHistorySection(ProcedureNote p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1683,7 +1683,7 @@ public static boolean validateProcedureNoteMedicationsSectionEntriesOptional(Pro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_MEDICATIONS_ADMINISTERED_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_MEDICATIONS_ADMINISTERED_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1750,7 +1750,7 @@ public static boolean validateProcedureNoteMedicationsAdministeredSection(Proced
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PHYSICAL_EXAM_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PHYSICAL_EXAM_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1816,7 +1816,7 @@ public static boolean validateProcedureNotePhysicalExamSection(ProcedureNote pro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PLANNED_PROCEDURE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PLANNED_PROCEDURE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1883,7 +1883,7 @@ public static boolean validateProcedureNotePlannedProcedureSection(ProcedureNote
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PROCEDURE_DISPOSITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PROCEDURE_DISPOSITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1950,7 +1950,7 @@ public static boolean validateProcedureNoteProcedureDispositionSection(Procedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PROCEDURE_ESTIMATED_BLOOD_LOSS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PROCEDURE_ESTIMATED_BLOOD_LOSS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2017,7 +2017,7 @@ public static boolean validateProcedureNoteProcedureEstimatedBloodLossSection(Pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PROCEDURE_FINDINGS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PROCEDURE_FINDINGS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2084,7 +2084,7 @@ public static boolean validateProcedureNoteProcedureFindingsSection(ProcedureNot
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PROCEDURE_IMPLANTS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PROCEDURE_IMPLANTS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2151,7 +2151,7 @@ public static boolean validateProcedureNoteProcedureImplantsSection(ProcedureNot
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PROCEDURE_SPECIMENS_TAKEN_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PROCEDURE_SPECIMENS_TAKEN_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2218,7 +2218,7 @@ public static boolean validateProcedureNoteProcedureSpecimensTakenSection(Proced
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PROCEDURES_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PROCEDURES_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2285,7 +2285,7 @@ public static boolean validateProcedureNoteProceduresSectionEntriesOptional(Proc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_REASON_FOR_VISIT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2352,7 +2352,7 @@ public static boolean validateProcedureNoteReasonForVisitSection(ProcedureNote p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2419,7 +2419,7 @@ public static boolean validateProcedureNoteReviewOfSystemsSection(ProcedureNote
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_SOCIAL_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_SOCIAL_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2486,7 +2486,7 @@ public static boolean validateProcedureNoteSocialHistorySection(ProcedureNote pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PARTICIPANT1__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_PARTICIPANT1__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2551,7 +2551,7 @@ public static boolean validateProcedureNoteParticipant1(ProcedureNote procedureN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2616,7 +2616,7 @@ public static boolean validateProcedureNoteDocumentationOf(ProcedureNote procedu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER5_LOCATION_HEALTH_CARE_FACILITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER5_LOCATION_HEALTH_CARE_FACILITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2691,7 +2691,7 @@ public static boolean validateProcedureNoteComponentOfEncompassingEncounter5Loca
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER5_LOCATION_HEALTH_CARE_FACILITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER5_LOCATION_HEALTH_CARE_FACILITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2765,7 +2765,7 @@ public static boolean validateProcedureNoteComponentOfEncompassingEncounter5Loca
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER5_ENCOUNTER_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER5_ENCOUNTER_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2840,7 +2840,7 @@ public static boolean validateProcedureNoteComponentOfEncompassingEncounter5Enco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER5_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER5_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2913,7 +2913,7 @@ public static boolean validateProcedureNoteComponentOfEncompassingEncounter5Code
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER5_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER5_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2987,7 +2987,7 @@ public static boolean validateProcedureNoteComponentOfEncompassingEncounter5Loca
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER5_ENCOUNTER_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER5_ENCOUNTER_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3061,7 +3061,7 @@ public static boolean validateProcedureNoteComponentOfEncompassingEncounter5Enco
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER5__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER5__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3134,7 +3134,7 @@ public static boolean validateProcedureNoteComponentOfEncompassingEncounter5(Pro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_PRIMARY_PERFORMER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_PRIMARY_PERFORMER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3190,7 +3190,7 @@ public static boolean validateProcedureNoteDocumentationOfServiceEvent1PrimaryPe
 						"org.openhealthtools.mdht.uml.cda.consol.ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.ProcedureNoteDocumentationOfServiceEvent1PrimaryPerformerAssignedEntityCodeP",
 							passToken);
@@ -3225,7 +3225,7 @@ public static boolean validateProcedureNoteDocumentationOfServiceEvent1PrimaryPe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_PRIMARY_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_PRIMARY_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3310,7 +3310,7 @@ public static boolean validateProcedureNoteDocumentationOfServiceEvent1PrimaryPe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_PRIMARY_PERFORMER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_PRIMARY_PERFORMER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3384,7 +3384,7 @@ public static boolean validateProcedureNoteDocumentationOfServiceEvent1PrimaryPe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_PRIMARY_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_PRIMARY_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3458,7 +3458,7 @@ public static boolean validateProcedureNoteDocumentationOfServiceEvent1PrimaryPe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_PROCEDURE_CODES__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_PROCEDURE_CODES__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3532,7 +3532,7 @@ public static boolean validateProcedureNoteDocumentationOfServiceEvent1Procedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_EFFECTIVE_TIME_HAS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_EFFECTIVE_TIME_HAS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3606,7 +3606,7 @@ public static boolean validateProcedureNoteDocumentationOfServiceEvent1Effective
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_EFFECTIVE_TIME_HAS_HIGH_WHEN_NO_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_EFFECTIVE_TIME_HAS_HIGH_WHEN_NO_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3680,7 +3680,7 @@ public static boolean validateProcedureNoteDocumentationOfServiceEvent1Effective
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_EFFECTIVE_TIME_NO_HIGH_IF_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_EFFECTIVE_TIME_NO_HIGH_IF_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3754,7 +3754,7 @@ public static boolean validateProcedureNoteDocumentationOfServiceEvent1Effective
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_PRECISE_TO_THE_DAY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_PRECISE_TO_THE_DAY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3828,7 +3828,7 @@ public static boolean validateProcedureNoteDocumentationOfServiceEvent1PreciseTo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_PRECISE_TO_THE_MINUTE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_PRECISE_TO_THE_MINUTE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3902,7 +3902,7 @@ public static boolean validateProcedureNoteDocumentationOfServiceEvent1PreciseTo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_PRECISE_TO_THE_SECOND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_PRECISE_TO_THE_SECOND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3976,7 +3976,7 @@ public static boolean validateProcedureNoteDocumentationOfServiceEvent1PreciseTo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4051,7 +4051,7 @@ public static boolean validateProcedureNoteDocumentationOfServiceEvent1IfMorePre
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4124,7 +4124,7 @@ public static boolean validateProcedureNoteDocumentationOfServiceEvent1Code(Proc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4198,7 +4198,7 @@ public static boolean validateProcedureNoteDocumentationOfServiceEvent1Effective
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_PRIMARY_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1_PRIMARY_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4272,7 +4272,7 @@ public static boolean validateProcedureNoteDocumentationOfServiceEvent1PrimaryPe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURE_NOTE_DOCUMENTATION_OF_SERVICE_EVENT1__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5620,7 +5620,7 @@ public static SocialHistorySection getSocialHistorySection(ProcedureNote procedu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5689,7 +5689,7 @@ public static boolean validateGeneralHeaderConstraintsTemplateId(ProcedureNote p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureSpecimensTakenSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureSpecimensTakenSectionOperations.java
index fc656663af..5b3a83a137 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureSpecimensTakenSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProcedureSpecimensTakenSectionOperations.java
@@ -79,7 +79,7 @@ protected ProcedureSpecimensTakenSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_SPECIMENS_TAKEN_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_SPECIMENS_TAKEN_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateProcedureSpecimensTakenSectionTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_SPECIMENS_TAKEN_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_SPECIMENS_TAKEN_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -220,7 +220,7 @@ public static boolean validateProcedureSpecimensTakenSectionCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_SPECIMENS_TAKEN_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_SPECIMENS_TAKEN_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -289,7 +289,7 @@ public static boolean validateProcedureSpecimensTakenSectionCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_SPECIMENS_TAKEN_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_SPECIMENS_TAKEN_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -358,7 +358,7 @@ public static boolean validateProcedureSpecimensTakenSectionText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_SPECIMENS_TAKEN_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURE_SPECIMENS_TAKEN_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProceduresSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProceduresSection2Operations.java
index ee417e7f0b..9b87ce6a51 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProceduresSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProceduresSection2Operations.java
@@ -96,7 +96,7 @@ protected ProceduresSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION2_HAS_PROCEDURE_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION2_HAS_PROCEDURE_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -163,7 +163,7 @@ public static boolean validateProceduresSection2HasProcedureActivity(ProceduresS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -228,7 +228,7 @@ public static boolean validateProceduresSection2NullFlavor(ProceduresSection2 pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -293,7 +293,7 @@ public static boolean validateProceduresSection2Title(ProceduresSection2 procedu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -358,7 +358,7 @@ public static boolean validateProceduresSection2Text(ProceduresSection2 procedur
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION2_ENTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION2_ENTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -423,7 +423,7 @@ public static boolean validateProceduresSection2Entry(ProceduresSection2 procedu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURES_SECTION2_ENTRY_PROCEDURE_ACTIVITY_ACT2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURES_SECTION2_ENTRY_PROCEDURE_ACTIVITY_ACT2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -496,7 +496,7 @@ public static boolean validateProceduresSection2EntryProcedureActivityAct2(Proce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURES_SECTION2_ENTRY_PROCEDURE_ACTIVITY_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURES_SECTION2_ENTRY_PROCEDURE_ACTIVITY_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -570,7 +570,7 @@ public static boolean validateProceduresSection2EntryProcedureActivityObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURES_SECTION2_ENTRY_PROCEDURE_ACTIVITY_PROCEDURE2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROCEDURES_SECTION2_ENTRY_PROCEDURE_ACTIVITY_PROCEDURE2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -644,7 +644,7 @@ public static boolean validateProceduresSection2EntryProcedureActivityProcedure2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -719,7 +719,7 @@ public static EList<ProcedureActivityObservation2> getConsolProcedureActivityObs
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityObservation2> result = (Collection<ProcedureActivityObservation2>) query.evaluate(
 			proceduresSection2);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -748,7 +748,7 @@ public static EList<ProcedureActivityAct2> getConsolProcedureActivityAct2s(Proce
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityAct2> result = (Collection<ProcedureActivityAct2>) query.evaluate(
 			proceduresSection2);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityAct2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -770,7 +770,7 @@ public static EList<ProcedureActivityAct2> getConsolProcedureActivityAct2s(Proce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -820,7 +820,7 @@ public static boolean validateProceduresSectionEntriesOptionalCodeP(ProceduresSe
 					"org.openhealthtools.mdht.uml.cda.consol.ProceduresSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ProceduresSectionEntriesOptionalCodeP", passToken);
 				}
@@ -853,7 +853,7 @@ public static boolean validateProceduresSectionEntriesOptionalCodeP(ProceduresSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -928,7 +928,7 @@ public static boolean validateProceduresSectionEntriesOptionalCode(ProceduresSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_PROCEDURE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_PROCEDURE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -997,7 +997,7 @@ public static boolean validateProceduresSectionEntriesOptionalProcedureActivityP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_PROCEDURE_ACTIVITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_PROCEDURE_ACTIVITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1066,7 +1066,7 @@ public static boolean validateProceduresSectionEntriesOptionalProcedureActivityO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_PROCEDURE_ACTIVITY_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_PROCEDURE_ACTIVITY_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1203,7 +1203,7 @@ public static EList<ProcedureActivityProcedure2> getConsolProcedureActivityProce
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityProcedure2> result = (Collection<ProcedureActivityProcedure2>) query.evaluate(
 			proceduresSection2);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityProcedure2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // ProceduresSection2Operations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProceduresSectionEntriesOptional2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProceduresSectionEntriesOptional2Operations.java
index 79902a57b0..6bb343b857 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProceduresSectionEntriesOptional2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProceduresSectionEntriesOptional2Operations.java
@@ -114,7 +114,7 @@ public static EList<ProcedureActivityProcedure2> getConsolProcedureActivityProce
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityProcedure2> result = (Collection<ProcedureActivityProcedure2>) query.evaluate(
 			proceduresSectionEntriesOptional2);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityProcedure2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -164,7 +164,7 @@ public static EList<ProcedureActivityObservation2> getConsolProcedureActivityObs
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityObservation2> result = (Collection<ProcedureActivityObservation2>) query.evaluate(
 			proceduresSectionEntriesOptional2);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -214,7 +214,7 @@ public static EList<ProcedureActivityAct2> getConsolProcedureActivityAct2s(
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityAct2> result = (Collection<ProcedureActivityAct2>) query.evaluate(
 			proceduresSectionEntriesOptional2);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityAct2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -236,7 +236,7 @@ public static EList<ProcedureActivityAct2> getConsolProcedureActivityAct2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -306,7 +306,7 @@ public static boolean validateProceduresSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -359,7 +359,7 @@ public static boolean validateProceduresSectionEntriesOptionalCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ProceduresSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ProceduresSectionEntriesOptionalCodeP", passToken);
 				}
@@ -392,7 +392,7 @@ public static boolean validateProceduresSectionEntriesOptionalCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -471,7 +471,7 @@ public static boolean validateProceduresSectionEntriesOptionalCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_PROCEDURE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_PROCEDURE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -542,7 +542,7 @@ public static boolean validateProceduresSectionEntriesOptionalProcedureActivityP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_PROCEDURE_ACTIVITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_PROCEDURE_ACTIVITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -613,7 +613,7 @@ public static boolean validateProceduresSectionEntriesOptionalProcedureActivityO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_PROCEDURE_ACTIVITY_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_PROCEDURE_ACTIVITY_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProceduresSectionEntriesOptionalOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProceduresSectionEntriesOptionalOperations.java
index 7e27397b7b..fa46164eb5 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProceduresSectionEntriesOptionalOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProceduresSectionEntriesOptionalOperations.java
@@ -93,7 +93,7 @@ protected ProceduresSectionEntriesOptionalOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -165,7 +165,7 @@ public static boolean validateProceduresSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -235,7 +235,7 @@ public static boolean validateProceduresSectionEntriesOptionalCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -305,7 +305,7 @@ public static boolean validateProceduresSectionEntriesOptionalCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -375,7 +375,7 @@ public static boolean validateProceduresSectionEntriesOptionalTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -445,7 +445,7 @@ public static boolean validateProceduresSectionEntriesOptionalText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_PROCEDURE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_PROCEDURE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -516,7 +516,7 @@ public static boolean validateProceduresSectionEntriesOptionalProcedureActivityP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_PROCEDURE_ACTIVITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_PROCEDURE_ACTIVITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -587,7 +587,7 @@ public static boolean validateProceduresSectionEntriesOptionalProcedureActivityO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_PROCEDURE_ACTIVITY_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_PROCEDURE_ACTIVITY_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -685,7 +685,7 @@ public static EList<ProcedureActivityProcedure> getProcedureActivityProcedures(
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityProcedure> result = (Collection<ProcedureActivityProcedure>) query.evaluate(
 			proceduresSectionEntriesOptional);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityProcedure>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -735,7 +735,7 @@ public static EList<ProcedureActivityObservation> getProcedureActivityObservatio
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityObservation> result = (Collection<ProcedureActivityObservation>) query.evaluate(
 			proceduresSectionEntriesOptional);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -784,7 +784,7 @@ public static EList<ProcedureActivityAct> getProcedureActivityActs(
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityAct> result = (Collection<ProcedureActivityAct>) query.evaluate(
 			proceduresSectionEntriesOptional);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // ProceduresSectionEntriesOptionalOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProceduresSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProceduresSectionOperations.java
index db4af4c2aa..5c589ff770 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProceduresSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProceduresSectionOperations.java
@@ -93,7 +93,7 @@ protected ProceduresSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_HAS_PROCEDURE_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_HAS_PROCEDURE_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -160,7 +160,7 @@ public static boolean validateProceduresSectionHasProcedureActivity(ProceduresSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -225,7 +225,7 @@ public static boolean validateProceduresSectionTitle(ProceduresSection procedure
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_PROCEDURE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_PROCEDURE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -292,7 +292,7 @@ public static boolean validateProceduresSectionProcedureActivityProcedure(Proced
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_PROCEDURE_ACTIVITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_PROCEDURE_ACTIVITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -360,7 +360,7 @@ public static boolean validateProceduresSectionProcedureActivityObservation(Proc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_PROCEDURE_ACTIVITY_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_PROCEDURE_ACTIVITY_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -455,7 +455,7 @@ public static EList<ProcedureActivityProcedure> getConsolProcedureActivityProced
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityProcedure> result = (Collection<ProcedureActivityProcedure>) query.evaluate(
 			proceduresSection);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityProcedure>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -505,7 +505,7 @@ public static EList<ProcedureActivityObservation> getConsolProcedureActivityObse
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityObservation> result = (Collection<ProcedureActivityObservation>) query.evaluate(
 			proceduresSection);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -553,7 +553,7 @@ public static EList<ProcedureActivityAct> getConsolProcedureActivityActs(Procedu
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_PROCEDURE_ACTIVITY_ACTS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityAct> result = (Collection<ProcedureActivityAct>) query.evaluate(proceduresSection);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -575,7 +575,7 @@ public static EList<ProcedureActivityAct> getConsolProcedureActivityActs(Procedu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -642,7 +642,7 @@ public static boolean validateProceduresSectionEntriesOptionalTemplateId(Procedu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -692,7 +692,7 @@ public static boolean validateProceduresSectionEntriesOptionalCodeP(ProceduresSe
 					"org.openhealthtools.mdht.uml.cda.consol.ProceduresSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ProceduresSectionEntriesOptionalCodeP", passToken);
 				}
@@ -725,7 +725,7 @@ public static boolean validateProceduresSectionEntriesOptionalCodeP(ProceduresSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -800,7 +800,7 @@ public static boolean validateProceduresSectionEntriesOptionalCode(ProceduresSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROCEDURES_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProductInstanceOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProductInstanceOperations.java
index 99f0d5f99b..0e1829ba59 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProductInstanceOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProductInstanceOperations.java
@@ -86,7 +86,7 @@ protected ProductInstanceOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRODUCT_INSTANCE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRODUCT_INSTANCE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateProductInstanceTemplateId(ProductInstance productI
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRODUCT_INSTANCE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRODUCT_INSTANCE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -216,7 +216,7 @@ public static boolean validateProductInstanceClassCode(ProductInstance productIn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRODUCT_INSTANCE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRODUCT_INSTANCE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -281,7 +281,7 @@ public static boolean validateProductInstanceId(ProductInstance productInstance,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRODUCT_INSTANCE_SCOPING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRODUCT_INSTANCE_SCOPING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -346,7 +346,7 @@ public static boolean validateProductInstanceScopingEntity(ProductInstance produ
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PRODUCT_INSTANCE_PLAYING_DEVICE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PRODUCT_INSTANCE_PLAYING_DEVICE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -411,7 +411,7 @@ public static boolean validateProductInstancePlayingDevice(ProductInstance produ
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRODUCT_INSTANCE_SCOPING_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRODUCT_INSTANCE_SCOPING_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -483,7 +483,7 @@ public static boolean validateProductInstanceScopingEntityId(ProductInstance pro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRODUCT_INSTANCE_PLAYING_DEVICE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PRODUCT_INSTANCE_PLAYING_DEVICE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PrognosisObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PrognosisObservationOperations.java
index b6d41d42be..619e7e5975 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PrognosisObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PrognosisObservationOperations.java
@@ -80,7 +80,7 @@ protected PrognosisObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGNOSIS_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGNOSIS_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -146,7 +146,7 @@ public static boolean validatePrognosisObservationTemplateId(PrognosisObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGNOSIS_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGNOSIS_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -212,7 +212,7 @@ public static boolean validatePrognosisObservationClassCode(PrognosisObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGNOSIS_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGNOSIS_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -278,7 +278,7 @@ public static boolean validatePrognosisObservationMoodCode(PrognosisObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGNOSIS_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGNOSIS_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -326,7 +326,7 @@ public static boolean validatePrognosisObservationCodeP(PrognosisObservation pro
 					"org.openhealthtools.mdht.uml.cda.consol.PrognosisObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.PrognosisObservationCodeP", passToken);
 				}
 				passToken.add(prognosisObservation);
@@ -358,7 +358,7 @@ public static boolean validatePrognosisObservationCodeP(PrognosisObservation pro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGNOSIS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGNOSIS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -432,7 +432,7 @@ public static boolean validatePrognosisObservationCode(PrognosisObservation prog
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGNOSIS_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGNOSIS_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -498,7 +498,7 @@ public static boolean validatePrognosisObservationStatusCode(PrognosisObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGNOSIS_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGNOSIS_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -565,7 +565,7 @@ public static boolean validatePrognosisObservationStatusCodeP(PrognosisObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGNOSIS_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGNOSIS_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -632,7 +632,7 @@ public static boolean validatePrognosisObservationEffectiveTime(PrognosisObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGNOSIS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGNOSIS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProgressNote2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProgressNote2Operations.java
index 271e3c930b..c8677e9841 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProgressNote2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProgressNote2Operations.java
@@ -138,7 +138,7 @@ protected ProgressNote2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_HAS_AN_ASSEMENT_AND_PLAN_SECTION2_OR_BOTH_ASSEMENT_SECTION_AND_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_HAS_AN_ASSEMENT_AND_PLAN_SECTION2_OR_BOTH_ASSEMENT_SECTION_AND_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -209,7 +209,7 @@ public static boolean validateProgressNote2HasAnAssementAndPlanSection2OrBothAss
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_DOES_NOT_HAVE_ASSEMENT_AND_PLAN_SECTION2_WHEN_ASSEMENT_OR_PLAN_OF_TREATMENT2_ARE_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_DOES_NOT_HAVE_ASSEMENT_AND_PLAN_SECTION2_WHEN_ASSEMENT_OR_PLAN_OF_TREATMENT2_ARE_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -280,7 +280,7 @@ public static boolean validateProgressNote2DoesNotHaveAssementAndPlanSection2Whe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -328,7 +328,7 @@ public static boolean validateProgressNote2CodeP(ProgressNote2 progressNote2, Di
 					"org.openhealthtools.mdht.uml.cda.consol.ProgressNote2CodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ProgressNote2CodeP", passToken);
 				}
 				passToken.add(progressNote2);
@@ -360,7 +360,7 @@ public static boolean validateProgressNote2CodeP(ProgressNote2 progressNote2, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -433,7 +433,7 @@ public static boolean validateProgressNote2Code(ProgressNote2 progressNote2, Dia
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -498,7 +498,7 @@ public static boolean validateProgressNote2DocumentationOf(ProgressNote2 progres
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -563,7 +563,7 @@ public static boolean validateProgressNote2ComponentOf(ProgressNote2 progressNot
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -628,7 +628,7 @@ public static boolean validateProgressNote2AssessmentSection(ProgressNote2 progr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -695,7 +695,7 @@ public static boolean validateProgressNote2PlanOfTreatmentSection2(ProgressNote2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_ASSESSMENT_AND_PLAN_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_ASSESSMENT_AND_PLAN_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -762,7 +762,7 @@ public static boolean validateProgressNote2AssessmentAndPlanSection2(ProgressNot
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_ALLERGIES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_ALLERGIES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -829,7 +829,7 @@ public static boolean validateProgressNote2AllergiesSectionEntriesOptional2(Prog
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -896,7 +896,7 @@ public static boolean validateProgressNote2ChiefComplaintSection(ProgressNote2 p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_INTERVENTIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_INTERVENTIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -963,7 +963,7 @@ public static boolean validateProgressNote2InterventionsSection2(ProgressNote2 p
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_INSTRUCTIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_INSTRUCTIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1029,7 +1029,7 @@ public static boolean validateProgressNote2InstructionsSection2(ProgressNote2 pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_MEDICATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_MEDICATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1096,7 +1096,7 @@ public static boolean validateProgressNote2MedicationsSectionEntriesOptional2(Pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_OBJECTIVE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_OBJECTIVE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1161,7 +1161,7 @@ public static boolean validateProgressNote2ObjectiveSection(ProgressNote2 progre
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_PHYSICAL_EXAM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_PHYSICAL_EXAM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1228,7 +1228,7 @@ public static boolean validateProgressNote2PhysicalExamSection2(ProgressNote2 pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_PROBLEM_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_PROBLEM_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1295,7 +1295,7 @@ public static boolean validateProgressNote2ProblemSectionEntriesOptional2(Progre
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_RESULTS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_RESULTS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1362,7 +1362,7 @@ public static boolean validateProgressNote2ResultsSectionEntriesOptional2(Progre
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1429,7 +1429,7 @@ public static boolean validateProgressNote2ReviewOfSystemsSection(ProgressNote2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_SUBJECTIVE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_SUBJECTIVE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1494,7 +1494,7 @@ public static boolean validateProgressNote2SubjectiveSection(ProgressNote2 progr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1561,7 +1561,7 @@ public static boolean validateProgressNote2VitalSignsSectionEntriesOptional2(Pro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_NUTRITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE2_NUTRITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1626,7 +1626,7 @@ public static boolean validateProgressNote2NutritionSection(ProgressNote2 progre
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_US_REALM_DATE_AND_TIME_DT_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_US_REALM_DATE_AND_TIME_DT_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1700,7 +1700,7 @@ public static boolean validateProgressNote2DocumentationOfServiceEventUSRealmDat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_HAS_HIGH_WHEN_NO_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME_HAS_HIGH_WHEN_NO_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1774,7 +1774,7 @@ public static boolean validateProgressNote2DocumentationOfServiceEventEffectiveT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1847,7 +1847,7 @@ public static boolean validateProgressNote2DocumentationOfServiceEventTemplateId
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1920,7 +1920,7 @@ public static boolean validateProgressNote2DocumentationOfServiceEventClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1994,7 +1994,7 @@ public static boolean validateProgressNote2DocumentationOfServiceEventEffectiveT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2066,7 +2066,7 @@ public static boolean validateProgressNote2DocumentationOfServiceEvent(ProgressN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_US_REALM_DATE_AND_TIME_DT_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_US_REALM_DATE_AND_TIME_DT_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2140,7 +2140,7 @@ public static boolean validateProgressNote2ComponentOfEncompassingEncounterUSRea
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_LOCATION_HEALTH_CARE_FACILITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_LOCATION_HEALTH_CARE_FACILITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2214,7 +2214,7 @@ public static boolean validateProgressNote2ComponentOfEncompassingEncounterLocat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_LOCATION_HEALTH_CARE_FACILITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_LOCATION_HEALTH_CARE_FACILITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2288,7 +2288,7 @@ public static boolean validateProgressNote2ComponentOfEncompassingEncounterLocat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2361,7 +2361,7 @@ public static boolean validateProgressNote2ComponentOfEncompassingEncounterId(Pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2435,7 +2435,7 @@ public static boolean validateProgressNote2ComponentOfEncompassingEncounterEffec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2508,7 +2508,7 @@ public static boolean validateProgressNote2ComponentOfEncompassingEncounterLocat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE2_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3308,7 +3308,7 @@ public static NutritionSection getNutritionSection(ProgressNote2 progressNote2)
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProgressNoteOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProgressNoteOperations.java
index 9d8958c51a..5f1b97e114 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProgressNoteOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProgressNoteOperations.java
@@ -150,7 +150,7 @@ protected ProgressNoteOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_HAS_AN_ASSEMENT_AND_PLAN_SECTION_OR_INDIVIDUAL_ASSEMENT_AND_PLAN_SECTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_HAS_AN_ASSEMENT_AND_PLAN_SECTION_OR_INDIVIDUAL_ASSEMENT_AND_PLAN_SECTIONS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -219,7 +219,7 @@ public static boolean validateProgressNoteHasAnAssementAndPlanSectionOrIndividua
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_DOES_NOT_HAVE_INDIVIDUAL_ASSEMENT_AND_PLAN_SECTIONS_WHEN_ASSEMENT_AND_PLAN_SECTION_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_DOES_NOT_HAVE_INDIVIDUAL_ASSEMENT_AND_PLAN_SECTIONS_WHEN_ASSEMENT_AND_PLAN_SECTION_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -290,7 +290,7 @@ public static boolean validateProgressNoteDoesNotHaveIndividualAssementAndPlanSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -338,7 +338,7 @@ public static boolean validateGeneralHeaderConstraintsCodeP(ProgressNote progres
 					"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsCodeP", passToken);
 				}
 				passToken.add(progressNote);
@@ -368,7 +368,7 @@ public static boolean validateGeneralHeaderConstraintsCodeP(ProgressNote progres
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -433,7 +433,7 @@ public static boolean validateProgressNoteDocumentationOf(ProgressNote progressN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -498,7 +498,7 @@ public static boolean validateProgressNoteComponentOf(ProgressNote progressNote,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -563,7 +563,7 @@ public static boolean validateProgressNoteAssessmentSection(ProgressNote progres
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_PLAN_OF_CARE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_PLAN_OF_CARE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -629,7 +629,7 @@ public static boolean validateProgressNotePlanOfCareSection(ProgressNote progres
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_ASSESSMENT_AND_PLAN_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_ASSESSMENT_AND_PLAN_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -696,7 +696,7 @@ public static boolean validateProgressNoteAssessmentAndPlanSection(ProgressNote
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_ALLERGIES_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_ALLERGIES_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -763,7 +763,7 @@ public static boolean validateProgressNoteAllergiesSectionEntriesOptional(Progre
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_CHIEF_COMPLAINT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -829,7 +829,7 @@ public static boolean validateProgressNoteChiefComplaintSection(ProgressNote pro
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_INTERVENTIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_INTERVENTIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -895,7 +895,7 @@ public static boolean validateProgressNoteInterventionsSection(ProgressNote prog
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_MEDICATIONS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -962,7 +962,7 @@ public static boolean validateProgressNoteMedicationsSectionEntriesOptional(Prog
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_OBJECTIVE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_OBJECTIVE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1027,7 +1027,7 @@ public static boolean validateProgressNoteObjectiveSection(ProgressNote progress
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_PHYSICAL_EXAM_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_PHYSICAL_EXAM_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1093,7 +1093,7 @@ public static boolean validateProgressNotePhysicalExamSection(ProgressNote progr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_PROBLEM_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_PROBLEM_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1160,7 +1160,7 @@ public static boolean validateProgressNoteProblemSectionEntriesOptional(Progress
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_RESULTS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_RESULTS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1227,7 +1227,7 @@ public static boolean validateProgressNoteResultsSectionEntriesOptional(Progress
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1294,7 +1294,7 @@ public static boolean validateProgressNoteReviewOfSystemsSection(ProgressNote pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_SUBJECTIVE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_SUBJECTIVE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1359,7 +1359,7 @@ public static boolean validateProgressNoteSubjectiveSection(ProgressNote progres
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1426,7 +1426,7 @@ public static boolean validateProgressNoteVitalSignsSectionEntriesOptional(Progr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_INSTRUCTIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_NOTE_INSTRUCTIONS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1492,7 +1492,7 @@ public static boolean validateProgressNoteInstructionsSection(ProgressNote progr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1566,7 +1566,7 @@ public static boolean validateProgressNoteDocumentationOfServiceEvent2EffectiveT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2_EFFECTIVE_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2_EFFECTIVE_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1640,7 +1640,7 @@ public static boolean validateProgressNoteDocumentationOfServiceEvent2EffectiveT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2_PRECISE_TO_THE_DAY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2_PRECISE_TO_THE_DAY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1714,7 +1714,7 @@ public static boolean validateProgressNoteDocumentationOfServiceEvent2PreciseToT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2_PRECISE_TO_THE_MINUTE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2_PRECISE_TO_THE_MINUTE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1788,7 +1788,7 @@ public static boolean validateProgressNoteDocumentationOfServiceEvent2PreciseToT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2_PRECISE_TO_THE_SECOND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2_PRECISE_TO_THE_SECOND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1862,7 +1862,7 @@ public static boolean validateProgressNoteDocumentationOfServiceEvent2PreciseToT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1937,7 +1937,7 @@ public static boolean validateProgressNoteDocumentationOfServiceEvent2IfMorePrec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2010,7 +2010,7 @@ public static boolean validateProgressNoteDocumentationOfServiceEvent2TemplateId
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2083,7 +2083,7 @@ public static boolean validateProgressNoteDocumentationOfServiceEvent2ClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2157,7 +2157,7 @@ public static boolean validateProgressNoteDocumentationOfServiceEvent2EffectiveT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_DOCUMENTATION_OF_SERVICE_EVENT2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2229,7 +2229,7 @@ public static boolean validateProgressNoteDocumentationOfServiceEvent2(ProgressN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6_LOCATION_HEALTH_CARE_FACILITY1_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6_LOCATION_HEALTH_CARE_FACILITY1_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2303,7 +2303,7 @@ public static boolean validateProgressNoteComponentOfEncompassingEncounter6Locat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6_LOCATION_HEALTH_CARE_FACILITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6_LOCATION_HEALTH_CARE_FACILITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2377,7 +2377,7 @@ public static boolean validateProgressNoteComponentOfEncompassingEncounter6Locat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6_PRECISE_TO_THE_DAY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6_PRECISE_TO_THE_DAY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2451,7 +2451,7 @@ public static boolean validateProgressNoteComponentOfEncompassingEncounter6Preci
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6_PRECISE_TO_THE_MINUTE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6_PRECISE_TO_THE_MINUTE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2525,7 +2525,7 @@ public static boolean validateProgressNoteComponentOfEncompassingEncounter6Preci
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6_PRECISE_TO_THE_SECOND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6_PRECISE_TO_THE_SECOND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2599,7 +2599,7 @@ public static boolean validateProgressNoteComponentOfEncompassingEncounter6Preci
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6_IF_MORE_PRECISE_THAN_DAY_INCLUDE_TIME_ZONE_OFFSET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2675,7 +2675,7 @@ public static boolean validateProgressNoteComponentOfEncompassingEncounter6IfMor
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2749,7 +2749,7 @@ public static boolean validateProgressNoteComponentOfEncompassingEncounter6Effec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2822,7 +2822,7 @@ public static boolean validateProgressNoteComponentOfEncompassingEncounter6Id(Pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6_LOCATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2895,7 +2895,7 @@ public static boolean validateProgressNoteComponentOfEncompassingEncounter6Locat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROGRESS_NOTE_COMPONENT_OF_ENCOMPASSING_ENCOUNTER6__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3649,7 +3649,7 @@ public static InstructionsSection getInstructionsSection(ProgressNote progressNo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3718,7 +3718,7 @@ public static boolean validateGeneralHeaderConstraintsTemplateId(ProgressNote pr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProgressTowardGoalObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProgressTowardGoalObservationOperations.java
index 19a6668e40..a68a4789c1 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProgressTowardGoalObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProgressTowardGoalObservationOperations.java
@@ -81,7 +81,7 @@ protected ProgressTowardGoalObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateProgressTowardGoalObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateProgressTowardGoalObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -290,7 +290,7 @@ public static boolean validateProgressTowardGoalObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -358,7 +358,7 @@ public static boolean validateProgressTowardGoalObservationId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -410,7 +410,7 @@ public static boolean validateProgressTowardGoalObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ProgressTowardGoalObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ProgressTowardGoalObservationCodeP", passToken);
 				}
@@ -443,7 +443,7 @@ public static boolean validateProgressTowardGoalObservationCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -522,7 +522,7 @@ public static boolean validateProgressTowardGoalObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -592,7 +592,7 @@ public static boolean validateProgressTowardGoalObservationStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -664,7 +664,7 @@ public static boolean validateProgressTowardGoalObservationStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -733,7 +733,7 @@ public static boolean validateProgressTowardGoalObservationValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROGRESS_TOWARD_GOAL_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProvenanceAuthorParticipationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProvenanceAuthorParticipationOperations.java
index e89120254b..121702889f 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProvenanceAuthorParticipationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ProvenanceAuthorParticipationOperations.java
@@ -86,7 +86,7 @@ protected ProvenanceAuthorParticipationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -156,7 +156,7 @@ public static boolean validateProvenanceAuthorParticipationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -225,7 +225,7 @@ public static boolean validateProvenanceAuthorParticipationTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_ASSIGNED_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -295,7 +295,7 @@ public static boolean validateProvenanceAuthorParticipationAssignedAuthor(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_ASSIGNED_PERSON_PN_FAMILY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_ASSIGNED_PERSON_PN_FAMILY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -372,7 +372,7 @@ public static boolean validateProvenanceAuthorParticipationProvenanceAssignedAut
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_ASSIGNED_PERSON_PN_GIVEN__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_ASSIGNED_PERSON_PN_GIVEN__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -449,7 +449,7 @@ public static boolean validateProvenanceAuthorParticipationProvenanceAssignedAut
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_ASSIGNED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_ASSIGNED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -526,7 +526,7 @@ public static boolean validateProvenanceAuthorParticipationProvenanceAssignedAut
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -603,7 +603,7 @@ public static boolean validateProvenanceAuthorParticipationProvenanceAssignedAut
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -680,7 +680,7 @@ public static boolean validateProvenanceAuthorParticipationProvenanceAssignedAut
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -757,7 +757,7 @@ public static boolean validateProvenanceAuthorParticipationProvenanceAssignedAut
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -834,7 +834,7 @@ public static boolean validateProvenanceAuthorParticipationProvenanceAssignedAut
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -913,7 +913,7 @@ public static boolean validateProvenanceAuthorParticipationProvenanceAssignedAut
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_ASSIGNED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -992,7 +992,7 @@ public static boolean validateProvenanceAuthorParticipationProvenanceAssignedAut
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_REPRESENTED_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1069,7 +1069,7 @@ public static boolean validateProvenanceAuthorParticipationProvenanceAssignedAut
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_ASSIGNED_AUTHORING_DEVICE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_PROVENANCE_AUTHOR_PARTICIPATION_PROVENANCE_ASSIGNED_AUTHOR_ASSIGNED_AUTHORING_DEVICE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PurposeofReferenceObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PurposeofReferenceObservationOperations.java
index 5ecbd5c65f..57d2a1e41f 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PurposeofReferenceObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/PurposeofReferenceObservationOperations.java
@@ -80,7 +80,7 @@ protected PurposeofReferenceObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PURPOSEOF_REFERENCE_OBSERVATION_CODE_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PURPOSEOF_REFERENCE_OBSERVATION_CODE_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -150,7 +150,7 @@ public static boolean validatePurposeofReferenceObservationCodeCodeSystem(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PURPOSEOF_REFERENCE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PURPOSEOF_REFERENCE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -220,7 +220,7 @@ public static boolean validatePurposeofReferenceObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PURPOSEOF_REFERENCE_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PURPOSEOF_REFERENCE_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -290,7 +290,7 @@ public static boolean validatePurposeofReferenceObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PURPOSEOF_REFERENCE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PURPOSEOF_REFERENCE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -359,7 +359,7 @@ public static boolean validatePurposeofReferenceObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PURPOSEOF_REFERENCE_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PURPOSEOF_REFERENCE_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -430,7 +430,7 @@ public static boolean validatePurposeofReferenceObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_PURPOSEOF_REFERENCE_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_PURPOSEOF_REFERENCE_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/QuantityMeasurementObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/QuantityMeasurementObservationOperations.java
index 5c9bd793f5..8fd0ff6c82 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/QuantityMeasurementObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/QuantityMeasurementObservationOperations.java
@@ -90,7 +90,7 @@ protected QuantityMeasurementObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_QUANTITY_MEASUREMENT_OBSERVATION_CODE_CODE_SYSTEM_DIR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_QUANTITY_MEASUREMENT_OBSERVATION_CODE_CODE_SYSTEM_DIR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -160,7 +160,7 @@ public static boolean validateQuantityMeasurementObservationCodeCodeSystemDIR(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_QUANTITY_MEASUREMENT_OBSERVATION_CODE_CODE_SYSTEM_DICOM__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_QUANTITY_MEASUREMENT_OBSERVATION_CODE_CODE_SYSTEM_DICOM__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -230,7 +230,7 @@ public static boolean validateQuantityMeasurementObservationCodeCodeSystemDICOM(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_QUANTITY_MEASUREMENT_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_QUANTITY_MEASUREMENT_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -300,7 +300,7 @@ public static boolean validateQuantityMeasurementObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_QUANTITY_MEASUREMENT_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_QUANTITY_MEASUREMENT_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -370,7 +370,7 @@ public static boolean validateQuantityMeasurementObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_QUANTITY_MEASUREMENT_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_QUANTITY_MEASUREMENT_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -440,7 +440,7 @@ public static boolean validateQuantityMeasurementObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_QUANTITY_MEASUREMENT_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_QUANTITY_MEASUREMENT_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -509,7 +509,7 @@ public static boolean validateQuantityMeasurementObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_QUANTITY_MEASUREMENT_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_QUANTITY_MEASUREMENT_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -579,7 +579,7 @@ public static boolean validateQuantityMeasurementObservationEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_QUANTITY_MEASUREMENT_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_QUANTITY_MEASUREMENT_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -648,7 +648,7 @@ public static boolean validateQuantityMeasurementObservationValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_QUANTITY_MEASUREMENT_OBSERVATION_SOP_INSTANCE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_QUANTITY_MEASUREMENT_OBSERVATION_SOP_INSTANCE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -745,7 +745,7 @@ public static EList<SOPInstanceObservation> getSOPInstanceObservations(
 		@SuppressWarnings("unchecked")
 		Collection<SOPInstanceObservation> result = (Collection<SOPInstanceObservation>) query.evaluate(
 			quantityMeasurementObservation);
-		return new BasicEList.UnmodifiableEList<SOPInstanceObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // QuantityMeasurementObservationOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReactionObservation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReactionObservation2Operations.java
index effbf987a6..fa1cecafc9 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReactionObservation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReactionObservation2Operations.java
@@ -99,7 +99,7 @@ protected ReactionObservation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_CODE_VALUE_SET__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_CODE_VALUE_SET__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -166,7 +166,7 @@ public static boolean validateReactionObservationCodeValueSet(ReactionObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -232,7 +232,7 @@ public static boolean validateReactionObservation2TemplateId(ReactionObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -280,7 +280,7 @@ public static boolean validateReactionObservationCodeP(ReactionObservation2 reac
 					"org.openhealthtools.mdht.uml.cda.consol.ReactionObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ReactionObservationCodeP", passToken);
 				}
 				passToken.add(reactionObservation2);
@@ -339,7 +339,7 @@ public static boolean validateReactionObservationStatusCodeP(ReactionObservation
 					"org.openhealthtools.mdht.uml.cda.consol.ReactionObservationStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ReactionObservationStatusCodeP", passToken);
 				}
 				passToken.add(reactionObservation2);
@@ -377,7 +377,7 @@ public static EList<ProcedureActivityProcedure2> getConsolProcedureActivityProce
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityProcedure2> result = (Collection<ProcedureActivityProcedure2>) query.evaluate(
 			reactionObservation2);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityProcedure2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -405,7 +405,7 @@ public static EList<MedicationActivity2> getConsolMedicationActivity2s(ReactionO
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_MEDICATION_ACTIVITY2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity2> result = (Collection<MedicationActivity2>) query.evaluate(reactionObservation2);
-		return new BasicEList.UnmodifiableEList<MedicationActivity2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -831,7 +831,7 @@ public static boolean validateReactionObservationId(ReactionObservation2 reactio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #getConsolProcedureActivityProcedure2s(ReactionObservation2) <em>Get Consol Procedure Activity Procedure2s</em>}' operation.
@@ -912,7 +912,7 @@ public static boolean validateReactionObservationId(ReactionObservation2 reactio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_PROCEDURE_ACTIVITY_PROCEDURE_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_PROCEDURE_ACTIVITY_PROCEDURE_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateReactionObservationMedicationActivityInversionInd(ReactionObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Reaction Observation Medication Activity Inversion Ind</em>}' operation.
@@ -933,7 +933,7 @@ public static boolean validateReactionObservationId(ReactionObservation2 reactio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_MEDICATION_ACTIVITY_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_MEDICATION_ACTIVITY_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateReactionObservationSeverityObservationInversionInd(ReactionObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Reaction Observation Severity Observation Inversion Ind</em>}' operation.
@@ -954,7 +954,7 @@ public static boolean validateReactionObservationId(ReactionObservation2 reactio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_SEVERITY_OBSERVATION_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_SEVERITY_OBSERVATION_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateReactionObservationTextReference(ReactionObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Reaction Observation Text Reference</em>}' operation.
@@ -975,7 +975,7 @@ public static boolean validateReactionObservationId(ReactionObservation2 reactio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateReactionObservationTextReferenceValue(ReactionObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Reaction Observation Text Reference Value</em>}' operation.
@@ -996,7 +996,7 @@ public static boolean validateReactionObservationId(ReactionObservation2 reactio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateReactionObservationReferenceValue(ReactionObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Reaction Observation Reference Value</em>}' operation.
@@ -1017,7 +1017,7 @@ public static boolean validateReactionObservationId(ReactionObservation2 reactio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateReactionObservationCode(ReactionObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Reaction Observation Code</em>}' operation.
@@ -1040,7 +1040,7 @@ public static boolean validateReactionObservationId(ReactionObservation2 reactio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateReactionObservationId(ReactionObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Reaction Observation Id</em>}' operation.
@@ -1061,7 +1061,7 @@ public static boolean validateReactionObservationId(ReactionObservation2 reactio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateReactionObservationText(ReactionObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Reaction Observation Text</em>}' operation.
@@ -1082,7 +1082,7 @@ public static boolean validateReactionObservationId(ReactionObservation2 reactio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1148,7 +1148,7 @@ public static boolean validateReactionObservationText(ReactionObservation2 react
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1222,7 +1222,7 @@ public static boolean validateReactionObservationStatusCode(ReactionObservation2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1270,7 +1270,7 @@ public static boolean validateReactionObservationValueP(ReactionObservation2 rea
 					"org.openhealthtools.mdht.uml.cda.consol.ReactionObservationValueP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ReactionObservationValueP", passToken);
 				}
 				passToken.add(reactionObservation2);
@@ -1302,7 +1302,7 @@ public static boolean validateReactionObservationValueP(ReactionObservation2 rea
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1375,7 +1375,7 @@ public static boolean validateReactionObservationValue(ReactionObservation2 reac
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_PROCEDURE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_PROCEDURE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1443,7 +1443,7 @@ public static boolean validateReactionObservationProcedureActivityProcedure(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1510,7 +1510,7 @@ public static boolean validateReactionObservationMedicationActivity(ReactionObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_SEVERITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_SEVERITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReactionObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReactionObservationOperations.java
index eedddd883b..fa600c1b4d 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReactionObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReactionObservationOperations.java
@@ -106,7 +106,7 @@ protected ReactionObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -173,7 +173,7 @@ public static boolean validateReactionObservationTextReference(ReactionObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -240,7 +240,7 @@ public static boolean validateReactionObservationTextReferenceValue(ReactionObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -307,7 +307,7 @@ public static boolean validateReactionObservationReferenceValue(ReactionObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -374,7 +374,7 @@ public static boolean validateReactionObservationEffectiveTimeLow(ReactionObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_EFFECTIVE_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_EFFECTIVE_TIME_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -441,7 +441,7 @@ public static boolean validateReactionObservationEffectiveTimeHigh(ReactionObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_SEVERITY_OBSERVATION_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_SEVERITY_OBSERVATION_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -510,7 +510,7 @@ public static boolean validateReactionObservationSeverityObservationInversionInd
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_PROCEDURE_ACTIVITY_PROCEDURE_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_PROCEDURE_ACTIVITY_PROCEDURE_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -579,7 +579,7 @@ public static boolean validateReactionObservationProcedureActivityProcedureInver
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_MEDICATION_ACTIVITY_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_MEDICATION_ACTIVITY_INVERSION_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -648,7 +648,7 @@ public static boolean validateReactionObservationMedicationActivityInversionInd(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -714,7 +714,7 @@ public static boolean validateReactionObservationTemplateId(ReactionObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -780,7 +780,7 @@ public static boolean validateReactionObservationClassCode(ReactionObservation r
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -845,7 +845,7 @@ public static boolean validateReactionObservationMoodCode(ReactionObservation re
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -910,7 +910,7 @@ public static boolean validateReactionObservationId(ReactionObservation reaction
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -975,7 +975,7 @@ public static boolean validateReactionObservationCode(ReactionObservation reacti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1041,7 +1041,7 @@ public static boolean validateReactionObservationText(ReactionObservation reacti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1107,7 +1107,7 @@ public static boolean validateReactionObservationStatusCode(ReactionObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1176,7 +1176,7 @@ public static boolean validateReactionObservationEffectiveTime(ReactionObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1241,7 +1241,7 @@ public static boolean validateReactionObservationValue(ReactionObservation react
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1306,7 +1306,7 @@ public static boolean validateReactionObservationValueP(ReactionObservation reac
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_SEVERITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_SEVERITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1373,7 +1373,7 @@ public static boolean validateReactionObservationSeverityObservation(ReactionObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_PROCEDURE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_PROCEDURE_ACTIVITY_PROCEDURE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1441,7 +1441,7 @@ public static boolean validateReactionObservationProcedureActivityProcedure(Reac
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REACTION_OBSERVATION_MEDICATION_ACTIVITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1581,7 +1581,7 @@ public static EList<ProcedureActivityProcedure> getProcedureActivityProcedures(
 		@SuppressWarnings("unchecked")
 		Collection<ProcedureActivityProcedure> result = (Collection<ProcedureActivityProcedure>) query.evaluate(
 			reactionObservation);
-		return new BasicEList.UnmodifiableEList<ProcedureActivityProcedure>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1628,7 +1628,7 @@ public static EList<MedicationActivity> getMedicationActivities(ReactionObservat
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_MEDICATION_ACTIVITIES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<MedicationActivity> result = (Collection<MedicationActivity>) query.evaluate(reactionObservation);
-		return new BasicEList.UnmodifiableEList<MedicationActivity>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // ReactionObservationOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReasonForReferralSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReasonForReferralSection2Operations.java
index b7d7a2aa88..95d3116f31 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReasonForReferralSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReasonForReferralSection2Operations.java
@@ -80,7 +80,7 @@ protected ReasonForReferralSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_REFERRAL_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_REFERRAL_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateReasonForReferralSection2TemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_REFERRAL_SECTION2_PATIENT_REFERRAL_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_REFERRAL_SECTION2_PATIENT_REFERRAL_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -245,7 +245,7 @@ public static EList<PatientReferralAct> getPatientReferralActs(
 		@SuppressWarnings("unchecked")
 		Collection<PatientReferralAct> result = (Collection<PatientReferralAct>) query.evaluate(
 			reasonForReferralSection2);
-		return new BasicEList.UnmodifiableEList<PatientReferralAct>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -267,7 +267,7 @@ public static EList<PatientReferralAct> getPatientReferralActs(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_REFERRAL_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_REFERRAL_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -317,7 +317,7 @@ public static boolean validateReasonForReferralSectionCodeP(ReasonForReferralSec
 					"org.openhealthtools.mdht.uml.cda.consol.ReasonForReferralSectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ReasonForReferralSectionCodeP", passToken);
 				}
 				passToken.add(reasonForReferralSection2);
@@ -349,7 +349,7 @@ public static boolean validateReasonForReferralSectionCodeP(ReasonForReferralSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_REFERRAL_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_REFERRAL_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReasonForReferralSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReasonForReferralSectionOperations.java
index 2fa360d342..1b90183b6e 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReasonForReferralSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReasonForReferralSectionOperations.java
@@ -79,7 +79,7 @@ protected ReasonForReferralSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_REFERRAL_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_REFERRAL_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateReasonForReferralSectionTemplateId(ReasonForReferr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_REFERRAL_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_REFERRAL_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -214,7 +214,7 @@ public static boolean validateReasonForReferralSectionCode(ReasonForReferralSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_REFERRAL_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_REFERRAL_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -281,7 +281,7 @@ public static boolean validateReasonForReferralSectionCodeP(ReasonForReferralSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_REFERRAL_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_REFERRAL_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -347,7 +347,7 @@ public static boolean validateReasonForReferralSectionTitle(ReasonForReferralSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_REFERRAL_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_REFERRAL_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReasonForVisitSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReasonForVisitSectionOperations.java
index 9b6f14dfcc..6646f82d10 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReasonForVisitSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReasonForVisitSectionOperations.java
@@ -79,7 +79,7 @@ protected ReasonForVisitSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_VISIT_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_VISIT_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateReasonForVisitSectionTemplateId(ReasonForVisitSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_VISIT_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_VISIT_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -214,7 +214,7 @@ public static boolean validateReasonForVisitSectionCode(ReasonForVisitSection re
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_VISIT_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_VISIT_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -280,7 +280,7 @@ public static boolean validateReasonForVisitSectionCodeP(ReasonForVisitSection r
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_VISIT_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_VISIT_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -346,7 +346,7 @@ public static boolean validateReasonForVisitSectionText(ReasonForVisitSection re
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_VISIT_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REASON_FOR_VISIT_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReferencedFramesObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReferencedFramesObservationOperations.java
index 0c8a43c403..14f17a4aaf 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReferencedFramesObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReferencedFramesObservationOperations.java
@@ -83,7 +83,7 @@ protected ReferencedFramesObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERENCED_FRAMES_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERENCED_FRAMES_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -152,7 +152,7 @@ public static boolean validateReferencedFramesObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERENCED_FRAMES_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERENCED_FRAMES_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateReferencedFramesObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERENCED_FRAMES_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERENCED_FRAMES_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -292,7 +292,7 @@ public static boolean validateReferencedFramesObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERENCED_FRAMES_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERENCED_FRAMES_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -360,7 +360,7 @@ public static boolean validateReferencedFramesObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERENCED_FRAMES_OBSERVATION_BOUNDARY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERENCED_FRAMES_OBSERVATION_BOUNDARY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReferralNoteOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReferralNoteOperations.java
index 942957ad46..23a9446534 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReferralNoteOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReferralNoteOperations.java
@@ -175,7 +175,7 @@ protected ReferralNoteOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_HAS_AN_ASSEMENT_AND_PLAN_SECTION2_OR_BOTH_ASSEMENT_SECTION_AND_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_HAS_AN_ASSEMENT_AND_PLAN_SECTION2_OR_BOTH_ASSEMENT_SECTION_AND_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -246,7 +246,7 @@ public static boolean validateReferralNoteHasAnAssementAndPlanSection2OrBothAsse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_DOES_NOT_HAVE_ASSEMENT_AND_PLAN_SECTION2_WHEN_ASSEMENT_AND_PLAN_OF_TREATMENT2_ARE_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_DOES_NOT_HAVE_ASSEMENT_AND_PLAN_SECTION2_WHEN_ASSEMENT_AND_PLAN_OF_TREATMENT2_ARE_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -317,7 +317,7 @@ public static boolean validateReferralNoteDoesNotHaveAssementAndPlanSection2When
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -365,7 +365,7 @@ public static boolean validateReferralNoteCodeP(ReferralNote referralNote, Diagn
 					"org.openhealthtools.mdht.uml.cda.consol.ReferralNoteCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ReferralNoteCodeP", passToken);
 				}
 				passToken.add(referralNote);
@@ -397,7 +397,7 @@ public static boolean validateReferralNoteCodeP(ReferralNote referralNote, Diagn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -470,7 +470,7 @@ public static boolean validateReferralNoteCode(ReferralNote referralNote, Diagno
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -536,7 +536,7 @@ public static boolean validateReferralNoteInformationRecipient(ReferralNote refe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CAREGIVER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CAREGIVER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -602,7 +602,7 @@ public static boolean validateReferralNoteParticipantCaregiver(ReferralNote refe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -669,7 +669,7 @@ public static boolean validateReferralNoteParticipantCallbackContact(ReferralNot
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -736,7 +736,7 @@ public static boolean validateReferralNotePlanOfTreatmentSection2(ReferralNote r
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -804,7 +804,7 @@ public static boolean validateReferralNoteAdvanceDirectivesSectionEntriesOptiona
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_HISTORY_OF_PRESENT_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_HISTORY_OF_PRESENT_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -871,7 +871,7 @@ public static boolean validateReferralNoteHistoryOfPresentIllnessSection(Referra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_IMMUNIZATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_IMMUNIZATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -937,7 +937,7 @@ public static boolean validateReferralNoteImmunizationsSection2(ReferralNote ref
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_PROBLEM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_PROBLEM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1002,7 +1002,7 @@ public static boolean validateReferralNoteProblemSection2(ReferralNote referralN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_PROCEDURES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_PROCEDURES_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1069,7 +1069,7 @@ public static boolean validateReferralNoteProceduresSectionEntriesOptional2(Refe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_RESULTS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_RESULTS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1134,7 +1134,7 @@ public static boolean validateReferralNoteResultsSection2(ReferralNote referralN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1201,7 +1201,7 @@ public static boolean validateReferralNoteReviewOfSystemsSection(ReferralNote re
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_SOCIAL_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_SOCIAL_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1267,7 +1267,7 @@ public static boolean validateReferralNoteSocialHistorySection2(ReferralNote ref
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_VITAL_SIGNS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_VITAL_SIGNS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1333,7 +1333,7 @@ public static boolean validateReferralNoteVitalSignsSection2(ReferralNote referr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_FUNCTIONAL_STATUS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_FUNCTIONAL_STATUS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1400,7 +1400,7 @@ public static boolean validateReferralNoteFunctionalStatusSection2(ReferralNote
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_PHYSICAL_EXAM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_PHYSICAL_EXAM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1466,7 +1466,7 @@ public static boolean validateReferralNotePhysicalExamSection2(ReferralNote refe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL2B__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_ADVANCE_DIRECTIVES_SECTION_ENTRIES_OPTIONAL2B__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1534,7 +1534,7 @@ public static boolean validateReferralNoteAdvanceDirectivesSectionEntriesOptiona
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_NUTRITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_NUTRITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1599,7 +1599,7 @@ public static boolean validateReferralNoteNutritionSection(ReferralNote referral
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_MENTAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_MENTAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1665,7 +1665,7 @@ public static boolean validateReferralNoteMentalStatusSection(ReferralNote refer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_MEDICAL_EQUIPMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_MEDICAL_EQUIPMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1732,7 +1732,7 @@ public static boolean validateReferralNoteMedicalEquipmentSection2(ReferralNote
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_ALLERGIES_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_ALLERGIES_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1797,7 +1797,7 @@ public static boolean validateReferralNoteAllergiesSection2(ReferralNote referra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1862,7 +1862,7 @@ public static boolean validateReferralNoteAssessmentSection(ReferralNote referra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_ASSESSMENT_AND_PLAN_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_ASSESSMENT_AND_PLAN_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1929,7 +1929,7 @@ public static boolean validateReferralNoteAssessmentAndPlanSection2(ReferralNote
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_HISTORY_OF_PAST_ILLNESS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_HISTORY_OF_PAST_ILLNESS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1996,7 +1996,7 @@ public static boolean validateReferralNoteHistoryOfPastIllnessSection2(ReferralN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_GENERAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_GENERAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2062,7 +2062,7 @@ public static boolean validateReferralNoteGeneralStatusSection(ReferralNote refe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_MEDICATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_MEDICATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2128,7 +2128,7 @@ public static boolean validateReferralNoteMedicationsSection2(ReferralNote refer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_REASON_FOR_REFERRAL_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_REASON_FOR_REFERRAL_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2195,7 +2195,7 @@ public static boolean validateReferralNoteReasonForReferralSection2(ReferralNote
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_FAMILY_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REFERRAL_NOTE_FAMILY_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2261,7 +2261,7 @@ public static boolean validateReferralNoteFamilyHistorySection2(ReferralNote ref
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2335,7 +2335,7 @@ public static boolean validateReferralNoteInformationRecipientIntendedRecipientP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2409,7 +2409,7 @@ public static boolean validateReferralNoteInformationRecipientIntendedRecipientA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2483,7 +2483,7 @@ public static boolean validateReferralNoteInformationRecipientIntendedRecipientT
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2557,7 +2557,7 @@ public static boolean validateReferralNoteInformationRecipientIntendedRecipientI
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_INFORMATION_RECIPIENT_INTENDED_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_INFORMATION_RECIPIENT_INTENDED_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2630,7 +2630,7 @@ public static boolean validateReferralNoteInformationRecipientIntendedRecipient(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY_ASSOCIATED_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY_ASSOCIATED_PERSON_GENERAL_HEADER_CONSTRAINTS_US_REALM_PERSON_NAME_US_REALM_PERSON_NAME_MIXED_CONTENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2706,7 +2706,7 @@ public static boolean validateReferralNoteParticipantCaregiverAssociatedEntityAs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY_ASSOCIATED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY_ASSOCIATED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2780,7 +2780,7 @@ public static boolean validateReferralNoteParticipantCaregiverAssociatedEntityAs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY_CLASS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY_CLASS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2835,7 +2835,7 @@ public static boolean validateReferralNoteParticipantCaregiverAssociatedEntityCl
 						"org.openhealthtools.mdht.uml.cda.consol.ReferralNoteParticipantCaregiverAssociatedEntityClassCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.ReferralNoteParticipantCaregiverAssociatedEntityClassCodeP",
 							passToken);
@@ -2870,7 +2870,7 @@ public static boolean validateReferralNoteParticipantCaregiverAssociatedEntityCl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2954,7 +2954,7 @@ public static boolean validateReferralNoteParticipantCaregiverAssociatedEntityCl
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY_ASSOCIATED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY_ASSOCIATED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3028,7 +3028,7 @@ public static boolean validateReferralNoteParticipantCaregiverAssociatedEntityAs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CAREGIVER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CAREGIVER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3100,7 +3100,7 @@ public static boolean validateReferralNoteParticipantCaregiverTypeCode(ReferralN
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CAREGIVER_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3173,7 +3173,7 @@ public static boolean validateReferralNoteParticipantCaregiverAssociatedEntity(R
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3247,7 +3247,7 @@ public static boolean validateReferralNoteParticipantCallbackContactAssociatedEn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3321,7 +3321,7 @@ public static boolean validateReferralNoteParticipantCallbackContactAssociatedEn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3395,7 +3395,7 @@ public static boolean validateReferralNoteParticipantCallbackContactAssociatedEn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3469,7 +3469,7 @@ public static boolean validateReferralNoteParticipantCallbackContactAssociatedEn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3543,7 +3543,7 @@ public static boolean validateReferralNoteParticipantCallbackContactAssociatedEn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3617,7 +3617,7 @@ public static boolean validateReferralNoteParticipantCallbackContactAssociatedEn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_SCOPING_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_SCOPING_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3691,7 +3691,7 @@ public static boolean validateReferralNoteParticipantCallbackContactAssociatedEn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3764,7 +3764,7 @@ public static boolean validateReferralNoteParticipantCallbackContactTypeCode(Ref
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_REFERRAL_NOTE_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4926,7 +4926,7 @@ public static FamilyHistorySection2 getFamilyHistorySection2(ReferralNote referr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultObservation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultObservation2Operations.java
index 7fce7cbf4f..ea3cc7312c 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultObservation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultObservation2Operations.java
@@ -98,7 +98,7 @@ protected ResultObservation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -163,7 +163,7 @@ public static boolean validateResultObservation2TemplateId(ResultObservation2 re
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -211,7 +211,7 @@ public static boolean validateResultObservationCodeP(ResultObservation2 resultOb
 					"org.openhealthtools.mdht.uml.cda.consol.ResultObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ResultObservationCodeP", passToken);
 				}
 				passToken.add(resultObservation2);
@@ -241,7 +241,7 @@ public static boolean validateResultObservationCodeP(ResultObservation2 resultOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_INTERPRETATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_INTERPRETATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -291,7 +291,7 @@ public static boolean validateResultObservationInterpretationCodeP(ResultObserva
 					"org.openhealthtools.mdht.uml.cda.consol.ResultObservationInterpretationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ResultObservationInterpretationCodeP", passToken);
 				}
@@ -322,7 +322,7 @@ public static boolean validateResultObservationInterpretationCodeP(ResultObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -389,7 +389,7 @@ public static boolean validateResultObservation2AuthorParticipation(ResultObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION2_REFERENCE_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION2_REFERENCE_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -456,7 +456,7 @@ public static boolean validateResultObservation2ReferenceRange(ResultObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_RESULT_OBSERVATION2_REFERENCE_RANGE_OBSERVATION_RANGE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_RESULT_OBSERVATION2_REFERENCE_RANGE_OBSERVATION_RANGE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -531,7 +531,7 @@ public static boolean validateResultObservation2ReferenceRangeObservationRangeVa
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_RESULT_OBSERVATION2_REFERENCE_RANGE_OBSERVATION_RANGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_RESULT_OBSERVATION2_REFERENCE_RANGE_OBSERVATION_RANGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -605,7 +605,7 @@ public static boolean validateResultObservation2ReferenceRangeObservationRangeCo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_RESULT_OBSERVATION2_REFERENCE_RANGE_OBSERVATION_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_RESULT_OBSERVATION2_REFERENCE_RANGE_OBSERVATION_RANGE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -678,7 +678,7 @@ public static boolean validateResultObservation2ReferenceRangeObservationRange(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_AUTHOR_MULTIPLICITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_AUTHOR_MULTIPLICITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -745,7 +745,7 @@ public static boolean validateResultObservationAuthorMultiplicity(ResultObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -810,7 +810,7 @@ public static boolean validateResultObservationCodeValue(ResultObservation2 resu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -876,7 +876,7 @@ public static boolean validateResultObservationTextReference(ResultObservation2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -943,7 +943,7 @@ public static boolean validateResultObservationReferenceValue(ResultObservation2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1010,7 +1010,7 @@ public static boolean validateResultObservationTextReferenceValue(ResultObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_NO_OBSERVATION_RANGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_NO_OBSERVATION_RANGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1077,7 +1077,7 @@ public static boolean validateResultObservationNoObservationRangeCode(ResultObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1143,7 +1143,7 @@ public static boolean validateResultObservationEffectiveTime(ResultObservation2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1210,7 +1210,7 @@ public static boolean validateResultObservationText(ResultObservation2 resultObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1283,7 +1283,7 @@ public static boolean validateResultObservationCode(ResultObservation2 resultObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1350,7 +1350,7 @@ public static boolean validateResultObservationValue(ResultObservation2 resultOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_INTERPRETATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_INTERPRETATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultObservationOperations.java
index efc933150c..db3b87abad 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultObservationOperations.java
@@ -93,7 +93,7 @@ protected ResultObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -159,7 +159,7 @@ public static boolean validateResultObservationTextReference(ResultObservation r
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -226,7 +226,7 @@ public static boolean validateResultObservationReferenceValue(ResultObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -293,7 +293,7 @@ public static boolean validateResultObservationTextReferenceValue(ResultObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -358,7 +358,7 @@ public static boolean validateResultObservationCodeValue(ResultObservation resul
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_NO_OBSERVATION_RANGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_NO_OBSERVATION_RANGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -425,7 +425,7 @@ public static boolean validateResultObservationNoObservationRangeCode(ResultObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_AUTHOR_MULTIPLICITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_AUTHOR_MULTIPLICITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -492,7 +492,7 @@ public static boolean validateResultObservationAuthorMultiplicity(ResultObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -557,7 +557,7 @@ public static boolean validateResultObservationTemplateId(ResultObservation resu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -622,7 +622,7 @@ public static boolean validateResultObservationClassCode(ResultObservation resul
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -687,7 +687,7 @@ public static boolean validateResultObservationMoodCode(ResultObservation result
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -752,7 +752,7 @@ public static boolean validateResultObservationId(ResultObservation resultObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -817,7 +817,7 @@ public static boolean validateResultObservationCode(ResultObservation resultObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -884,7 +884,7 @@ public static boolean validateResultObservationText(ResultObservation resultObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -949,7 +949,7 @@ public static boolean validateResultObservationStatusCode(ResultObservation resu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1014,7 +1014,7 @@ public static boolean validateResultObservationStatusCodeP(ResultObservation res
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1080,7 +1080,7 @@ public static boolean validateResultObservationEffectiveTime(ResultObservation r
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1145,7 +1145,7 @@ public static boolean validateResultObservationValue(ResultObservation resultObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_INTERPRETATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_INTERPRETATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1212,7 +1212,7 @@ public static boolean validateResultObservationInterpretationCode(ResultObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1277,7 +1277,7 @@ public static boolean validateResultObservationMethodCode(ResultObservation resu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultOrganizer2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultOrganizer2Operations.java
index 694e4d6e68..07a881b60a 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultOrganizer2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultOrganizer2Operations.java
@@ -86,7 +86,7 @@ protected ResultOrganizer2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateResultOrganizer2TemplateId(ResultOrganizer2 result
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -216,7 +216,7 @@ public static boolean validateResultOrganizer2EffectiveTime(ResultOrganizer2 res
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -283,7 +283,7 @@ public static boolean validateResultOrganizer2AuthorParticipation(ResultOrganize
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_RESULT_ORGANIZER2_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_RESULT_ORGANIZER2_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -356,7 +356,7 @@ public static boolean validateResultOrganizer2IVLTSLow(ResultOrganizer2 resultOr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_RESULT_ORGANIZER2_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_RESULT_ORGANIZER2_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -455,7 +455,7 @@ public static EList<ResultObservation2> getConsolResultObservation2s(ResultOrgan
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_RESULT_OBSERVATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ResultObservation2> result = (Collection<ResultObservation2>) query.evaluate(resultOrganizer2);
-		return new BasicEList.UnmodifiableEList<ResultObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -477,7 +477,7 @@ public static EList<ResultObservation2> getConsolResultObservation2s(ResultOrgan
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CODE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CODE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -542,7 +542,7 @@ public static boolean validateResultOrganizerCodeValue(ResultOrganizer2 resultOr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CLASS_CODE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CLASS_CODE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -607,7 +607,7 @@ public static boolean validateResultOrganizerClassCodeValue(ResultOrganizer2 res
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultOrganizerOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultOrganizerOperations.java
index a8f9202164..3a75490748 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultOrganizerOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultOrganizerOperations.java
@@ -91,7 +91,7 @@ protected ResultOrganizerOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CODE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CODE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -156,7 +156,7 @@ public static boolean validateResultOrganizerCodeValue(ResultOrganizer resultOrg
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CLASS_CODE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CLASS_CODE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateResultOrganizerClassCodeValue(ResultOrganizer resu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -286,7 +286,7 @@ public static boolean validateResultOrganizerTemplateId(ResultOrganizer resultOr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -351,7 +351,7 @@ public static boolean validateResultOrganizerClassCode(ResultOrganizer resultOrg
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -416,7 +416,7 @@ public static boolean validateResultOrganizerMoodCode(ResultOrganizer resultOrga
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -481,7 +481,7 @@ public static boolean validateResultOrganizerId(ResultOrganizer resultOrganizer,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -529,7 +529,7 @@ public static boolean validateResultOrganizerStatusCodeP(ResultOrganizer resultO
 					"org.openhealthtools.mdht.uml.cda.consol.ResultOrganizerStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.ResultOrganizerStatusCodeP", passToken);
 				}
 				passToken.add(resultOrganizer);
@@ -561,7 +561,7 @@ public static boolean validateResultOrganizerStatusCodeP(ResultOrganizer resultO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -634,7 +634,7 @@ public static boolean validateResultOrganizerStatusCode(ResultOrganizer resultOr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -699,7 +699,7 @@ public static boolean validateResultOrganizerCode(ResultOrganizer resultOrganize
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULT_ORGANIZER_RESULT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -791,7 +791,7 @@ public static EList<ResultObservation> getResultObservations(ResultOrganizer res
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_RESULT_OBSERVATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ResultObservation> result = (Collection<ResultObservation>) query.evaluate(resultOrganizer);
-		return new BasicEList.UnmodifiableEList<ResultObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // ResultOrganizerOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultsSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultsSection2Operations.java
index dc5acdaa97..e7c332fafc 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultsSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultsSection2Operations.java
@@ -83,7 +83,7 @@ protected ResultsSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateResultsSection2NullFlavor(ResultsSection2 resultsS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -213,7 +213,7 @@ public static boolean validateResultsSection2Title(ResultsSection2 resultsSectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -278,7 +278,7 @@ public static boolean validateResultsSection2Text(ResultsSection2 resultsSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -345,7 +345,7 @@ public static boolean validateResultsSectionEntriesOptionalTemplateId(ResultsSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -395,7 +395,7 @@ public static boolean validateResultsSectionEntriesOptionalCodeP(ResultsSection2
 					"org.openhealthtools.mdht.uml.cda.consol.ResultsSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ResultsSectionEntriesOptionalCodeP", passToken);
 				}
@@ -428,7 +428,7 @@ public static boolean validateResultsSectionEntriesOptionalCodeP(ResultsSection2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -503,7 +503,7 @@ public static boolean validateResultsSectionEntriesOptionalCode(ResultsSection2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_RESULT_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_RESULT_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -595,7 +595,7 @@ public static EList<ResultOrganizer2> getConsolResultOrganizer2s(ResultsSection2
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_RESULT_ORGANIZER2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ResultOrganizer2> result = (Collection<ResultOrganizer2>) query.evaluate(resultsSection2);
-		return new BasicEList.UnmodifiableEList<ResultOrganizer2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // ResultsSection2Operations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultsSectionEntriesOptional2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultsSectionEntriesOptional2Operations.java
index 328bf70971..a32e955e99 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultsSectionEntriesOptional2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultsSectionEntriesOptional2Operations.java
@@ -107,7 +107,7 @@ public static EList<ResultOrganizer2> getConsolResultOrganizer2s(
 		@SuppressWarnings("unchecked")
 		Collection<ResultOrganizer2> result = (Collection<ResultOrganizer2>) query.evaluate(
 			resultsSectionEntriesOptional2);
-		return new BasicEList.UnmodifiableEList<ResultOrganizer2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -129,7 +129,7 @@ public static EList<ResultOrganizer2> getConsolResultOrganizer2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -199,7 +199,7 @@ public static boolean validateResultsSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -251,7 +251,7 @@ public static boolean validateResultsSectionEntriesOptionalCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.ResultsSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ResultsSectionEntriesOptionalCodeP", passToken);
 				}
@@ -284,7 +284,7 @@ public static boolean validateResultsSectionEntriesOptionalCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -362,7 +362,7 @@ public static boolean validateResultsSectionEntriesOptionalCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_RESULT_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_RESULT_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultsSectionEntriesOptionalOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultsSectionEntriesOptionalOperations.java
index a7d050ae37..d78c97c0b8 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultsSectionEntriesOptionalOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultsSectionEntriesOptionalOperations.java
@@ -87,7 +87,7 @@ protected ResultsSectionEntriesOptionalOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -159,7 +159,7 @@ public static boolean validateResultsSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -228,7 +228,7 @@ public static boolean validateResultsSectionEntriesOptionalCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -297,7 +297,7 @@ public static boolean validateResultsSectionEntriesOptionalCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -366,7 +366,7 @@ public static boolean validateResultsSectionEntriesOptionalTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -435,7 +435,7 @@ public static boolean validateResultsSectionEntriesOptionalText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_RESULT_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_RESULT_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -532,7 +532,7 @@ public static EList<ResultOrganizer> getResultOrganizers(
 		@SuppressWarnings("unchecked")
 		Collection<ResultOrganizer> result = (Collection<ResultOrganizer>) query.evaluate(
 			resultsSectionEntriesOptional);
-		return new BasicEList.UnmodifiableEList<ResultOrganizer>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // ResultsSectionEntriesOptionalOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultsSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultsSectionOperations.java
index 316affb348..591adc0ede 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultsSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ResultsSectionOperations.java
@@ -86,7 +86,7 @@ protected ResultsSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateResultsSectionText(ResultsSection resultsSection,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_RESULT_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_RESULT_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -241,7 +241,7 @@ public static EList<ResultOrganizer> getConsolResultOrganizers(ResultsSection re
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_RESULT_ORGANIZERS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ResultOrganizer> result = (Collection<ResultOrganizer>) query.evaluate(resultsSection);
-		return new BasicEList.UnmodifiableEList<ResultOrganizer>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -263,7 +263,7 @@ public static EList<ResultOrganizer> getConsolResultOrganizers(ResultsSection re
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -330,7 +330,7 @@ public static boolean validateResultsSectionEntriesOptionalTemplateId(ResultsSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -380,7 +380,7 @@ public static boolean validateResultsSectionEntriesOptionalCodeP(ResultsSection
 					"org.openhealthtools.mdht.uml.cda.consol.ResultsSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.ResultsSectionEntriesOptionalCodeP", passToken);
 				}
@@ -413,7 +413,7 @@ public static boolean validateResultsSectionEntriesOptionalCodeP(ResultsSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -488,7 +488,7 @@ public static boolean validateResultsSectionEntriesOptionalCode(ResultsSection r
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RESULTS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReviewOfSystemsSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReviewOfSystemsSectionOperations.java
index 9d7dc183f6..4a693b93d8 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReviewOfSystemsSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ReviewOfSystemsSectionOperations.java
@@ -79,7 +79,7 @@ protected ReviewOfSystemsSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REVIEW_OF_SYSTEMS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REVIEW_OF_SYSTEMS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateReviewOfSystemsSectionTemplateId(ReviewOfSystemsSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REVIEW_OF_SYSTEMS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REVIEW_OF_SYSTEMS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -214,7 +214,7 @@ public static boolean validateReviewOfSystemsSectionCode(ReviewOfSystemsSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REVIEW_OF_SYSTEMS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REVIEW_OF_SYSTEMS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -280,7 +280,7 @@ public static boolean validateReviewOfSystemsSectionCodeP(ReviewOfSystemsSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REVIEW_OF_SYSTEMS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REVIEW_OF_SYSTEMS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -346,7 +346,7 @@ public static boolean validateReviewOfSystemsSectionTitle(ReviewOfSystemsSection
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_REVIEW_OF_SYSTEMS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_REVIEW_OF_SYSTEMS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/RiskConcernActOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/RiskConcernActOperations.java
index 52b1a7ad7a..f5b2ea9226 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/RiskConcernActOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/RiskConcernActOperations.java
@@ -190,7 +190,7 @@ protected RiskConcernActOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -255,7 +255,7 @@ public static boolean validateRiskConcernActTemplateId(RiskConcernAct riskConcer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -320,7 +320,7 @@ public static boolean validateRiskConcernActClassCode(RiskConcernAct riskConcern
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -385,7 +385,7 @@ public static boolean validateRiskConcernActMoodCode(RiskConcernAct riskConcernA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -450,7 +450,7 @@ public static boolean validateRiskConcernActId(RiskConcernAct riskConcernAct, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -498,7 +498,7 @@ public static boolean validateRiskConcernActCodeP(RiskConcernAct riskConcernAct,
 					"org.openhealthtools.mdht.uml.cda.consol.RiskConcernActCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.RiskConcernActCodeP", passToken);
 				}
 				passToken.add(riskConcernAct);
@@ -530,7 +530,7 @@ public static boolean validateRiskConcernActCodeP(RiskConcernAct riskConcernAct,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -605,7 +605,7 @@ public static boolean validateRiskConcernActCode(RiskConcernAct riskConcernAct,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -670,7 +670,7 @@ public static boolean validateRiskConcernActStatusCode(RiskConcernAct riskConcer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -735,7 +735,7 @@ public static boolean validateRiskConcernActStatusCodeP(RiskConcernAct riskConce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -800,7 +800,7 @@ public static boolean validateRiskConcernActEffectiveTime(RiskConcernAct riskCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -867,7 +867,7 @@ public static boolean validateRiskConcernActAuthorParticipation(RiskConcernAct r
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_PROBLEM_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_PROBLEM_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -934,7 +934,7 @@ public static boolean validateRiskConcernActProblemObservation2(RiskConcernAct r
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_ALLERGY_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_ALLERGY_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1001,7 +1001,7 @@ public static boolean validateRiskConcernActAllergyObservation2(RiskConcernAct r
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_ENTRY_REFERENCE_RELATES_TO__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_ENTRY_REFERENCE_RELATES_TO__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1068,7 +1068,7 @@ public static boolean validateRiskConcernActEntryReferenceRelatesTo(RiskConcernA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_ENTRY_REFERENCE_HAS_COMPONENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_ENTRY_REFERENCE_HAS_COMPONENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1135,7 +1135,7 @@ public static boolean validateRiskConcernActEntryReferenceHasComponent(RiskConce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1202,7 +1202,7 @@ public static boolean validateRiskConcernActAssessmentScaleObservation(RiskConce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_MENTAL_STATUS_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_MENTAL_STATUS_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1269,7 +1269,7 @@ public static boolean validateRiskConcernActMentalStatusObservation2(RiskConcern
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_SELF_CARE_ACTIVITIES__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_SELF_CARE_ACTIVITIES__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1336,7 +1336,7 @@ public static boolean validateRiskConcernActSelfCareActivities(RiskConcernAct ri
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_MENTAL_STATUS_OBSERVATION2_B__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_MENTAL_STATUS_OBSERVATION2_B__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1403,7 +1403,7 @@ public static boolean validateRiskConcernActMentalStatusObservation2B(RiskConcer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_SMOKING_STATUS_MEANINGFUL_USE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_SMOKING_STATUS_MEANINGFUL_USE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1470,7 +1470,7 @@ public static boolean validateRiskConcernActSmokingStatusMeaningfulUse2(RiskConc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_ENCOUNTER_DIAGNOSIS2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_ENCOUNTER_DIAGNOSIS2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1537,7 +1537,7 @@ public static boolean validateRiskConcernActEncounterDiagnosis2(RiskConcernAct r
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_FAMILY_HISTORY_ORGANIZER2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_FAMILY_HISTORY_ORGANIZER2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1604,7 +1604,7 @@ public static boolean validateRiskConcernActFamilyHistoryOrganizer2(RiskConcernA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_FUNCTIONAL_STATUS_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_FUNCTIONAL_STATUS_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1671,7 +1671,7 @@ public static boolean validateRiskConcernActFunctionalStatusObservation2(RiskCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_HOSPITAL_ADMISSION_DIAGNOSIS2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_HOSPITAL_ADMISSION_DIAGNOSIS2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1738,7 +1738,7 @@ public static boolean validateRiskConcernActHospitalAdmissionDiagnosis2(RiskConc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_MENTAL_STATUS_OBSERVATION2_C__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_MENTAL_STATUS_OBSERVATION2_C__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1805,7 +1805,7 @@ public static boolean validateRiskConcernActMentalStatusObservation2C(RiskConcer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_NUTRITION_ASSESSMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_NUTRITION_ASSESSMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1872,7 +1872,7 @@ public static boolean validateRiskConcernActNutritionAssessment(RiskConcernAct r
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_NUTRITION_ASSESSMENT_B__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_NUTRITION_ASSESSMENT_B__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1939,7 +1939,7 @@ public static boolean validateRiskConcernActNutritionAssessmentB(RiskConcernAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_POSTPROCEDURE_DIAGNOSIS2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_POSTPROCEDURE_DIAGNOSIS2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2006,7 +2006,7 @@ public static boolean validateRiskConcernActPostprocedureDiagnosis2(RiskConcernA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_PREGNANCY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_PREGNANCY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2073,7 +2073,7 @@ public static boolean validateRiskConcernActPregnancyObservation(RiskConcernAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_PREOPERATIVE_DIAGNOSIS2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_PREOPERATIVE_DIAGNOSIS2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2140,7 +2140,7 @@ public static boolean validateRiskConcernActPreoperativeDiagnosis2(RiskConcernAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_REACTION_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_REACTION_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2207,7 +2207,7 @@ public static boolean validateRiskConcernActReactionObservation2(RiskConcernAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_RESULT_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_RESULT_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2274,7 +2274,7 @@ public static boolean validateRiskConcernActResultObservation2(RiskConcernAct ri
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_SENSORY_STATUS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_SENSORY_STATUS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2339,7 +2339,7 @@ public static boolean validateRiskConcernActSensoryStatus(RiskConcernAct riskCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_SOCIAL_HISTORY_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_SOCIAL_HISTORY_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2406,7 +2406,7 @@ public static boolean validateRiskConcernActSocialHistoryObservation2(RiskConcer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2474,7 +2474,7 @@ public static boolean validateRiskConcernActSubstanceOrDeviceAllergyObservation2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_TOBACCO_USE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_TOBACCO_USE2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2539,7 +2539,7 @@ public static boolean validateRiskConcernActTobaccoUse2(RiskConcernAct riskConce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_VITAL_SIGN_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_VITAL_SIGN_OBSERVATION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2606,7 +2606,7 @@ public static boolean validateRiskConcernActVitalSignObservation2(RiskConcernAct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_WOUND_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_WOUND_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2672,7 +2672,7 @@ public static boolean validateRiskConcernActWoundObservation(RiskConcernAct risk
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_PROBLEM_OBSERVATION2_HAS_SUPPORT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_PROBLEM_OBSERVATION2_HAS_SUPPORT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2739,7 +2739,7 @@ public static boolean validateRiskConcernActProblemObservation2HasSupport(RiskCo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_CAREGIVER_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_CAREGIVER_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2806,7 +2806,7 @@ public static boolean validateRiskConcernActCaregiverCharacteristics(RiskConcern
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_CULTURAL_AND_RELIGIOUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_CULTURAL_AND_RELIGIOUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2873,7 +2873,7 @@ public static boolean validateRiskConcernActCulturalAndReligiousObservation(Risk
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_CHARACTERISTICS_OF_HOME_ENVIRONMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_CHARACTERISTICS_OF_HOME_ENVIRONMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2940,7 +2940,7 @@ public static boolean validateRiskConcernActCharacteristicsOfHomeEnvironment(Ris
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_NUTRITIONAL_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_NUTRITIONAL_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3007,7 +3007,7 @@ public static boolean validateRiskConcernActNutritionalStatusObservation(RiskCon
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_RESULT_ORGANIZER2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_RESULT_ORGANIZER2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3073,7 +3073,7 @@ public static boolean validateRiskConcernActResultOrganizer2(RiskConcernAct risk
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_PRIORITY_PREFERENCE_PATIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_PRIORITY_PREFERENCE_PATIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3140,7 +3140,7 @@ public static boolean validateRiskConcernActPriorityPreferencePatient(RiskConcer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_PRIORITY_PREFERENCE_PROVIDER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_PRIORITY_PREFERENCE_PROVIDER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3207,7 +3207,7 @@ public static boolean validateRiskConcernActPriorityPreferenceProvider(RiskConce
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_PROBLEM_CONCERN_ACT2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_PROBLEM_CONCERN_ACT2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3274,7 +3274,7 @@ public static boolean validateRiskConcernActProblemConcernAct2(RiskConcernAct ri
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_ENTRY_REFERENCE_HEALTH_CONCERN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_ENTRY_REFERENCE_HEALTH_CONCERN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3341,7 +3341,7 @@ public static boolean validateRiskConcernActEntryReferenceHealthConcern(RiskConc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_RISK_CONCERN_ACT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3406,7 +3406,7 @@ public static boolean validateRiskConcernActReference(RiskConcernAct riskConcern
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_RISK_CONCERN_ACT_REFERENCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_RISK_CONCERN_ACT_REFERENCE_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3478,7 +3478,7 @@ public static boolean validateRiskConcernActReferenceTypeCode(RiskConcernAct ris
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_RISK_CONCERN_ACT_REFERENCE_EXTERNAL_DOCUMENT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_RISK_CONCERN_ACT_REFERENCE_EXTERNAL_DOCUMENT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3576,7 +3576,7 @@ public static EList<ProblemObservation2> getProblemObservation2s(RiskConcernAct
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PROBLEM_OBSERVATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation2> result = (Collection<ProblemObservation2>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<ProblemObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3623,7 +3623,7 @@ public static EList<AllergyObservation2> getAllergyObservation2s(RiskConcernAct
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_ALLERGY_OBSERVATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<AllergyObservation2> result = (Collection<AllergyObservation2>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<AllergyObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3671,7 +3671,7 @@ public static EList<EntryReference> getEntryReferenceRelatesTos(RiskConcernAct r
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_ENTRY_REFERENCE_RELATES_TOS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EntryReference> result = (Collection<EntryReference>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<EntryReference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3719,7 +3719,7 @@ public static EList<EntryReference> getEntryReferenceHasComponents(RiskConcernAc
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_ENTRY_REFERENCE_HAS_COMPONENTS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EntryReference> result = (Collection<EntryReference>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<EntryReference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3768,7 +3768,7 @@ public static EList<AssessmentScaleObservation> getAssessmentScaleObservations(R
 		@SuppressWarnings("unchecked")
 		Collection<AssessmentScaleObservation> result = (Collection<AssessmentScaleObservation>) query.evaluate(
 			riskConcernAct);
-		return new BasicEList.UnmodifiableEList<AssessmentScaleObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3817,7 +3817,7 @@ public static EList<MentalStatusObservation2> getMentalStatusObservation2s(RiskC
 		@SuppressWarnings("unchecked")
 		Collection<MentalStatusObservation2> result = (Collection<MentalStatusObservation2>) query.evaluate(
 			riskConcernAct);
-		return new BasicEList.UnmodifiableEList<MentalStatusObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3864,7 +3864,7 @@ public static EList<SelfCareActivities> getSelfCareActivitiess(RiskConcernAct ri
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_SELF_CARE_ACTIVITIESS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<SelfCareActivities> result = (Collection<SelfCareActivities>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<SelfCareActivities>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3913,7 +3913,7 @@ public static EList<MentalStatusObservation2> getMentalStatusObservation2Bs(Risk
 		@SuppressWarnings("unchecked")
 		Collection<MentalStatusObservation2> result = (Collection<MentalStatusObservation2>) query.evaluate(
 			riskConcernAct);
-		return new BasicEList.UnmodifiableEList<MentalStatusObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -3962,7 +3962,7 @@ public static EList<SmokingStatusMeaningfulUse2> getSmokingStatusMeaningfulUse2s
 		@SuppressWarnings("unchecked")
 		Collection<SmokingStatusMeaningfulUse2> result = (Collection<SmokingStatusMeaningfulUse2>) query.evaluate(
 			riskConcernAct);
-		return new BasicEList.UnmodifiableEList<SmokingStatusMeaningfulUse2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4009,7 +4009,7 @@ public static EList<EncounterDiagnosis2> getEncounterDiagnosis2s(RiskConcernAct
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_ENCOUNTER_DIAGNOSIS2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EncounterDiagnosis2> result = (Collection<EncounterDiagnosis2>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<EncounterDiagnosis2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4057,7 +4057,7 @@ public static EList<FamilyHistoryOrganizer2> getFamilyHistoryOrganizer2s(RiskCon
 		@SuppressWarnings("unchecked")
 		Collection<FamilyHistoryOrganizer2> result = (Collection<FamilyHistoryOrganizer2>) query.evaluate(
 			riskConcernAct);
-		return new BasicEList.UnmodifiableEList<FamilyHistoryOrganizer2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4106,7 +4106,7 @@ public static EList<FunctionalStatusObservation2> getFunctionalStatusObservation
 		@SuppressWarnings("unchecked")
 		Collection<FunctionalStatusObservation2> result = (Collection<FunctionalStatusObservation2>) query.evaluate(
 			riskConcernAct);
-		return new BasicEList.UnmodifiableEList<FunctionalStatusObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4155,7 +4155,7 @@ public static EList<HospitalAdmissionDiagnosis2> getHospitalAdmissionDiagnosis2s
 		@SuppressWarnings("unchecked")
 		Collection<HospitalAdmissionDiagnosis2> result = (Collection<HospitalAdmissionDiagnosis2>) query.evaluate(
 			riskConcernAct);
-		return new BasicEList.UnmodifiableEList<HospitalAdmissionDiagnosis2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4204,7 +4204,7 @@ public static EList<MentalStatusObservation2> getMentalStatusObservation2Cs(Risk
 		@SuppressWarnings("unchecked")
 		Collection<MentalStatusObservation2> result = (Collection<MentalStatusObservation2>) query.evaluate(
 			riskConcernAct);
-		return new BasicEList.UnmodifiableEList<MentalStatusObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4251,7 +4251,7 @@ public static EList<NutritionAssessment> getNutritionAssessments(RiskConcernAct
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_NUTRITION_ASSESSMENTS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<NutritionAssessment> result = (Collection<NutritionAssessment>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<NutritionAssessment>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4298,7 +4298,7 @@ public static EList<NutritionAssessment> getNutritionAssessmentBs(RiskConcernAct
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_NUTRITION_ASSESSMENT_BS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<NutritionAssessment> result = (Collection<NutritionAssessment>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<NutritionAssessment>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4346,7 +4346,7 @@ public static EList<PostprocedureDiagnosis2> getPostprocedureDiagnosis2s(RiskCon
 		@SuppressWarnings("unchecked")
 		Collection<PostprocedureDiagnosis2> result = (Collection<PostprocedureDiagnosis2>) query.evaluate(
 			riskConcernAct);
-		return new BasicEList.UnmodifiableEList<PostprocedureDiagnosis2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4393,7 +4393,7 @@ public static EList<PregnancyObservation> getPregnancyObservations(RiskConcernAc
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PREGNANCY_OBSERVATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PregnancyObservation> result = (Collection<PregnancyObservation>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<PregnancyObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4440,7 +4440,7 @@ public static EList<PreoperativeDiagnosis2> getPreoperativeDiagnosis2s(RiskConce
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PREOPERATIVE_DIAGNOSIS2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PreoperativeDiagnosis2> result = (Collection<PreoperativeDiagnosis2>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<PreoperativeDiagnosis2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4487,7 +4487,7 @@ public static EList<ReactionObservation2> getReactionObservation2s(RiskConcernAc
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_REACTION_OBSERVATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ReactionObservation2> result = (Collection<ReactionObservation2>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<ReactionObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4534,7 +4534,7 @@ public static EList<ResultObservation2> getResultObservation2s(RiskConcernAct ri
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_RESULT_OBSERVATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ResultObservation2> result = (Collection<ResultObservation2>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<ResultObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4581,7 +4581,7 @@ public static EList<SensoryStatus> getSensoryStatuss(RiskConcernAct riskConcernA
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_SENSORY_STATUSS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<SensoryStatus> result = (Collection<SensoryStatus>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<SensoryStatus>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4630,7 +4630,7 @@ public static EList<SocialHistoryObservation2> getSocialHistoryObservation2s(Ris
 		@SuppressWarnings("unchecked")
 		Collection<SocialHistoryObservation2> result = (Collection<SocialHistoryObservation2>) query.evaluate(
 			riskConcernAct);
-		return new BasicEList.UnmodifiableEList<SocialHistoryObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4680,7 +4680,7 @@ public static EList<SubstanceOrDeviceAllergyObservation2> getSubstanceOrDeviceAl
 		@SuppressWarnings("unchecked")
 		Collection<SubstanceOrDeviceAllergyObservation2> result = (Collection<SubstanceOrDeviceAllergyObservation2>) query.evaluate(
 			riskConcernAct);
-		return new BasicEList.UnmodifiableEList<SubstanceOrDeviceAllergyObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4727,7 +4727,7 @@ public static EList<TobaccoUse2> getTobaccoUse2s(RiskConcernAct riskConcernAct)
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_TOBACCO_USE2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<TobaccoUse2> result = (Collection<TobaccoUse2>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<TobaccoUse2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4774,7 +4774,7 @@ public static EList<VitalSignObservation2> getVitalSignObservation2s(RiskConcern
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_VITAL_SIGN_OBSERVATION2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<VitalSignObservation2> result = (Collection<VitalSignObservation2>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<VitalSignObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4822,7 +4822,7 @@ public static EList<LongitudinalCareWoundObservation> getWoundObservations(RiskC
 		@SuppressWarnings("unchecked")
 		Collection<LongitudinalCareWoundObservation> result = (Collection<LongitudinalCareWoundObservation>) query.evaluate(
 			riskConcernAct);
-		return new BasicEList.UnmodifiableEList<LongitudinalCareWoundObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4870,7 +4870,7 @@ public static EList<ProblemObservation2> getProblemObservation2HasSupports(RiskC
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PROBLEM_OBSERVATION2_HAS_SUPPORTS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ProblemObservation2> result = (Collection<ProblemObservation2>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<ProblemObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4918,7 +4918,7 @@ public static EList<CaregiverCharacteristics> getCaregiverCharacteristicss(RiskC
 		@SuppressWarnings("unchecked")
 		Collection<CaregiverCharacteristics> result = (Collection<CaregiverCharacteristics>) query.evaluate(
 			riskConcernAct);
-		return new BasicEList.UnmodifiableEList<CaregiverCharacteristics>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -4968,7 +4968,7 @@ public static EList<CulturalAndReligiousObservation> getCulturalAndReligiousObse
 		@SuppressWarnings("unchecked")
 		Collection<CulturalAndReligiousObservation> result = (Collection<CulturalAndReligiousObservation>) query.evaluate(
 			riskConcernAct);
-		return new BasicEList.UnmodifiableEList<CulturalAndReligiousObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -5018,7 +5018,7 @@ public static EList<CharacteristicsOfHomeEnvironment> getCharacteristicsOfHomeEn
 		@SuppressWarnings("unchecked")
 		Collection<CharacteristicsOfHomeEnvironment> result = (Collection<CharacteristicsOfHomeEnvironment>) query.evaluate(
 			riskConcernAct);
-		return new BasicEList.UnmodifiableEList<CharacteristicsOfHomeEnvironment>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -5067,7 +5067,7 @@ public static EList<NutritionalStatusObservation> getNutritionalStatusObservatio
 		@SuppressWarnings("unchecked")
 		Collection<NutritionalStatusObservation> result = (Collection<NutritionalStatusObservation>) query.evaluate(
 			riskConcernAct);
-		return new BasicEList.UnmodifiableEList<NutritionalStatusObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -5114,7 +5114,7 @@ public static EList<ResultOrganizer2> getResultOrganizer2s(RiskConcernAct riskCo
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_RESULT_ORGANIZER2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ResultOrganizer2> result = (Collection<ResultOrganizer2>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<ResultOrganizer2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -5162,7 +5162,7 @@ public static EList<PriorityPreference> getPriorityPreferencePatients(RiskConcer
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PRIORITY_PREFERENCE_PATIENTS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PriorityPreference> result = (Collection<PriorityPreference>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<PriorityPreference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -5210,7 +5210,7 @@ public static EList<PriorityPreference> getPriorityPreferenceProviders(RiskConce
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PRIORITY_PREFERENCE_PROVIDERS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<PriorityPreference> result = (Collection<PriorityPreference>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<PriorityPreference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -5257,7 +5257,7 @@ public static EList<ProblemConcernAct2> getProblemConcernAct2s(RiskConcernAct ri
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_PROBLEM_CONCERN_ACT2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<ProblemConcernAct2> result = (Collection<ProblemConcernAct2>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<ProblemConcernAct2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -5305,7 +5305,7 @@ public static EList<EntryReference> getEntryReferenceHealthConcerns(RiskConcernA
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_ENTRY_REFERENCE_HEALTH_CONCERNS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<EntryReference> result = (Collection<EntryReference>) query.evaluate(riskConcernAct);
-		return new BasicEList.UnmodifiableEList<EntryReference>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // RiskConcernActOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SOPInstanceObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SOPInstanceObservationOperations.java
index 2329b4cde2..f76f01c110 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SOPInstanceObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SOPInstanceObservationOperations.java
@@ -101,7 +101,7 @@ protected SOPInstanceObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_EFFECTIVE_TIME_HAS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_EFFECTIVE_TIME_HAS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -169,7 +169,7 @@ public static boolean validateSOPInstanceObservationEffectiveTimeHasValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_EFFECTIVE_TIME_NO_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_EFFECTIVE_TIME_NO_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -237,7 +237,7 @@ public static boolean validateSOPInstanceObservationEffectiveTimeNoLow(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_EFFECTIVE_TIME_NO_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_EFFECTIVE_TIME_NO_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -305,7 +305,7 @@ public static boolean validateSOPInstanceObservationEffectiveTimeNoHigh(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_TEXT_MEDIA_TYPE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_TEXT_MEDIA_TYPE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -372,7 +372,7 @@ public static boolean validateSOPInstanceObservationTextMediaType(SOPInstanceObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -439,7 +439,7 @@ public static boolean validateSOPInstanceObservationTextReference(SOPInstanceObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -507,7 +507,7 @@ public static boolean validateSOPInstanceObservationTextReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -574,7 +574,7 @@ public static boolean validateSOPInstanceObservationTemplateId(SOPInstanceObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -641,7 +641,7 @@ public static boolean validateSOPInstanceObservationClassCode(SOPInstanceObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -708,7 +708,7 @@ public static boolean validateSOPInstanceObservationEffectiveTime(SOPInstanceObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -773,7 +773,7 @@ public static boolean validateSOPInstanceObservationId(SOPInstanceObservation so
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -840,7 +840,7 @@ public static boolean validateSOPInstanceObservationMoodCode(SOPInstanceObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -906,7 +906,7 @@ public static boolean validateSOPInstanceObservationText(SOPInstanceObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -955,7 +955,7 @@ public static boolean validateSOPInstanceObservationCodeP(SOPInstanceObservation
 					"org.openhealthtools.mdht.uml.cda.consol.SOPInstanceObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.SOPInstanceObservationCodeP", passToken);
 				}
 				passToken.add(sopInstanceObservation);
@@ -987,7 +987,7 @@ public static boolean validateSOPInstanceObservationCodeP(SOPInstanceObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1061,7 +1061,7 @@ public static boolean validateSOPInstanceObservationCode(SOPInstanceObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_SOP_INSTANCE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_SOP_INSTANCE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1129,7 +1129,7 @@ public static boolean validateSOPInstanceObservationSOPInstanceObservation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_PURPOSEOF_REFERENCE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_PURPOSEOF_REFERENCE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1198,7 +1198,7 @@ public static boolean validateSOPInstanceObservationPurposeofReferenceObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_REFERENCED_FRAMES_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOP_INSTANCE_OBSERVATION_REFERENCED_FRAMES_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1294,7 +1294,7 @@ public static EList<SOPInstanceObservation> getSOPInstanceObservations(
 		@SuppressWarnings("unchecked")
 		Collection<SOPInstanceObservation> result = (Collection<SOPInstanceObservation>) query.evaluate(
 			sopInstanceObservation);
-		return new BasicEList.UnmodifiableEList<SOPInstanceObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1344,7 +1344,7 @@ public static EList<PurposeofReferenceObservation> getPurposeofReferenceObservat
 		@SuppressWarnings("unchecked")
 		Collection<PurposeofReferenceObservation> result = (Collection<PurposeofReferenceObservation>) query.evaluate(
 			sopInstanceObservation);
-		return new BasicEList.UnmodifiableEList<PurposeofReferenceObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -1394,7 +1394,7 @@ public static EList<ReferencedFramesObservation> getReferencedFramesObservations
 		@SuppressWarnings("unchecked")
 		Collection<ReferencedFramesObservation> result = (Collection<ReferencedFramesObservation>) query.evaluate(
 			sopInstanceObservation);
-		return new BasicEList.UnmodifiableEList<ReferencedFramesObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // SOPInstanceObservationOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SelfCareActivitiesOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SelfCareActivitiesOperations.java
index d77cc707eb..74d9d74eea 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SelfCareActivitiesOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SelfCareActivitiesOperations.java
@@ -82,7 +82,7 @@ protected SelfCareActivitiesOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateSelfCareActivitiesTemplateId(SelfCareActivities se
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -213,7 +213,7 @@ public static boolean validateSelfCareActivitiesClassCode(SelfCareActivities sel
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -278,7 +278,7 @@ public static boolean validateSelfCareActivitiesMoodCode(SelfCareActivities self
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -326,7 +326,7 @@ public static boolean validateSelfCareActivitiesCodeP(SelfCareActivities selfCar
 					"org.openhealthtools.mdht.uml.cda.consol.SelfCareActivitiesCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.SelfCareActivitiesCodeP", passToken);
 				}
 				passToken.add(selfCareActivities);
@@ -358,7 +358,7 @@ public static boolean validateSelfCareActivitiesCodeP(SelfCareActivities selfCar
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -432,7 +432,7 @@ public static boolean validateSelfCareActivitiesCode(SelfCareActivities selfCare
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -498,7 +498,7 @@ public static boolean validateSelfCareActivitiesStatusCode(SelfCareActivities se
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -565,7 +565,7 @@ public static boolean validateSelfCareActivitiesStatusCodeP(SelfCareActivities s
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -634,7 +634,7 @@ public static boolean validateSelfCareActivitiesEffectiveTime(SelfCareActivities
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -699,7 +699,7 @@ public static boolean validateSelfCareActivitiesValue(SelfCareActivities selfCar
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -764,7 +764,7 @@ public static boolean validateSelfCareActivitiesValueP(SelfCareActivities selfCa
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SELF_CARE_ACTIVITIES_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SensoryStatusOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SensoryStatusOperations.java
index 28947e72be..00e0223d08 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SensoryStatusOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SensoryStatusOperations.java
@@ -89,7 +89,7 @@ protected SensoryStatusOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -154,7 +154,7 @@ public static boolean validateSensoryStatusTemplateId(SensoryStatus sensoryStatu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -219,7 +219,7 @@ public static boolean validateSensoryStatusClassCode(SensoryStatus sensoryStatus
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -284,7 +284,7 @@ public static boolean validateSensoryStatusMoodCode(SensoryStatus sensoryStatus,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -332,7 +332,7 @@ public static boolean validateSensoryStatusCodeP(SensoryStatus sensoryStatus, Di
 					"org.openhealthtools.mdht.uml.cda.consol.SensoryStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.SensoryStatusCodeP", passToken);
 				}
 				passToken.add(sensoryStatus);
@@ -364,7 +364,7 @@ public static boolean validateSensoryStatusCodeP(SensoryStatus sensoryStatus, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -438,7 +438,7 @@ public static boolean validateSensoryStatusCode(SensoryStatus sensoryStatus, Dia
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -503,7 +503,7 @@ public static boolean validateSensoryStatusStatusCode(SensoryStatus sensoryStatu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -568,7 +568,7 @@ public static boolean validateSensoryStatusStatusCodeP(SensoryStatus sensoryStat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -635,7 +635,7 @@ public static boolean validateSensoryStatusEffectiveTime(SensoryStatus sensorySt
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -700,7 +700,7 @@ public static boolean validateSensoryStatusValue(SensoryStatus sensoryStatus, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -765,7 +765,7 @@ public static boolean validateSensoryStatusValueP(SensoryStatus sensoryStatus, D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_ASSESSMENT_SCALE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -832,7 +832,7 @@ public static boolean validateSensoryStatusAssessmentScaleObservation(SensorySta
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SENSORY_STATUS_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -898,7 +898,7 @@ public static boolean validateSensoryStatusAuthorParticipation(SensoryStatus sen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SENSORY_STATUS_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SENSORY_STATUS_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -970,7 +970,7 @@ public static boolean validateSensoryStatusIVLTSLow(SensoryStatus sensoryStatus,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SENSORY_STATUS_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SENSORY_STATUS_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1069,7 +1069,7 @@ public static EList<AssessmentScaleObservation> getAssessmentScaleObservations(S
 		@SuppressWarnings("unchecked")
 		Collection<AssessmentScaleObservation> result = (Collection<AssessmentScaleObservation>) query.evaluate(
 			sensoryStatus);
-		return new BasicEList.UnmodifiableEList<AssessmentScaleObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // SensoryStatusOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SerialNumberObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SerialNumberObservationOperations.java
index e5606d68d2..108bbe2c5e 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SerialNumberObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SerialNumberObservationOperations.java
@@ -81,7 +81,7 @@ protected SerialNumberObservationOperations() {
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_SERIAL_NUMBER_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERIAL_NUMBER_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -146,7 +146,7 @@ public static boolean validateSerialNumberObservationTemplateId(SerialNumberObse
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_SERIAL_NUMBER_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERIAL_NUMBER_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -194,7 +194,7 @@ public static boolean validateSerialNumberObservationCodeP(SerialNumberObservati
 					"org.openhealthtools.mdht.uml.cda.consol.SerialNumberObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.SerialNumberObservationCodeP", passToken);
 				}
 				passToken.add(serialNumberObservation);
@@ -225,7 +225,7 @@ public static boolean validateSerialNumberObservationCodeP(SerialNumberObservati
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_SERIAL_NUMBER_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERIAL_NUMBER_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -297,7 +297,7 @@ public static boolean validateSerialNumberObservationCode(SerialNumberObservatio
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_SERIAL_NUMBER_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERIAL_NUMBER_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SeriesActOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SeriesActOperations.java
index 254eff794a..1184b50562 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SeriesActOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SeriesActOperations.java
@@ -95,7 +95,7 @@ protected SeriesActOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_ID_HAS_ROOT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_ID_HAS_ROOT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -159,7 +159,7 @@ public static boolean validateSeriesActIdHasRoot(SeriesAct seriesAct, Diagnostic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_ID_NO_EXTENSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_ID_NO_EXTENSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -224,7 +224,7 @@ public static boolean validateSeriesActIdNoExtension(SeriesAct seriesAct, Diagno
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_CODE_QUALIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_CODE_QUALIFIER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -289,7 +289,7 @@ public static boolean validateSeriesActCodeQualifier(SeriesAct seriesAct, Diagno
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_CODE_QUALIFIER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_CODE_QUALIFIER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -354,7 +354,7 @@ public static boolean validateSeriesActCodeQualifierCode(SeriesAct seriesAct, Di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_CODE_QUALIFIER_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_CODE_QUALIFIER_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -419,7 +419,7 @@ public static boolean validateSeriesActCodeQualifierValue(SeriesAct seriesAct, D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_CODE_QUALIFIER_VALUE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_CODE_QUALIFIER_VALUE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -485,7 +485,7 @@ public static boolean validateSeriesActCodeQualifierValueCode(SeriesAct seriesAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -549,7 +549,7 @@ public static boolean validateSeriesActTemplateId(SeriesAct seriesAct, Diagnosti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -613,7 +613,7 @@ public static boolean validateSeriesActClassCode(SeriesAct seriesAct, Diagnostic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -679,7 +679,7 @@ public static boolean validateSeriesActMoodCode(SeriesAct seriesAct, DiagnosticC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -743,7 +743,7 @@ public static boolean validateSeriesActCode(SeriesAct seriesAct, DiagnosticChain
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -808,7 +808,7 @@ public static boolean validateSeriesActEffectiveTime(SeriesAct seriesAct, Diagno
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -871,7 +871,7 @@ public static boolean validateSeriesActId(SeriesAct seriesAct, DiagnosticChain d
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -934,7 +934,7 @@ public static boolean validateSeriesActText(SeriesAct seriesAct, DiagnosticChain
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_SOP_INSTANCE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERIES_ACT_SOP_INSTANCE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1024,7 +1024,7 @@ public static EList<SOPInstanceObservation> getSOPInstanceObservations(SeriesAct
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_SOP_INSTANCE_OBSERVATIONS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<SOPInstanceObservation> result = (Collection<SOPInstanceObservation>) query.evaluate(seriesAct);
-		return new BasicEList.UnmodifiableEList<SOPInstanceObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // SeriesActOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ServiceDeliveryLocationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ServiceDeliveryLocationOperations.java
index f33deb5183..e7b1614209 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ServiceDeliveryLocationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/ServiceDeliveryLocationOperations.java
@@ -82,7 +82,7 @@ protected ServiceDeliveryLocationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERVICE_DELIVERY_LOCATION_HAS_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERVICE_DELIVERY_LOCATION_HAS_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -150,7 +150,7 @@ public static boolean validateServiceDeliveryLocationHasPlayingEntity(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERVICE_DELIVERY_LOCATION_HAS_PLAYING_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERVICE_DELIVERY_LOCATION_HAS_PLAYING_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -219,7 +219,7 @@ public static boolean validateServiceDeliveryLocationHasPlayingEntityClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERVICE_DELIVERY_LOCATION_HAS_PLAYING_ENTITY_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERVICE_DELIVERY_LOCATION_HAS_PLAYING_ENTITY_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -287,7 +287,7 @@ public static boolean validateServiceDeliveryLocationHasPlayingEntityName(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERVICE_DELIVERY_LOCATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERVICE_DELIVERY_LOCATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -354,7 +354,7 @@ public static boolean validateServiceDeliveryLocationTemplateId(ServiceDeliveryL
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERVICE_DELIVERY_LOCATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERVICE_DELIVERY_LOCATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -423,7 +423,7 @@ public static boolean validateServiceDeliveryLocationClassCode(ServiceDeliveryLo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERVICE_DELIVERY_LOCATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERVICE_DELIVERY_LOCATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -489,7 +489,7 @@ public static boolean validateServiceDeliveryLocationCode(ServiceDeliveryLocatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERVICE_DELIVERY_LOCATION_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERVICE_DELIVERY_LOCATION_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -555,7 +555,7 @@ public static boolean validateServiceDeliveryLocationAddr(ServiceDeliveryLocatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SERVICE_DELIVERY_LOCATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SERVICE_DELIVERY_LOCATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SeverityObservation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SeverityObservation2Operations.java
index f71a42f096..b00661a77f 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SeverityObservation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SeverityObservation2Operations.java
@@ -81,7 +81,7 @@ protected SeverityObservation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -174,7 +174,7 @@ public static boolean validateSeverityObservationCodeP(SeverityObservation2 seve
 					"org.openhealthtools.mdht.uml.cda.consol.SeverityObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.SeverityObservationCodeP", passToken);
 				}
 				passToken.add(severityObservation2);
@@ -233,7 +233,7 @@ public static boolean validateSeverityObservationStatusCodeP(SeverityObservation
 					"org.openhealthtools.mdht.uml.cda.consol.SeverityObservationStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.SeverityObservationStatusCodeP", passToken);
 				}
 				passToken.add(severityObservation2);
@@ -401,7 +401,7 @@ public static boolean validateSeverityObservationReferenceValue(SeverityObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -474,7 +474,7 @@ public static boolean validateSeverityObservationCode(SeverityObservation2 sever
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSeverityObservationTextReference(SeverityObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Severity Observation Text Reference</em>}' operation.
@@ -495,7 +495,7 @@ public static boolean validateSeverityObservationCode(SeverityObservation2 sever
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSeverityObservationTextReferenceValue(SeverityObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Severity Observation Text Reference Value</em>}' operation.
@@ -516,7 +516,7 @@ public static boolean validateSeverityObservationCode(SeverityObservation2 sever
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSeverityObservationReferenceValue(SeverityObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Severity Observation Reference Value</em>}' operation.
@@ -537,7 +537,7 @@ public static boolean validateSeverityObservationCode(SeverityObservation2 sever
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSeverityObservationCode(SeverityObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Severity Observation Code</em>}' operation.
@@ -560,7 +560,7 @@ public static boolean validateSeverityObservationCode(SeverityObservation2 sever
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSeverityObservationText(SeverityObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Severity Observation Text</em>}' operation.
@@ -581,7 +581,7 @@ public static boolean validateSeverityObservationCode(SeverityObservation2 sever
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -647,7 +647,7 @@ public static boolean validateSeverityObservationText(SeverityObservation2 sever
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -721,7 +721,7 @@ public static boolean validateSeverityObservationStatusCode(SeverityObservation2
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -769,7 +769,7 @@ public static boolean validateSeverityObservationValueP(SeverityObservation2 sev
 					"org.openhealthtools.mdht.uml.cda.consol.SeverityObservationValueP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.SeverityObservationValueP", passToken);
 				}
 				passToken.add(severityObservation2);
@@ -801,7 +801,7 @@ public static boolean validateSeverityObservationValueP(SeverityObservation2 sev
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SeverityObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SeverityObservationOperations.java
index 0b11e71cda..11e1a7c785 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SeverityObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SeverityObservationOperations.java
@@ -85,7 +85,7 @@ protected SeverityObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -152,7 +152,7 @@ public static boolean validateSeverityObservationTextReference(SeverityObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -219,7 +219,7 @@ public static boolean validateSeverityObservationTextReferenceValue(SeverityObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -286,7 +286,7 @@ public static boolean validateSeverityObservationReferenceValue(SeverityObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -352,7 +352,7 @@ public static boolean validateSeverityObservationTemplateId(SeverityObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -418,7 +418,7 @@ public static boolean validateSeverityObservationClassCode(SeverityObservation s
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -485,7 +485,7 @@ public static boolean validateSeverityObservationMoodCode(SeverityObservation se
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -550,7 +550,7 @@ public static boolean validateSeverityObservationCode(SeverityObservation severi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -616,7 +616,7 @@ public static boolean validateSeverityObservationText(SeverityObservation severi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -684,7 +684,7 @@ public static boolean validateSeverityObservationStatusCode(SeverityObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -749,7 +749,7 @@ public static boolean validateSeverityObservationValue(SeverityObservation sever
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SEVERITY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SmokingStatusMeaningfulUse2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SmokingStatusMeaningfulUse2Operations.java
index c756a39e0c..17ca049786 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SmokingStatusMeaningfulUse2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SmokingStatusMeaningfulUse2Operations.java
@@ -83,7 +83,7 @@ protected SmokingStatusMeaningfulUse2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_MEANINGFUL_USE2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_MEANINGFUL_USE2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -152,7 +152,7 @@ public static boolean validateSmokingStatusMeaningfulUse2TemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_MEANINGFUL_USE2_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_MEANINGFUL_USE2_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -321,7 +321,7 @@ public static boolean validateSmokingStatusMeaningfulUse2CDCodeTermAssertionOrLo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSmokingStatusMeaningfulUse2AuthorParticipation(SmokingStatusMeaningfulUse2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Smoking Status Meaningful Use2 Author Participation</em>}' operation.
@@ -342,7 +342,7 @@ public static boolean validateSmokingStatusMeaningfulUse2CDCodeTermAssertionOrLo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_MEANINGFUL_USE2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_MEANINGFUL_USE2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSmokingStatusMeaningfulUse2CDCodeTermAssertionOrLoinc(SmokingStatusMeaningfulUse2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Smoking Status Meaningful Use2 CD Code Term Assertion Or Loinc</em>}' operation.
@@ -363,7 +363,7 @@ public static boolean validateSmokingStatusMeaningfulUse2CDCodeTermAssertionOrLo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_MEANINGFUL_USE2_CD_CODE_TERM_ASSERTION_OR_LOINC__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_MEANINGFUL_USE2_CD_CODE_TERM_ASSERTION_OR_LOINC__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -412,7 +412,7 @@ public static boolean validateSmokingStatusObservationCodeP(SmokingStatusMeaning
 					"org.openhealthtools.mdht.uml.cda.consol.SmokingStatusObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.SmokingStatusObservationCodeP", passToken);
 				}
 				passToken.add(smokingStatusMeaningfulUse2);
@@ -444,7 +444,7 @@ public static boolean validateSmokingStatusObservationCodeP(SmokingStatusMeaning
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -518,7 +518,7 @@ public static boolean validateSmokingStatusObservationCode(SmokingStatusMeaningf
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -569,7 +569,7 @@ public static boolean validateSmokingStatusObservationValueP(
 					"org.openhealthtools.mdht.uml.cda.consol.SmokingStatusObservationValueP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.SmokingStatusObservationValueP", passToken);
 				}
 				passToken.add(smokingStatusMeaningfulUse2);
@@ -601,7 +601,7 @@ public static boolean validateSmokingStatusObservationValueP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -675,7 +675,7 @@ public static boolean validateSmokingStatusObservationValue(SmokingStatusMeaning
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -744,7 +744,7 @@ public static boolean validateSmokingStatusObservationEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_IVLTS_CENTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_IVLTS_CENTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -818,7 +818,7 @@ public static boolean validateSmokingStatusObservationIVLTSCenter(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -892,7 +892,7 @@ public static boolean validateSmokingStatusObservationIVLTSHigh(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -966,7 +966,7 @@ public static boolean validateSmokingStatusObservationIVLTSLow(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_IVLTS_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_IVLTS_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SmokingStatusObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SmokingStatusObservationOperations.java
index 0f4a906edb..f8142c15ee 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SmokingStatusObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SmokingStatusObservationOperations.java
@@ -102,7 +102,7 @@ protected SmokingStatusObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -169,7 +169,7 @@ public static boolean validateSmokingStatusObservationTemplateId(SmokingStatusOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -236,7 +236,7 @@ public static boolean validateSmokingStatusObservationClassCode(SmokingStatusObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -303,7 +303,7 @@ public static boolean validateSmokingStatusObservationMoodCode(SmokingStatusObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -464,7 +464,7 @@ public static boolean validateSmokingStatusObservationStatusCodeP(SmokingStatusO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSmokingStatusObservationStatusCodeP(SmokingStatusObservation, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Smoking Status Observation Status Code P</em>}' operation.
@@ -485,7 +485,7 @@ public static boolean validateSmokingStatusObservationStatusCodeP(SmokingStatusO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSmokingStatusObservationEffectiveTime(SmokingStatusObservation, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Smoking Status Observation Effective Time</em>}' operation.
@@ -506,7 +506,7 @@ public static boolean validateSmokingStatusObservationStatusCodeP(SmokingStatusO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -986,7 +986,7 @@ public static boolean validateSmokingStatusObservationIVLTSWidth(SmokingStatusOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSmokingStatusObservationValueP(SmokingStatusObservation, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Smoking Status Observation Value P</em>}' operation.
@@ -1007,7 +1007,7 @@ public static boolean validateSmokingStatusObservationIVLTSWidth(SmokingStatusOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SMOKING_STATUS_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSmokingStatusObservationCDCodeTermAssertionOrLoinc(SmokingStatusObservation, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Smoking Status Observation CD Code Term Assertion Or Loinc</em>}' operation.
@@ -1028,7 +1028,7 @@ public static boolean validateSmokingStatusObservationIVLTSWidth(SmokingStatusOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_CD_CODE_TERM_ASSERTION_OR_LOINC__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_CD_CODE_TERM_ASSERTION_OR_LOINC__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSmokingStatusObservationCDCode(SmokingStatusObservation, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Smoking Status Observation CD Code</em>}' operation.
@@ -1049,7 +1049,7 @@ public static boolean validateSmokingStatusObservationIVLTSWidth(SmokingStatusOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_CD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_CD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSmokingStatusObservationCDCodeSystem(SmokingStatusObservation, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Smoking Status Observation CD Code System</em>}' operation.
@@ -1070,7 +1070,7 @@ public static boolean validateSmokingStatusObservationIVLTSWidth(SmokingStatusOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_CD_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_CD_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSmokingStatusObservationIVLTSCenter(SmokingStatusObservation, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Smoking Status Observation IVLTS Center</em>}' operation.
@@ -1091,7 +1091,7 @@ public static boolean validateSmokingStatusObservationIVLTSWidth(SmokingStatusOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_IVLTS_CENTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_IVLTS_CENTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSmokingStatusObservationIVLTSHigh(SmokingStatusObservation, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Smoking Status Observation IVLTS High</em>}' operation.
@@ -1117,7 +1117,7 @@ public static boolean validateSmokingStatusObservationIVLTSWidth(SmokingStatusOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSmokingStatusObservationIVLTSLow(SmokingStatusObservation, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Smoking Status Observation IVLTS Low</em>}' operation.
@@ -1138,7 +1138,7 @@ public static boolean validateSmokingStatusObservationIVLTSWidth(SmokingStatusOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSmokingStatusObservationIVLTSWidth(SmokingStatusObservation, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Smoking Status Observation IVLTS Width</em>}' operation.
@@ -1159,7 +1159,7 @@ public static boolean validateSmokingStatusObservationIVLTSWidth(SmokingStatusOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_IVLTS_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SMOKING_STATUS_OBSERVATION_IVLTS_WIDTH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SocialHistoryObservation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SocialHistoryObservation2Operations.java
index 572f3312f5..bfb54c385b 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SocialHistoryObservation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SocialHistoryObservation2Operations.java
@@ -87,7 +87,7 @@ protected SocialHistoryObservation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION2_REFERENCE_ATTRIBUTE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION2_REFERENCE_ATTRIBUTE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -157,7 +157,7 @@ public static boolean validateSocialHistoryObservation2ReferenceAttribute(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION2_IF_NOT_LOINC_REQUIRE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION2_IF_NOT_LOINC_REQUIRE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -227,7 +227,7 @@ public static boolean validateSocialHistoryObservation2IfNotLoincRequireTranslat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION2_IF_NOT_LOINC_REQUIRE_TRANSLATION_FROM_LOINC__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION2_IF_NOT_LOINC_REQUIRE_TRANSLATION_FROM_LOINC__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -298,7 +298,7 @@ public static boolean validateSocialHistoryObservation2IfNotLoincRequireTranslat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -396,7 +396,7 @@ public static boolean validateSocialHistoryObservationStatusCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.SocialHistoryObservationStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.SocialHistoryObservationStatusCodeP", passToken);
 				}
@@ -720,7 +720,7 @@ public static boolean validateSocialHistoryObservationCode(SocialHistoryObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSocialHistoryObservation2EffectiveTime(SocialHistoryObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Social History Observation2 Effective Time</em>}' operation.
@@ -741,7 +741,7 @@ public static boolean validateSocialHistoryObservationCode(SocialHistoryObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION2_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSocialHistoryObservation2AuthorParticipation(SocialHistoryObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Social History Observation2 Author Participation</em>}' operation.
@@ -762,7 +762,7 @@ public static boolean validateSocialHistoryObservationCode(SocialHistoryObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSocialHistoryObservation2CDTranslation(SocialHistoryObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Social History Observation2 CD Translation</em>}' operation.
@@ -785,7 +785,7 @@ public static boolean validateSocialHistoryObservationCode(SocialHistoryObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SOCIAL_HISTORY_OBSERVATION2_CD_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SOCIAL_HISTORY_OBSERVATION2_CD_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSocialHistoryObservation2CDTranslationP(SocialHistoryObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Social History Observation2 CD Translation P</em>}' operation.
@@ -806,7 +806,7 @@ public static boolean validateSocialHistoryObservationCode(SocialHistoryObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SOCIAL_HISTORY_OBSERVATION2_CD_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SOCIAL_HISTORY_OBSERVATION2_CD_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSocialHistoryObservationCode(SocialHistoryObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Social History Observation Code</em>}' operation.
@@ -829,7 +829,7 @@ public static boolean validateSocialHistoryObservationCode(SocialHistoryObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSocialHistoryObservationCodeP(SocialHistoryObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Social History Observation Code P</em>}' operation.
@@ -850,7 +850,7 @@ public static boolean validateSocialHistoryObservationCode(SocialHistoryObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -917,7 +917,7 @@ public static boolean validateSocialHistoryObservationCodeP(SocialHistoryObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateSocialHistoryObservationValue(SocialHistoryObservation2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Social History Observation Value</em>}' operation.
@@ -938,7 +938,7 @@ public static boolean validateSocialHistoryObservationCodeP(SocialHistoryObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SocialHistoryObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SocialHistoryObservationOperations.java
index 56f393a6a6..44c3b04de3 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SocialHistoryObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SocialHistoryObservationOperations.java
@@ -86,7 +86,7 @@ protected SocialHistoryObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -154,7 +154,7 @@ public static boolean validateSocialHistoryObservationOriginalText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -221,7 +221,7 @@ public static boolean validateSocialHistoryObservationReference(SocialHistoryObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -290,7 +290,7 @@ public static boolean validateSocialHistoryObservationReferenceValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -357,7 +357,7 @@ public static boolean validateSocialHistoryObservationTemplateId(SocialHistoryOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -424,7 +424,7 @@ public static boolean validateSocialHistoryObservationClassCode(SocialHistoryObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -491,7 +491,7 @@ public static boolean validateSocialHistoryObservationMoodCode(SocialHistoryObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -557,7 +557,7 @@ public static boolean validateSocialHistoryObservationId(SocialHistoryObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -606,7 +606,7 @@ public static boolean validateSocialHistoryObservationCodeP(SocialHistoryObserva
 					"org.openhealthtools.mdht.uml.cda.consol.SocialHistoryObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.SocialHistoryObservationCodeP", passToken);
 				}
 				passToken.add(socialHistoryObservation);
@@ -638,7 +638,7 @@ public static boolean validateSocialHistoryObservationCodeP(SocialHistoryObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -713,7 +713,7 @@ public static boolean validateSocialHistoryObservationCode(SocialHistoryObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -780,7 +780,7 @@ public static boolean validateSocialHistoryObservationStatusCode(SocialHistoryOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SocialHistorySection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SocialHistorySection2Operations.java
index 1e1ad7613c..47c428d3b9 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SocialHistorySection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SocialHistorySection2Operations.java
@@ -98,7 +98,7 @@ protected SocialHistorySection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -165,7 +165,7 @@ public static boolean validateSocialHistorySection2TemplateId(SocialHistorySecti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION2_CAREGIVER_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION2_CAREGIVER_CHARACTERISTICS__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -233,7 +233,7 @@ public static boolean validateSocialHistorySection2CaregiverCharacteristics(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION2_CULTURAL_AND_RELIGIOUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION2_CULTURAL_AND_RELIGIOUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -302,7 +302,7 @@ public static boolean validateSocialHistorySection2CulturalAndReligiousObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION2_CHARACTERISTICS_OF_HOME_ENVIRONMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION2_CHARACTERISTICS_OF_HOME_ENVIRONMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -371,7 +371,7 @@ public static boolean validateSocialHistorySection2CharacteristicsOfHomeEnvironm
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION2_BIRTH_SEX_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION2_BIRTH_SEX_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -467,7 +467,7 @@ public static EList<SocialHistoryObservation2> getConsolSocialHistoryObservation
 		@SuppressWarnings("unchecked")
 		Collection<SocialHistoryObservation2> result = (Collection<SocialHistoryObservation2>) query.evaluate(
 			socialHistorySection2);
-		return new BasicEList.UnmodifiableEList<SocialHistoryObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -517,7 +517,7 @@ public static EList<SmokingStatusMeaningfulUse2> getConsolCurrentSmokingStatus2s
 		@SuppressWarnings("unchecked")
 		Collection<SmokingStatusMeaningfulUse2> result = (Collection<SmokingStatusMeaningfulUse2>) query.evaluate(
 			socialHistorySection2);
-		return new BasicEList.UnmodifiableEList<SmokingStatusMeaningfulUse2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -564,7 +564,7 @@ public static EList<TobaccoUse2> getConsolTobaccoUse2s(SocialHistorySection2 soc
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_TOBACCO_USE2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<TobaccoUse2> result = (Collection<TobaccoUse2>) query.evaluate(socialHistorySection2);
-		return new BasicEList.UnmodifiableEList<TobaccoUse2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -613,7 +613,7 @@ public static EList<CaregiverCharacteristics> getCaregiverCharacteristicss(
 		@SuppressWarnings("unchecked")
 		Collection<CaregiverCharacteristics> result = (Collection<CaregiverCharacteristics>) query.evaluate(
 			socialHistorySection2);
-		return new BasicEList.UnmodifiableEList<CaregiverCharacteristics>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -663,7 +663,7 @@ public static EList<CulturalAndReligiousObservation> getCulturalAndReligiousObse
 		@SuppressWarnings("unchecked")
 		Collection<CulturalAndReligiousObservation> result = (Collection<CulturalAndReligiousObservation>) query.evaluate(
 			socialHistorySection2);
-		return new BasicEList.UnmodifiableEList<CulturalAndReligiousObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -713,7 +713,7 @@ public static EList<CharacteristicsOfHomeEnvironment> getCharacteristicsOfHomeEn
 		@SuppressWarnings("unchecked")
 		Collection<CharacteristicsOfHomeEnvironment> result = (Collection<CharacteristicsOfHomeEnvironment>) query.evaluate(
 			socialHistorySection2);
-		return new BasicEList.UnmodifiableEList<CharacteristicsOfHomeEnvironment>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -761,7 +761,7 @@ public static EList<BirthSexObservation> getBirthSexObservations(SocialHistorySe
 		@SuppressWarnings("unchecked")
 		Collection<BirthSexObservation> result = (Collection<BirthSexObservation>) query.evaluate(
 			socialHistorySection2);
-		return new BasicEList.UnmodifiableEList<BirthSexObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -783,7 +783,7 @@ public static EList<BirthSexObservation> getBirthSexObservations(SocialHistorySe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -832,7 +832,7 @@ public static boolean validateSocialHistorySectionCodeP(SocialHistorySection2 so
 					"org.openhealthtools.mdht.uml.cda.consol.SocialHistorySectionCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.SocialHistorySectionCodeP", passToken);
 				}
 				passToken.add(socialHistorySection2);
@@ -863,7 +863,7 @@ public static boolean validateSocialHistorySectionCodeP(SocialHistorySection2 so
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -936,7 +936,7 @@ public static boolean validateSocialHistorySectionCode(SocialHistorySection2 soc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_SOCIAL_HISTORY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_SOCIAL_HISTORY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1004,7 +1004,7 @@ public static boolean validateSocialHistorySectionSocialHistoryObservation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_SMOKING_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_SMOKING_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1073,7 +1073,7 @@ public static boolean validateSocialHistorySectionSmokingStatusObservation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_TOBACCO_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_TOBACCO_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SocialHistorySectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SocialHistorySectionOperations.java
index 55edfa9627..ec5adf4078 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SocialHistorySectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SocialHistorySectionOperations.java
@@ -96,7 +96,7 @@ protected SocialHistorySectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -165,7 +165,7 @@ public static boolean validateSocialHistorySectionTemplateId(SocialHistorySectio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -230,7 +230,7 @@ public static boolean validateSocialHistorySectionCode(SocialHistorySection soci
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -295,7 +295,7 @@ public static boolean validateSocialHistorySectionCodeP(SocialHistorySection soc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -360,7 +360,7 @@ public static boolean validateSocialHistorySectionTitle(SocialHistorySection soc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -425,7 +425,7 @@ public static boolean validateSocialHistorySectionText(SocialHistorySection soci
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_SOCIAL_HISTORY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_SOCIAL_HISTORY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -493,7 +493,7 @@ public static boolean validateSocialHistorySectionSocialHistoryObservation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_PREGNANCY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_PREGNANCY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -560,7 +560,7 @@ public static boolean validateSocialHistorySectionPregnancyObservation(SocialHis
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_SMOKING_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_SMOKING_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -628,7 +628,7 @@ public static boolean validateSocialHistorySectionSmokingStatusObservation(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_TOBACCO_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SOCIAL_HISTORY_SECTION_TOBACCO_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -723,7 +723,7 @@ public static EList<SocialHistoryObservation> getSocialHistoryObservations(
 		@SuppressWarnings("unchecked")
 		Collection<SocialHistoryObservation> result = (Collection<SocialHistoryObservation>) query.evaluate(
 			socialHistorySection);
-		return new BasicEList.UnmodifiableEList<SocialHistoryObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -771,7 +771,7 @@ public static EList<PregnancyObservation> getPregnancyObservations(SocialHistory
 		@SuppressWarnings("unchecked")
 		Collection<PregnancyObservation> result = (Collection<PregnancyObservation>) query.evaluate(
 			socialHistorySection);
-		return new BasicEList.UnmodifiableEList<PregnancyObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -821,7 +821,7 @@ public static EList<SmokingStatusObservation> getSmokingStatusObservations(
 		@SuppressWarnings("unchecked")
 		Collection<SmokingStatusObservation> result = (Collection<SmokingStatusObservation>) query.evaluate(
 			socialHistorySection);
-		return new BasicEList.UnmodifiableEList<SmokingStatusObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -868,7 +868,7 @@ public static EList<TobaccoUse> getTobaccoUses(SocialHistorySection socialHistor
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_TOBACCO_USES__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<TobaccoUse> result = (Collection<TobaccoUse>) query.evaluate(socialHistorySection);
-		return new BasicEList.UnmodifiableEList<TobaccoUse>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // SocialHistorySectionOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/StudyActOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/StudyActOperations.java
index ad9825edde..444dd34e9d 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/StudyActOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/StudyActOperations.java
@@ -91,7 +91,7 @@ protected StudyActOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_IDS_HAVE_ROOT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_IDS_HAVE_ROOT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -155,7 +155,7 @@ public static boolean validateStudyActIdsHaveRoot(StudyAct studyAct, DiagnosticC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_NO_ID_EXTENSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_NO_ID_EXTENSION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -219,7 +219,7 @@ public static boolean validateStudyActNoIdExtension(StudyAct studyAct, Diagnosti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -283,7 +283,7 @@ public static boolean validateStudyActTextReference(StudyAct studyAct, Diagnosti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -348,7 +348,7 @@ public static boolean validateStudyActTextReferenceValue(StudyAct studyAct, Diag
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -412,7 +412,7 @@ public static boolean validateStudyActReferenceValue(StudyAct studyAct, Diagnost
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -476,7 +476,7 @@ public static boolean validateStudyActTemplateId(StudyAct studyAct, DiagnosticCh
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -540,7 +540,7 @@ public static boolean validateStudyActClassCode(StudyAct studyAct, DiagnosticCha
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -604,7 +604,7 @@ public static boolean validateStudyActMoodCode(StudyAct studyAct, DiagnosticChai
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -668,7 +668,7 @@ public static boolean validateStudyActId(StudyAct studyAct, DiagnosticChain diag
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -731,7 +731,7 @@ public static boolean validateStudyActCode(StudyAct studyAct, DiagnosticChain di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -795,7 +795,7 @@ public static boolean validateStudyActEffectiveTime(StudyAct studyAct, Diagnosti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -858,7 +858,7 @@ public static boolean validateStudyActText(StudyAct studyAct, DiagnosticChain di
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_SERIES_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_STUDY_ACT_SERIES_ACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SubjectiveSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SubjectiveSectionOperations.java
index 8517f76a2f..cc2d8817d6 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SubjectiveSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SubjectiveSectionOperations.java
@@ -79,7 +79,7 @@ protected SubjectiveSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBJECTIVE_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBJECTIVE_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -146,7 +146,7 @@ public static boolean validateSubjectiveSectionTemplateId(SubjectiveSection subj
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBJECTIVE_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBJECTIVE_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -211,7 +211,7 @@ public static boolean validateSubjectiveSectionCode(SubjectiveSection subjective
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBJECTIVE_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBJECTIVE_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -276,7 +276,7 @@ public static boolean validateSubjectiveSectionCodeP(SubjectiveSection subjectiv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBJECTIVE_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBJECTIVE_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -341,7 +341,7 @@ public static boolean validateSubjectiveSectionText(SubjectiveSection subjective
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBJECTIVE_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBJECTIVE_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SubstanceAdministeredActOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SubstanceAdministeredActOperations.java
index a7e35ba853..8f9bf7ece5 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SubstanceAdministeredActOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SubstanceAdministeredActOperations.java
@@ -80,7 +80,7 @@ protected SubstanceAdministeredActOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_ADMINISTERED_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_ADMINISTERED_ACT_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -147,7 +147,7 @@ public static boolean validateSubstanceAdministeredActTemplateId(SubstanceAdmini
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_ADMINISTERED_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_ADMINISTERED_ACT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -214,7 +214,7 @@ public static boolean validateSubstanceAdministeredActClassCode(SubstanceAdminis
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_ADMINISTERED_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_ADMINISTERED_ACT_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -281,7 +281,7 @@ public static boolean validateSubstanceAdministeredActMoodCode(SubstanceAdminist
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_ADMINISTERED_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_ADMINISTERED_ACT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -347,7 +347,7 @@ public static boolean validateSubstanceAdministeredActId(SubstanceAdministeredAc
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_ADMINISTERED_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_ADMINISTERED_ACT_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -396,7 +396,7 @@ public static boolean validateSubstanceAdministeredActCodeP(SubstanceAdministere
 					"org.openhealthtools.mdht.uml.cda.consol.SubstanceAdministeredActCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.SubstanceAdministeredActCodeP", passToken);
 				}
 				passToken.add(substanceAdministeredAct);
@@ -428,7 +428,7 @@ public static boolean validateSubstanceAdministeredActCodeP(SubstanceAdministere
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_ADMINISTERED_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_ADMINISTERED_ACT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -503,7 +503,7 @@ public static boolean validateSubstanceAdministeredActCode(SubstanceAdministered
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_ADMINISTERED_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_ADMINISTERED_ACT_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -570,7 +570,7 @@ public static boolean validateSubstanceAdministeredActStatusCode(SubstanceAdmini
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_ADMINISTERED_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_ADMINISTERED_ACT_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -637,7 +637,7 @@ public static boolean validateSubstanceAdministeredActStatusCodeP(SubstanceAdmin
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_ADMINISTERED_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_ADMINISTERED_ACT_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SubstanceOrDeviceAllergyObservation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SubstanceOrDeviceAllergyObservation2Operations.java
index 5fd4e8e3c4..305e0ebaef 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SubstanceOrDeviceAllergyObservation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SubstanceOrDeviceAllergyObservation2Operations.java
@@ -118,7 +118,7 @@ protected SubstanceOrDeviceAllergyObservation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION2_CRITICALITY_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION2_CRITICALITY_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -190,7 +190,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservation2CriticalityInv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -260,7 +260,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservation2TemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -331,7 +331,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservation2AuthorParticip
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION2_CRITICALITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION2_CRITICALITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -402,7 +402,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservation2CriticalityObs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION2_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION2_IVLTS_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -477,7 +477,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservation2IVLTSLow(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION2_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION2_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -552,7 +552,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservation2IVLTSHigh(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ALLERGY_SPECIFIC_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ALLERGY_SPECIFIC_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -629,7 +629,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ALLERGY_CLASS_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ALLERGY_CLASS_MEDICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -706,7 +706,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ALLERGY_FOOD_OTHER_SUBSTANCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ALLERGY_FOOD_OTHER_SUBSTANCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -811,7 +811,7 @@ public static EList<ReactionObservation2> getConsolReactionObservation2s(
 		@SuppressWarnings("unchecked")
 		Collection<ReactionObservation2> result = (Collection<ReactionObservation2>) query.evaluate(
 			substanceOrDeviceAllergyObservation2);
-		return new BasicEList.UnmodifiableEList<ReactionObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -973,7 +973,7 @@ public static AllergyStatusObservation2 getConsolAllergyStatusObservation2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_REACTION_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_REACTION_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1045,7 +1045,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationReactionInversi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_SEVERITY_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_SEVERITY_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1117,7 +1117,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationSeverityInversi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_ALLERGY_STATUS_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_ALLERGY_STATUS_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1189,7 +1189,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationAllergyStatusIn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1259,7 +1259,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1312,7 +1312,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationValueP(
 					"org.openhealthtools.mdht.uml.cda.consol.SubstanceOrDeviceAllergyObservationValueP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.SubstanceOrDeviceAllergyObservationValueP", passToken);
 				}
@@ -1345,7 +1345,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationValueP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1424,7 +1424,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1477,7 +1477,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.SubstanceOrDeviceAllergyObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.SubstanceOrDeviceAllergyObservationCodeP", passToken);
 				}
@@ -1510,7 +1510,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1589,7 +1589,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1659,7 +1659,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipant(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_REACTION_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_REACTION_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1730,7 +1730,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationReactionObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_SEVERITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_SEVERITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1801,7 +1801,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationSeverityObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_ALLERGY_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_ALLERGY_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1872,7 +1872,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationAllergyStatusOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1949,7 +1949,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2026,7 +2026,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2103,7 +2103,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2180,7 +2180,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2257,7 +2257,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2334,7 +2334,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2411,7 +2411,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SubstanceOrDeviceAllergyObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SubstanceOrDeviceAllergyObservationOperations.java
index 98ab5acade..b83522c24e 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SubstanceOrDeviceAllergyObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SubstanceOrDeviceAllergyObservationOperations.java
@@ -113,7 +113,7 @@ protected SubstanceOrDeviceAllergyObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_ALLERGY_STATUS_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_ALLERGY_STATUS_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -185,7 +185,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationAllergyStatusIn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_REACTION_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_REACTION_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -256,7 +256,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationReactionInversi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_SEVERITY_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_SEVERITY_INVERSION_INDICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -327,7 +327,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationSeverityInversi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -397,7 +397,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -467,7 +467,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -537,7 +537,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -607,7 +607,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -660,7 +660,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.SubstanceOrDeviceAllergyObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.SubstanceOrDeviceAllergyObservationCodeP", passToken);
 				}
@@ -693,7 +693,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -773,7 +773,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -843,7 +843,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -913,7 +913,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -985,7 +985,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1055,7 +1055,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationValue(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1125,7 +1125,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationValueP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_ALLERGY_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_ALLERGY_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1196,7 +1196,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationAllergyStatusOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_REACTION_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_REACTION_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1267,7 +1267,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationReactionObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_SEVERITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_SEVERITY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1338,7 +1338,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationSeverityObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1408,7 +1408,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipant(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CE_ORIGINAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1485,7 +1485,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CE_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1562,7 +1562,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ORIGINAL_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1639,7 +1639,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1716,7 +1716,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_ORIGINAL_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1793,7 +1793,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CODE_TERMINOLOGY_VALUE_SET_GROUP_SRFI__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CODE_TERMINOLOGY_VALUE_SET_GROUP_SRFI__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1870,7 +1870,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1947,7 +1947,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2024,7 +2024,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2101,7 +2101,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE_PLAYING_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2178,7 +2178,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantPart
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2254,7 +2254,7 @@ public static boolean validateSubstanceOrDeviceAllergyObservationParticipantType
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_SUBSTANCE_OR_DEVICE_ALLERGY_OBSERVATION_PARTICIPANT_PARTICIPANT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2403,7 +2403,7 @@ public static EList<ReactionObservation> getReactionObservations(
 		@SuppressWarnings("unchecked")
 		Collection<ReactionObservation> result = (Collection<ReactionObservation>) query.evaluate(
 			substanceOrDeviceAllergyObservation);
-		return new BasicEList.UnmodifiableEList<ReactionObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SurgicalDrainsSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SurgicalDrainsSectionOperations.java
index 56df2a3736..23c2695f0b 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SurgicalDrainsSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/SurgicalDrainsSectionOperations.java
@@ -79,7 +79,7 @@ protected SurgicalDrainsSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SURGICAL_DRAINS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SURGICAL_DRAINS_SECTION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -148,7 +148,7 @@ public static boolean validateSurgicalDrainsSectionTemplateId(SurgicalDrainsSect
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SURGICAL_DRAINS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SURGICAL_DRAINS_SECTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -213,7 +213,7 @@ public static boolean validateSurgicalDrainsSectionCode(SurgicalDrainsSection su
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SURGICAL_DRAINS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SURGICAL_DRAINS_SECTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -279,7 +279,7 @@ public static boolean validateSurgicalDrainsSectionCodeP(SurgicalDrainsSection s
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SURGICAL_DRAINS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SURGICAL_DRAINS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -344,7 +344,7 @@ public static boolean validateSurgicalDrainsSectionText(SurgicalDrainsSection su
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_SURGICAL_DRAINS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_SURGICAL_DRAINS_SECTION_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/TextObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/TextObservationOperations.java
index 1d5187499a..ec27e8b758 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/TextObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/TextObservationOperations.java
@@ -95,7 +95,7 @@ protected TextObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -160,7 +160,7 @@ public static boolean validateTextObservationTextReference(TextObservation textO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -227,7 +227,7 @@ public static boolean validateTextObservationTextReferenceValue(TextObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -292,7 +292,7 @@ public static boolean validateTextObservationReferenceValue(TextObservation text
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -357,7 +357,7 @@ public static boolean validateTextObservationTemplateId(TextObservation textObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -422,7 +422,7 @@ public static boolean validateTextObservationClassCode(TextObservation textObser
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -487,7 +487,7 @@ public static boolean validateTextObservationMoodCode(TextObservation textObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -552,7 +552,7 @@ public static boolean validateTextObservationCode(TextObservation textObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -617,7 +617,7 @@ public static boolean validateTextObservationEffectiveTime(TextObservation textO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -682,7 +682,7 @@ public static boolean validateTextObservationText(TextObservation textObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -747,7 +747,7 @@ public static boolean validateTextObservationValue(TextObservation textObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_SOP_INSTANCE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_SOP_INSTANCE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -814,7 +814,7 @@ public static boolean validateTextObservationSOPInstanceObservation(TextObservat
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_QUANTITY_MEASUREMENT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TEXT_OBSERVATION_QUANTITY_MEASUREMENT_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -907,7 +907,7 @@ public static EList<SOPInstanceObservation> getSOPInstanceObservations(TextObser
 		@SuppressWarnings("unchecked")
 		Collection<SOPInstanceObservation> result = (Collection<SOPInstanceObservation>) query.evaluate(
 			textObservation);
-		return new BasicEList.UnmodifiableEList<SOPInstanceObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -957,7 +957,7 @@ public static EList<QuantityMeasurementObservation> getQuantityMeasurementObserv
 		@SuppressWarnings("unchecked")
 		Collection<QuantityMeasurementObservation> result = (Collection<QuantityMeasurementObservation>) query.evaluate(
 			textObservation);
-		return new BasicEList.UnmodifiableEList<QuantityMeasurementObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // TextObservationOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/TobaccoUse2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/TobaccoUse2Operations.java
index 142d2266cd..ac4722815d 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/TobaccoUse2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/TobaccoUse2Operations.java
@@ -82,7 +82,7 @@ protected TobaccoUse2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -147,7 +147,7 @@ public static boolean validateTobaccoUse2TemplateId(TobaccoUse2 tobaccoUse2, Dia
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE2_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE2_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -400,7 +400,7 @@ public static boolean validateTobaccoUseEffectiveTime(TobaccoUse2 tobaccoUse2, D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateTobaccoUse2AuthorParticipation(TobaccoUse2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Tobacco Use2 Author Participation</em>}' operation.
@@ -421,7 +421,7 @@ public static boolean validateTobaccoUseEffectiveTime(TobaccoUse2 tobaccoUse2, D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateTobaccoUse2CDCodeTermAssertionOrLoinc(TobaccoUse2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Tobacco Use2 CD Code Term Assertion Or Loinc</em>}' operation.
@@ -442,7 +442,7 @@ public static boolean validateTobaccoUseEffectiveTime(TobaccoUse2 tobaccoUse2, D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TOBACCO_USE2_CD_CODE_TERM_ASSERTION_OR_LOINC__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TOBACCO_USE2_CD_CODE_TERM_ASSERTION_OR_LOINC__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateTobaccoUse2IVLTSHigh(TobaccoUse2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Tobacco Use2 IVLTS High</em>}' operation.
@@ -463,7 +463,7 @@ public static boolean validateTobaccoUseEffectiveTime(TobaccoUse2 tobaccoUse2, D
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TOBACCO_USE2_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TOBACCO_USE2_IVLTS_HIGH__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -510,7 +510,7 @@ public static boolean validateTobaccoUseCodeP(TobaccoUse2 tobaccoUse2, Diagnosti
 					"org.openhealthtools.mdht.uml.cda.consol.TobaccoUseCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.TobaccoUseCodeP", passToken);
 				}
 				passToken.add(tobaccoUse2);
@@ -541,7 +541,7 @@ public static boolean validateTobaccoUseCodeP(TobaccoUse2 tobaccoUse2, Diagnosti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateTobaccoUseEffectiveTime(TobaccoUse2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Tobacco Use Effective Time</em>}' operation.
@@ -562,7 +562,7 @@ public static boolean validateTobaccoUseCodeP(TobaccoUse2 tobaccoUse2, Diagnosti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/TobaccoUseOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/TobaccoUseOperations.java
index 70b2d63589..8e3191b8e9 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/TobaccoUseOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/TobaccoUseOperations.java
@@ -88,7 +88,7 @@ protected TobaccoUseOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_EFFECTIVE_TIME_LOW__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -153,7 +153,7 @@ public static boolean validateTobaccoUseEffectiveTimeLow(TobaccoUse tobaccoUse,
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -218,7 +218,7 @@ public static boolean validateTobaccoUseTemplateId(TobaccoUse tobaccoUse, Diagno
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -282,7 +282,7 @@ public static boolean validateTobaccoUseClassCode(TobaccoUse tobaccoUse, Diagnos
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -346,7 +346,7 @@ public static boolean validateTobaccoUseMoodCode(TobaccoUse tobaccoUse, Diagnost
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -455,7 +455,7 @@ public static boolean validateTobaccoUseEffectiveTime(TobaccoUse tobaccoUse, Dia
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -520,7 +520,7 @@ public static boolean validateTobaccoUseStatusCode(TobaccoUse tobaccoUse, Diagno
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateTobaccoUseEffectiveTime(TobaccoUse, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Tobacco Use Effective Time</em>}' operation.
@@ -541,7 +541,7 @@ public static boolean validateTobaccoUseStatusCode(TobaccoUse tobaccoUse, Diagno
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -608,7 +608,7 @@ public static boolean validateTobaccoUseStatusCodeP(TobaccoUse tobaccoUse, Diagn
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -672,7 +672,7 @@ public static boolean validateTobaccoUseValue(TobaccoUse tobaccoUse, DiagnosticC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TOBACCO_USE_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -736,7 +736,7 @@ public static boolean validateTobaccoUseValueP(TobaccoUse tobaccoUse, Diagnostic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TOBACCO_USE_CD_CODE_TERM_ASSERTION_OR_LOINC__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TOBACCO_USE_CD_CODE_TERM_ASSERTION_OR_LOINC__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -808,7 +808,7 @@ public static boolean validateTobaccoUseCDCodeTermAssertionOrLoinc(TobaccoUse to
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TOBACCO_USE_CD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TOBACCO_USE_CD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -878,7 +878,7 @@ public static boolean validateTobaccoUseCDCode(TobaccoUse tobaccoUse, Diagnostic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TOBACCO_USE_CD_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TOBACCO_USE_CD_CODE_SYSTEM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/TransferSummaryOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/TransferSummaryOperations.java
index 05c1856504..37314bc716 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/TransferSummaryOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/TransferSummaryOperations.java
@@ -199,7 +199,7 @@ protected TransferSummaryOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_HAS_AN_ASSEMENT_AND_PLAN_SECTION2_OR_BOTH_ASSEMENT_SECTION_AND_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_HAS_AN_ASSEMENT_AND_PLAN_SECTION2_OR_BOTH_ASSEMENT_SECTION_AND_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -270,7 +270,7 @@ public static boolean validateTransferSummaryHasAnAssementAndPlanSection2OrBothA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_DOES_NOT_HAVE_ASSEMENT_AND_PLAN_SECTION2_WHEN_ASSEMENT_AND_PLAN_OF_TREATMENT2_ARE_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_DOES_NOT_HAVE_ASSEMENT_AND_PLAN_SECTION2_WHEN_ASSEMENT_AND_PLAN_OF_TREATMENT2_ARE_PRESENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -341,7 +341,7 @@ public static boolean validateTransferSummaryDoesNotHaveAssementAndPlanSection2W
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -389,7 +389,7 @@ public static boolean validateTransferSummaryCodeP(TransferSummary transferSumma
 					"org.openhealthtools.mdht.uml.cda.consol.TransferSummaryCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.TransferSummaryCodeP", passToken);
 				}
 				passToken.add(transferSummary);
@@ -421,7 +421,7 @@ public static boolean validateTransferSummaryCodeP(TransferSummary transferSumma
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -494,7 +494,7 @@ public static boolean validateTransferSummaryCode(TransferSummary transferSummar
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -559,7 +559,7 @@ public static boolean validateTransferSummaryTitle(TransferSummary transferSumma
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_SUPPORT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_SUPPORT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -626,7 +626,7 @@ public static boolean validateTransferSummaryParticipantSupport(TransferSummary
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -693,7 +693,7 @@ public static boolean validateTransferSummaryParticipantCallbackContact(Transfer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -758,7 +758,7 @@ public static boolean validateTransferSummaryDocumentationOf(TransferSummary tra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_ADVANCE_DIRECTIVES_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_ADVANCE_DIRECTIVES_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -825,7 +825,7 @@ public static boolean validateTransferSummaryAdvanceDirectivesSection2(TransferS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_ALLERGIES_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_ALLERGIES_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -892,7 +892,7 @@ public static boolean validateTransferSummaryAllergiesSection2(TransferSummary t
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_PHYSICAL_EXAM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_PHYSICAL_EXAM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -959,7 +959,7 @@ public static boolean validateTransferSummaryPhysicalExamSection2(TransferSummar
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_ENCOUNTERS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_ENCOUNTERS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1026,7 +1026,7 @@ public static boolean validateTransferSummaryEncountersSection2(TransferSummary
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_FAMILY_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_FAMILY_HISTORY_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1093,7 +1093,7 @@ public static boolean validateTransferSummaryFamilyHistorySection(TransferSummar
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_FUNCTIONAL_STATUS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_FUNCTIONAL_STATUS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1160,7 +1160,7 @@ public static boolean validateTransferSummaryFunctionalStatusSection2(TransferSu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_IMMUNIZATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1228,7 +1228,7 @@ public static boolean validateTransferSummaryImmunizationsSectionEntriesOptional
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_MEDICAL_EQUIPMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_MEDICAL_EQUIPMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1295,7 +1295,7 @@ public static boolean validateTransferSummaryMedicalEquipmentSection2(TransferSu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_MEDICATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_MEDICATIONS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1362,7 +1362,7 @@ public static boolean validateTransferSummaryMedicationsSection2(TransferSummary
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_PAYERS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_PAYERS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1427,7 +1427,7 @@ public static boolean validateTransferSummaryPayersSection2(TransferSummary tran
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_PLAN_OF_TREATMENT_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1494,7 +1494,7 @@ public static boolean validateTransferSummaryPlanOfTreatmentSection2(TransferSum
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_PROBLEM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_PROBLEM_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1559,7 +1559,7 @@ public static boolean validateTransferSummaryProblemSection2(TransferSummary tra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_PROCEDURES_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_PROCEDURES_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1626,7 +1626,7 @@ public static boolean validateTransferSummaryProceduresSection2(TransferSummary
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_RESULTS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_RESULTS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1691,7 +1691,7 @@ public static boolean validateTransferSummaryResultsSection2(TransferSummary tra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_SOCIAL_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_SOCIAL_HISTORY_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1758,7 +1758,7 @@ public static boolean validateTransferSummarySocialHistorySection2(TransferSumma
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_VITAL_SIGNS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_VITAL_SIGNS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1825,7 +1825,7 @@ public static boolean validateTransferSummaryVitalSignsSection2(TransferSummary
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_MENTAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_MENTAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1892,7 +1892,7 @@ public static boolean validateTransferSummaryMentalStatusSection(TransferSummary
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_GENERAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_GENERAL_STATUS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1959,7 +1959,7 @@ public static boolean validateTransferSummaryGeneralStatusSection(TransferSummar
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_REVIEW_OF_SYSTEMS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2026,7 +2026,7 @@ public static boolean validateTransferSummaryReviewOfSystemsSection(TransferSumm
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_NUTRITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_NUTRITION_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2092,7 +2092,7 @@ public static boolean validateTransferSummaryNutritionSection(TransferSummary tr
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_REASON_FOR_REFERRAL_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_REASON_FOR_REFERRAL_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2159,7 +2159,7 @@ public static boolean validateTransferSummaryReasonForReferralSection2(TransferS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_HISTORY_OF_PAST_ILLNESS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_HISTORY_OF_PAST_ILLNESS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2226,7 +2226,7 @@ public static boolean validateTransferSummaryHistoryOfPastIllnessSection2(Transf
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_HISTORY_OF_PRESENT_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_HISTORY_OF_PRESENT_ILLNESS_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2293,7 +2293,7 @@ public static boolean validateTransferSummaryHistoryOfPresentIllnessSection(Tran
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_ASSESSMENT_AND_PLAN_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_ASSESSMENT_AND_PLAN_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2360,7 +2360,7 @@ public static boolean validateTransferSummaryAssessmentAndPlanSection2(TransferS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_ASSESSMENT_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2427,7 +2427,7 @@ public static boolean validateTransferSummaryAssessmentSection(TransferSummary t
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_DISCHARGE_DIAGNOSIS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_DISCHARGE_DIAGNOSIS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2494,7 +2494,7 @@ public static boolean validateTransferSummaryDischargeDiagnosisSection2(Transfer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_ADMISSION_MEDICATIONS_SECTION_ENTRIES_OPTIONAL2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2563,7 +2563,7 @@ public static boolean validateTransferSummaryAdmissionMedicationsSectionEntriesO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_ADMISSION_DIAGNOSIS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_ADMISSION_DIAGNOSIS_SECTION2__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2630,7 +2630,7 @@ public static boolean validateTransferSummaryAdmissionDiagnosisSection2(Transfer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_COURSE_OF_CARE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_TRANSFER_SUMMARY_COURSE_OF_CARE_SECTION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2697,7 +2697,7 @@ public static boolean validateTransferSummaryCourseOfCareSection(TransferSummary
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_SUPPORT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_SUPPORT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2771,7 +2771,7 @@ public static boolean validateTransferSummaryParticipantSupportAssociatedEntityA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_SUPPORT_ASSOCIATED_ENTITY_CLASS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_SUPPORT_ASSOCIATED_ENTITY_CLASS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2826,7 +2826,7 @@ public static boolean validateTransferSummaryParticipantSupportAssociatedEntityC
 						"org.openhealthtools.mdht.uml.cda.consol.TransferSummaryParticipantSupportAssociatedEntityClassCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.TransferSummaryParticipantSupportAssociatedEntityClassCodeP",
 							passToken);
@@ -2861,7 +2861,7 @@ public static boolean validateTransferSummaryParticipantSupportAssociatedEntityC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_SUPPORT_ASSOCIATED_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_SUPPORT_ASSOCIATED_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2945,7 +2945,7 @@ public static boolean validateTransferSummaryParticipantSupportAssociatedEntityC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_SUPPORT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_SUPPORT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3019,7 +3019,7 @@ public static boolean validateTransferSummaryParticipantSupportAssociatedEntityA
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_SUPPORT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_SUPPORT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3091,7 +3091,7 @@ public static boolean validateTransferSummaryParticipantSupportTypeCode(Transfer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_SUPPORT_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_SUPPORT_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3164,7 +3164,7 @@ public static boolean validateTransferSummaryParticipantSupportAssociatedEntity(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3239,7 +3239,7 @@ public static boolean validateTransferSummaryParticipantCallbackContactAssociate
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3313,7 +3313,7 @@ public static boolean validateTransferSummaryParticipantCallbackContactAssociate
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3387,7 +3387,7 @@ public static boolean validateTransferSummaryParticipantCallbackContactAssociate
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3461,7 +3461,7 @@ public static boolean validateTransferSummaryParticipantCallbackContactAssociate
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3535,7 +3535,7 @@ public static boolean validateTransferSummaryParticipantCallbackContactAssociate
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_ASSOCIATED_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3610,7 +3610,7 @@ public static boolean validateTransferSummaryParticipantCallbackContactAssociate
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_SCOPING_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY_SCOPING_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3685,7 +3685,7 @@ public static boolean validateTransferSummaryParticipantCallbackContactAssociate
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3758,7 +3758,7 @@ public static boolean validateTransferSummaryParticipantCallbackContactTypeCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_PARTICIPANT_CALLBACK_CONTACT_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3832,7 +3832,7 @@ public static boolean validateTransferSummaryParticipantCallbackContactAssociate
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3906,7 +3906,7 @@ public static boolean validateTransferSummaryDocumentationOfServiceEventPerforme
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_FUNCTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_FUNCTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3961,7 +3961,7 @@ public static boolean validateTransferSummaryDocumentationOfServiceEventPerforme
 						"org.openhealthtools.mdht.uml.cda.consol.TransferSummaryDocumentationOfServiceEventPerformerFunctionCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.TransferSummaryDocumentationOfServiceEventPerformerFunctionCodeP",
 							passToken);
@@ -3996,7 +3996,7 @@ public static boolean validateTransferSummaryDocumentationOfServiceEventPerforme
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_FUNCTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_FUNCTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4080,7 +4080,7 @@ public static boolean validateTransferSummaryDocumentationOfServiceEventPerforme
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_DOCUMENTATION_OF_SERVICE_EVENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_DOCUMENTATION_OF_SERVICE_EVENT_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4153,7 +4153,7 @@ public static boolean validateTransferSummaryDocumentationOfServiceEventClassCod
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_DOCUMENTATION_OF_SERVICE_EVENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_DOCUMENTATION_OF_SERVICE_EVENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4226,7 +4226,7 @@ public static boolean validateTransferSummaryDocumentationOfServiceEventCode(Tra
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4300,7 +4300,7 @@ public static boolean validateTransferSummaryDocumentationOfServiceEventPerforme
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_TRANSFER_SUMMARY_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5689,7 +5689,7 @@ public static CourseOfCareSection getCourseOfCareSection(TransferSummary transfe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/UDIOrganizerOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/UDIOrganizerOperations.java
index 91f886bbd3..57d09ee147 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/UDIOrganizerOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/UDIOrganizerOperations.java
@@ -128,7 +128,7 @@ protected UDIOrganizerOperations() {
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -191,7 +191,7 @@ public static boolean validateUDIOrganizerTemplateId(UDIOrganizer udiOrganizer,
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -253,7 +253,7 @@ public static boolean validateUDIOrganizerId(UDIOrganizer udiOrganizer, Diagnost
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -300,7 +300,7 @@ public static boolean validateUDIOrganizerCodeP(UDIOrganizer udiOrganizer, Diagn
 					"org.openhealthtools.mdht.uml.cda.consol.UDIOrganizerCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.UDIOrganizerCodeP", passToken);
 				}
 				passToken.add(udiOrganizer);
@@ -331,7 +331,7 @@ public static boolean validateUDIOrganizerCodeP(UDIOrganizer udiOrganizer, Diagn
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -402,7 +402,7 @@ public static boolean validateUDIOrganizerCode(UDIOrganizer udiOrganizer, Diagno
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -449,7 +449,7 @@ public static boolean validateUDIOrganizerStatusCodeP(UDIOrganizer udiOrganizer,
 					"org.openhealthtools.mdht.uml.cda.consol.UDIOrganizerStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.UDIOrganizerStatusCodeP", passToken);
 				}
 				passToken.add(udiOrganizer);
@@ -479,7 +479,7 @@ public static boolean validateUDIOrganizerStatusCodeP(UDIOrganizer udiOrganizer,
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -550,7 +550,7 @@ public static boolean validateUDIOrganizerStatusCode(UDIOrganizer udiOrganizer,
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -613,7 +613,7 @@ public static boolean validateUDIOrganizerClassCode(UDIOrganizer udiOrganizer, D
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -676,7 +676,7 @@ public static boolean validateUDIOrganizerMoodCode(UDIOrganizer udiOrganizer, Di
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_DEVICE_IDENTIFIER_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_DEVICE_IDENTIFIER_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -741,7 +741,7 @@ public static boolean validateUDIOrganizerDeviceIdentifierObservation(UDIOrganiz
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_LOT_OR_BATCH_NUMBER_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_LOT_OR_BATCH_NUMBER_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -806,7 +806,7 @@ public static boolean validateUDIOrganizerLotOrBatchNumberObservation(UDIOrganiz
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_SERIAL_NUMBER_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_SERIAL_NUMBER_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -871,7 +871,7 @@ public static boolean validateUDIOrganizerSerialNumberObservation(UDIOrganizer u
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_MANUFACTURING_DATE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_MANUFACTURING_DATE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -936,7 +936,7 @@ public static boolean validateUDIOrganizerManufacturingDateObservation(UDIOrgani
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_EXPIRATION_DATE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_EXPIRATION_DATE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1001,7 +1001,7 @@ public static boolean validateUDIOrganizerExpirationDateObservation(UDIOrganizer
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_DISTINCT_IDENTIFICATION_CODE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_DISTINCT_IDENTIFICATION_CODE_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1067,7 +1067,7 @@ public static boolean validateUDIOrganizerDistinctIdentificationCodeObservation(
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_BRAND_NAME_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_BRAND_NAME_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1131,7 +1131,7 @@ public static boolean validateUDIOrganizerBrandNameObservation(UDIOrganizer udiO
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_MODEL_NUMBER_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_MODEL_NUMBER_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1196,7 +1196,7 @@ public static boolean validateUDIOrganizerModelNumberObservation(UDIOrganizer ud
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_COMPANY_NAME_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_COMPANY_NAME_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1261,7 +1261,7 @@ public static boolean validateUDIOrganizerCompanyNameObservation(UDIOrganizer ud
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_CATALOG_NUMBER_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_CATALOG_NUMBER_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1326,7 +1326,7 @@ public static boolean validateUDIOrganizerCatalogNumberObservation(UDIOrganizer
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_LATEX_SAFETY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_LATEX_SAFETY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1391,7 +1391,7 @@ public static boolean validateUDIOrganizerLatexSafetyObservation(UDIOrganizer ud
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_MRI_SAFETY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_MRI_SAFETY_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1455,7 +1455,7 @@ public static boolean validateUDIOrganizerMRISafetyObservation(UDIOrganizer udiO
 	 * @generated
 	 * @ordered
 	 */
-	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_IMPLANTABLE_DEVICE_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UDI_ORGANIZER_IMPLANTABLE_DEVICE_STATUS_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/USRealmHeader2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/USRealmHeader2Operations.java
index 1700b9e488..ee3dd62374 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/USRealmHeader2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/USRealmHeader2Operations.java
@@ -161,7 +161,7 @@ protected USRealmHeader2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_DOC_CODES_ONLY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_DOC_CODES_ONLY__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -226,7 +226,7 @@ public static boolean validateUSRealmHeader2DocCodesOnly(USRealmHeader2 usRealmH
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -293,7 +293,7 @@ public static boolean validateUSRealmHeader2TemplateId(USRealmHeader2 usRealmHea
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_CODE_TERMINOLOGY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_CODE_TERMINOLOGY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -367,7 +367,7 @@ public static boolean validateUSRealmHeader2RecordTargetPatientRolePatientGuardi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_RECORD_TARGET_PATIENT_ROLE_PATIENT_TS_BIRTH_TIME_PRECISE_TO_MINUTE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_RECORD_TARGET_PATIENT_ROLE_PATIENT_TS_BIRTH_TIME_PRECISE_TO_MINUTE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -441,7 +441,7 @@ public static boolean validateUSRealmHeader2RecordTargetPatientRolePatientTSBirt
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_RECORD_TARGET_PATIENT_ROLE_PATIENT_SDTC_ETHNIC_GROUP_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_RECORD_TARGET_PATIENT_ROLE_PATIENT_SDTC_ETHNIC_GROUP_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -496,7 +496,7 @@ public static boolean validateUSRealmHeader2RecordTargetPatientRolePatientSDTCEt
 						"org.openhealthtools.mdht.uml.cda.consol.USRealmHeader2RecordTargetPatientRolePatientSDTCEthnicGroupCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.USRealmHeader2RecordTargetPatientRolePatientSDTCEthnicGroupCodeP",
 							passToken);
@@ -531,7 +531,7 @@ public static boolean validateUSRealmHeader2RecordTargetPatientRolePatientSDTCEt
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_RECORD_TARGET_PATIENT_ROLE_PATIENT_SDTC_ETHNIC_GROUP_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_RECORD_TARGET_PATIENT_ROLE_PATIENT_SDTC_ETHNIC_GROUP_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2463,7 +2463,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRolePat
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCodeP",
 							passToken);
@@ -3414,7 +3414,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRole(US
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_AUTHOR_ASSIGNED_AUTHOR_IF_ASSIGNED_PERSON_THEN_CONTAINS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_AUTHOR_ASSIGNED_AUTHOR_IF_ASSIGNED_PERSON_THEN_CONTAINS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateUSRealmHeader2AuthorAssignedAuthorCodeTerminology(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate US Realm Header2 Author Assigned Author Code Terminology</em>}' operation.
@@ -3435,7 +3435,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRole(US
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_AUTHOR_ASSIGNED_AUTHOR_CODE_TERMINOLOGY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_AUTHOR_ASSIGNED_AUTHOR_CODE_TERMINOLOGY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateUSRealmHeader2InformationRecipientIntendedRecipientId(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate US Realm Header2 Information Recipient Intended Recipient Id</em>}' operation.
@@ -3456,7 +3456,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRole(US
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateUSRealmHeader2LegalAuthenticatorSDTCSignatureText(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate US Realm Header2 Legal Authenticator SDTC Signature Text</em>}' operation.
@@ -3477,7 +3477,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRole(US
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_LEGAL_AUTHENTICATOR_SDTC_SIGNATURE_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_LEGAL_AUTHENTICATOR_SDTC_SIGNATURE_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateUSRealmHeader2AuthenticatorSDTCSignatureText(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate US Realm Header2 Authenticator SDTC Signature Text</em>}' operation.
@@ -3498,7 +3498,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRole(US
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_AUTHENTICATOR_SDTC_SIGNATURE_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_AUTHENTICATOR_SDTC_SIGNATURE_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateUSRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUSRealmAddressStreet(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate US Realm Header2 Informant Assigned Entity General Header Constraints US Realm Address US Realm Address Street</em>}' operation.
@@ -3519,7 +3519,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRole(US
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_US_REALM_ADDRESS_STREET__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateUSRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequireStateElement(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate US Realm Header2 Informant Assigned Entity General Header Constraints US Realm Address If Country Is Us Require State Element</em>}' operation.
@@ -3540,7 +3540,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRole(US
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_STATE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateUSRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressIfCountryIsUsRequirePostalCodeElement(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate US Realm Header2 Informant Assigned Entity General Header Constraints US Realm Address If Country Is Us Require Postal Code Element</em>}' operation.
@@ -3561,7 +3561,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRole(US
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_IF_COUNTRY_IS_US_REQUIRE_POSTAL_CODE_ELEMENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateUSRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUse(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate US Realm Header2 Informant Assigned Entity General Header Constraints US Realm Address Use</em>}' operation.
@@ -3584,7 +3584,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRole(US
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateUSRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressUseP(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate US Realm Header2 Informant Assigned Entity General Header Constraints US Realm Address Use P</em>}' operation.
@@ -3605,7 +3605,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRole(US
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_USE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateUSRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressCountry(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate US Realm Header2 Informant Assigned Entity General Header Constraints US Realm Address Country</em>}' operation.
@@ -3626,7 +3626,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRole(US
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_COUNTRY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateUSRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressState(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate US Realm Header2 Informant Assigned Entity General Header Constraints US Realm Address State</em>}' operation.
@@ -3647,7 +3647,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRole(US
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateUSRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressCity(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate US Realm Header2 Informant Assigned Entity General Header Constraints US Realm Address City</em>}' operation.
@@ -3668,7 +3668,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRole(US
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_CITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateUSRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressPostalCode(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate US Realm Header2 Informant Assigned Entity General Header Constraints US Realm Address Postal Code</em>}' operation.
@@ -3689,7 +3689,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRole(US
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_POSTAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateUSRealmHeader2InformantAssignedEntityGeneralHeaderConstraintsUSRealmAddressStreetAddressLine(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate US Realm Header2 Informant Assigned Entity General Header Constraints US Realm Address Street Address Line</em>}' operation.
@@ -3710,7 +3710,7 @@ public static boolean validateGeneralHeaderConstraintsRecordTargetPatientRole(US
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_INFORMANT_ASSIGNED_ENTITY_GENERAL_HEADER_CONSTRAINTS_US_REALM_ADDRESS_STREET_ADDRESS_LINE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3765,7 +3765,7 @@ public static boolean validateGeneralHeaderConstraintsDataEntererAssignedEntityC
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsDataEntererAssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsDataEntererAssignedEntityCodeP",
 							passToken);
@@ -3946,7 +3946,7 @@ public static boolean validateGeneralHeaderConstraintsAuthorAssignedAuthorCodeP(
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsAuthorAssignedAuthorCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsAuthorAssignedAuthorCodeP",
 							passToken);
@@ -4146,7 +4146,7 @@ public static boolean validateGeneralHeaderConstraintsInformationRecipientIntend
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateUSRealmHeader2GeneralHeaderConstraintsInformantRelatedEntity(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate US Realm Header2 General Header Constraints Informant Related Entity</em>}' operation.
@@ -4167,7 +4167,7 @@ public static boolean validateGeneralHeaderConstraintsInformationRecipientIntend
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER2_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4221,7 +4221,7 @@ public static boolean validateGeneralHeaderConstraintsInformantAssignedEntityCod
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsInformantAssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsInformantAssignedEntityCodeP",
 							passToken);
@@ -4668,7 +4668,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCodeP",
 							passToken);
@@ -4766,7 +4766,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_REALM_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_REALM_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsTitle(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Title</em>}' operation.
@@ -4787,7 +4787,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTarget(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target</em>}' operation.
@@ -4808,7 +4808,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsDataEnterer(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Data Enterer</em>}' operation.
@@ -4829,7 +4829,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsAuthor(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Author</em>}' operation.
@@ -4850,7 +4850,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsCustodian(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Custodian</em>}' operation.
@@ -4871,7 +4871,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsInformationRecipient(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Information Recipient</em>}' operation.
@@ -4892,7 +4892,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsLegalAuthenticator(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Legal Authenticator</em>}' operation.
@@ -4913,7 +4913,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_LEGAL_AUTHENTICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsAuthenticator(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Authenticator</em>}' operation.
@@ -4934,7 +4934,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHENTICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsInformant(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Informant</em>}' operation.
@@ -4955,7 +4955,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsInFulfillmentOf(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints In Fulfillment Of</em>}' operation.
@@ -4976,7 +4976,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_IN_FULFILLMENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_IN_FULFILLMENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsComponentOf(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Component Of</em>}' operation.
@@ -4997,7 +4997,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_COMPONENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsSupportParticipant(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Support Participant</em>}' operation.
@@ -5018,7 +5018,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_SUPPORT_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_SUPPORT_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsDocumentationOf(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Documentation Of</em>}' operation.
@@ -5039,7 +5039,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsAuthorization(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Authorization</em>}' operation.
@@ -5060,7 +5060,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHORIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHORIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTELUse(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Guardian TEL Use</em>}' operation.
@@ -5081,7 +5081,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_TEL_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_TEL_USE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCodeFromPersonalRelationshipOrResponsibleParty(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Guardian Code From Personal Relationship Or Responsible Party</em>}' operation.
@@ -5102,7 +5102,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_CODE_FROM_PERSONAL_RELATIONSHIP_OR_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_CODE_FROM_PERSONAL_RELATIONSHIP_OR_RESPONSIBLE_PARTY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianCode(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Guardian Code</em>}' operation.
@@ -5123,7 +5123,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientGuardianTelecom(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Guardian Telecom</em>}' operation.
@@ -5144,7 +5144,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCodeP(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Language Communication Language Code P</em>}' operation.
@@ -5165,7 +5165,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_LANGUAGE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_LANGUAGE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationLanguageCode(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Language Communication Language Code</em>}' operation.
@@ -5188,7 +5188,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_LANGUAGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_LANGUAGE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunicationPreferenceInd(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Language Communication Preference Ind</em>}' operation.
@@ -5209,7 +5209,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_PREFERENCE_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_PREFERENCE_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToYear(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient TS Birth Time Precise To Year</em>}' operation.
@@ -5230,7 +5230,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_TS_BIRTH_TIME_PRECISE_TO_YEAR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_TS_BIRTH_TIME_PRECISE_TO_YEAR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientTSBirthTimePreciseToDay(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient TS Birth Time Precise To Day</em>}' operation.
@@ -5251,7 +5251,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_TS_BIRTH_TIME_PRECISE_TO_DAY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_TS_BIRTH_TIME_PRECISE_TO_DAY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientTSValue(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient TS Value</em>}' operation.
@@ -5272,7 +5272,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_TS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_TS_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlaceHasState(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Birthplace Place Has State</em>}' operation.
@@ -5293,7 +5293,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_BIRTHPLACE_PLACE_HAS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_BIRTHPLACE_PLACE_HAS_STATE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplacePlace(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Birthplace Place</em>}' operation.
@@ -5314,7 +5314,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_BIRTHPLACE_PLACE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_BIRTHPLACE_PLACE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCode(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Race Code</em>}' operation.
@@ -5337,7 +5337,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_RACE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_RACE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientRaceCodeP(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Race Code P</em>}' operation.
@@ -5358,7 +5358,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_RACE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_RACE_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCode(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Ethnic Group Code</em>}' operation.
@@ -5381,7 +5381,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_ETHNIC_GROUP_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_ETHNIC_GROUP_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientEthnicGroupCodeP(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Ethnic Group Code P</em>}' operation.
@@ -5402,7 +5402,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_ETHNIC_GROUP_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_ETHNIC_GROUP_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientBirthTime(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Birth Time</em>}' operation.
@@ -5423,7 +5423,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_BIRTH_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_BIRTH_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientGuardian(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Guardian</em>}' operation.
@@ -5444,7 +5444,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientLanguageCommunication(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Language Communication</em>}' operation.
@@ -5465,7 +5465,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatientBirthplace(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient Birthplace</em>}' operation.
@@ -5486,7 +5486,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_BIRTHPLACE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT_BIRTHPLACE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRolePatient(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role Patient</em>}' operation.
@@ -5507,7 +5507,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE_PATIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsRecordTargetPatientRole(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Record Target Patient Role</em>}' operation.
@@ -5528,7 +5528,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_RECORD_TARGET_PATIENT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsDataEntererAssignedEntityCodeP(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Data Enterer Assigned Entity Code P</em>}' operation.
@@ -5549,7 +5549,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsDataEntererAssignedEntityCode(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Data Enterer Assigned Entity Code</em>}' operation.
@@ -5572,7 +5572,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsDataEntererAssignedEntity(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Data Enterer Assigned Entity</em>}' operation.
@@ -5593,7 +5593,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DATA_ENTERER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsAuthorAssignedAuthorCodeP(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Author Assigned Author Code P</em>}' operation.
@@ -5614,7 +5614,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsAuthorAssignedAuthorCode(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Author Assigned Author Code</em>}' operation.
@@ -5635,7 +5635,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsAuthorAssignedAuthor(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Author Assigned Author</em>}' operation.
@@ -5656,7 +5656,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_AUTHOR_ASSIGNED_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsInformationRecipientIntendedRecipient(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Information Recipient Intended Recipient</em>}' operation.
@@ -5677,7 +5677,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMATION_RECIPIENT_INTENDED_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMATION_RECIPIENT_INTENDED_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsInformantAssignedEntityCodeP(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Informant Assigned Entity Code P</em>}' operation.
@@ -5698,7 +5698,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsInformantAssignedEntityCode(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Informant Assigned Entity Code</em>}' operation.
@@ -5721,7 +5721,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsInformantAssignedEntityAddr(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Informant Assigned Entity Addr</em>}' operation.
@@ -5742,7 +5742,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_ASSIGNED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsInformantRelatedEntityAddr(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Informant Related Entity Addr</em>}' operation.
@@ -5763,7 +5763,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsInformantRelatedEntityPerson(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Informant Related Entity Person</em>}' operation.
@@ -5784,7 +5784,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_RELATED_ENTITY_PERSON__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsInformantHasAssignedEntityOrRelatedEntity(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Informant Has Assigned Entity Or Related Entity</em>}' operation.
@@ -5805,7 +5805,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_HAS_ASSIGNED_ENTITY_OR_RELATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_INFORMANT_HAS_ASSIGNED_ENTITY_OR_RELATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsComponentOfEncompassingEncounter(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Component Of Encompassing Encounter</em>}' operation.
@@ -5826,7 +5826,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_COMPONENT_OF_ENCOMPASSING_ENCOUNTER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsParticipantSupportAssociatedEntityHasAssociatedPersonOrScopingOrganization(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Participant Support Associated Entity Has Associated Person Or Scoping Organization</em>}' operation.
@@ -5847,7 +5847,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_PARTICIPANT_SUPPORT_ASSOCIATED_ENTITY_HAS_ASSOCIATED_PERSON_OR_SCOPING_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_PARTICIPANT_SUPPORT_ASSOCIATED_ENTITY_HAS_ASSOCIATED_PERSON_OR_SCOPING_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCodeP(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Documentation Of Service Event Performer1 Assigned Entity Code P</em>}' operation.
@@ -5868,7 +5868,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsDocumentationOfServiceEventPerformer1AssignedEntityCode(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Documentation Of Service Event Performer1 Assigned Entity Code</em>}' operation.
@@ -5891,7 +5891,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateGeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCodeP(USRealmHeader2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate General Header Constraints Documentation Of Service Event Performer1 Function Code P</em>}' operation.
@@ -5912,7 +5912,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_FUNCTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_FUNCTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5968,7 +5968,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 						"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.GeneralHeaderConstraintsDocumentationOfServiceEventPerformer1FunctionCodeP",
 							passToken);
@@ -6003,7 +6003,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_FUNCTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_FUNCTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6088,7 +6088,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER1_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6163,7 +6163,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -6237,7 +6237,7 @@ public static boolean validateGeneralHeaderConstraintsDocumentationOfServiceEven
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_GENERAL_HEADER_CONSTRAINTS_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/USRealmHeaderPatientGeneratedDocumentOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/USRealmHeaderPatientGeneratedDocumentOperations.java
index d1fa769c63..cc80833b49 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/USRealmHeaderPatientGeneratedDocumentOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/USRealmHeaderPatientGeneratedDocumentOperations.java
@@ -147,7 +147,7 @@ protected USRealmHeaderPatientGeneratedDocumentOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -217,7 +217,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentRecordTarget(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -287,7 +287,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentAuthor(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DATA_ENTERER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DATA_ENTERER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -357,7 +357,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentDataEnterer(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_INFORMANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_INFORMANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -427,7 +427,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentInformant(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -497,7 +497,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentCustodian(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_INFORMATION_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -568,7 +568,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentInformationRe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_LEGAL_AUTHENTICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_LEGAL_AUTHENTICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -639,7 +639,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentLegalAuthenti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHENTICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHENTICATOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -709,7 +709,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentAuthenticator
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_PARTICIPANT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -779,7 +779,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentParticipant(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_IN_FULFILLMENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_IN_FULFILLMENT_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -850,7 +850,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentInFulfillment
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -921,7 +921,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentDocumentation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -998,7 +998,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentRecordTargetP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1056,7 +1056,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentRecordTargetP
 						"org.openhealthtools.mdht.uml.cda.consol.USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardianCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.USRealmHeaderPatientGeneratedDocumentRecordTargetPatientRolePatientGuardianCodeP",
 							passToken);
@@ -1091,7 +1091,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentRecordTargetP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1178,7 +1178,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentRecordTargetP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_PREFERENCE_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION_PREFERENCE_IND__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1255,7 +1255,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentRecordTargetP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_PATIENT_IF_MORE_THAN_ONE_LANG_COMM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_PATIENT_IF_MORE_THAN_ONE_LANG_COMM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1332,7 +1332,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentRecordTargetP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_PATIENT_GUARDIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1409,7 +1409,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentRecordTargetP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_PATIENT_LANGUAGE_COMMUNICATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1486,7 +1486,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentRecordTargetP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1563,7 +1563,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentRecordTargetP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_PATIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_PATIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1640,7 +1640,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentRecordTargetP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE_PROVIDER_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1717,7 +1717,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentRecordTargetP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1794,7 +1794,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentRecordTargetP
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR_CE_CODE_SYSTEM_AND_TERMINOLOGY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR_CE_CODE_SYSTEM_AND_TERMINOLOGY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1871,7 +1871,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentAuthorAssigne
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR_CE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR_CE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1948,7 +1948,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentAuthorAssigne
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2024,7 +2024,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentAuthorAssigne
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2101,7 +2101,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentAuthorAssigne
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2177,7 +2177,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentAuthorAssigne
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DATA_ENTERER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DATA_ENTERER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2235,7 +2235,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentDataEntererAs
 						"org.openhealthtools.mdht.uml.cda.consol.USRealmHeaderPatientGeneratedDocumentDataEntererAssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.USRealmHeaderPatientGeneratedDocumentDataEntererAssignedEntityCodeP",
 							passToken);
@@ -2270,7 +2270,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentDataEntererAs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DATA_ENTERER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DATA_ENTERER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2357,7 +2357,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentDataEntererAs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DATA_ENTERER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DATA_ENTERER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2434,7 +2434,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentDataEntererAs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_INFORMANT_RELATED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_INFORMANT_RELATED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2492,7 +2492,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentInformantRela
 						"org.openhealthtools.mdht.uml.cda.consol.USRealmHeaderPatientGeneratedDocumentInformantRelatedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.USRealmHeaderPatientGeneratedDocumentInformantRelatedEntityCodeP",
 							passToken);
@@ -2527,7 +2527,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentInformantRela
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_INFORMANT_RELATED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_INFORMANT_RELATED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2614,7 +2614,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentInformantRela
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_INFORMANT_HAS_RELATED_ENTITY_OR_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_INFORMANT_HAS_RELATED_ENTITY_OR_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2691,7 +2691,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentInformantHasR
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_INFORMANT_RELATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_INFORMANT_RELATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2767,7 +2767,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentInformantRela
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_CUSTODIAN_ASSIGNED_CUSTODIAN_REPRESENTED_CUSTODIAN_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_CUSTODIAN_ASSIGNED_CUSTODIAN_REPRESENTED_CUSTODIAN_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2844,7 +2844,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentCustodianAssi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_CUSTODIAN_ASSIGNED_CUSTODIAN_REPRESENTED_CUSTODIAN_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_CUSTODIAN_ASSIGNED_CUSTODIAN_REPRESENTED_CUSTODIAN_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2921,7 +2921,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentCustodianAssi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_CUSTODIAN_ASSIGNED_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_CUSTODIAN_ASSIGNED_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2998,7 +2998,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentCustodianAssi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_II_ROOT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_II_ROOT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3075,7 +3075,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentInformationRe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_INFORMATION_RECIPIENT_INTENDED_RECIPIENT_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3152,7 +3152,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentInformationRe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_INFORMATION_RECIPIENT_INTENDED_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_INFORMATION_RECIPIENT_INTENDED_RECIPIENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3229,7 +3229,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentInformationRe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_CE_CODE_SYSTEM_AND_TERMINOLOGY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_CE_CODE_SYSTEM_AND_TERMINOLOGY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3306,7 +3306,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentLegalAuthenti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_CE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_CE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3383,7 +3383,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentLegalAuthenti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3460,7 +3460,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentLegalAuthenti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3537,7 +3537,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentLegalAuthenti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_LEGAL_AUTHENTICATOR_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3614,7 +3614,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentLegalAuthenti
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHENTICATOR_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHENTICATOR_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3691,7 +3691,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentAuthenticator
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHENTICATOR_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHENTICATOR_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3749,7 +3749,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentAuthenticator
 						"org.openhealthtools.mdht.uml.cda.consol.USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.USRealmHeaderPatientGeneratedDocumentAuthenticatorAssignedEntityCodeP",
 							passToken);
@@ -3784,7 +3784,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentAuthenticator
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHENTICATOR_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHENTICATOR_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3871,7 +3871,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentAuthenticator
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHENTICATOR_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_AUTHENTICATOR_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3948,7 +3948,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentAuthenticator
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_PARTICIPANT_ASSOCIATED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_PARTICIPANT_ASSOCIATED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4006,7 +4006,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentParticipantAs
 						"org.openhealthtools.mdht.uml.cda.consol.USRealmHeaderPatientGeneratedDocumentParticipantAssociatedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.USRealmHeaderPatientGeneratedDocumentParticipantAssociatedEntityCodeP",
 							passToken);
@@ -4041,7 +4041,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentParticipantAs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_PARTICIPANT_ASSOCIATED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_PARTICIPANT_ASSOCIATED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4128,7 +4128,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentParticipantAs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_PARTICIPANT_IF_TYPE_CODE_IND_THEN_AE_CLASS_CODE_FROM_IND_ROLECLASS_CODES__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_PARTICIPANT_IF_TYPE_CODE_IND_THEN_AE_CLASS_CODE_FROM_IND_ROLECLASS_CODES__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4205,7 +4205,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentParticipantIf
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_PARTICIPANT_TYPE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4281,7 +4281,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentParticipantTy
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_PARTICIPANT_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_PARTICIPANT_ASSOCIATED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4358,7 +4358,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentParticipantAs
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_IN_FULFILLMENT_OF_ORDER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_IN_FULFILLMENT_OF_ORDER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4434,7 +4434,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentInFulfillment
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_IN_FULFILLMENT_OF_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_IN_FULFILLMENT_OF_ORDER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4510,7 +4510,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentInFulfillment
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4587,7 +4587,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentDocumentation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4645,7 +4645,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentDocumentation
 						"org.openhealthtools.mdht.uml.cda.consol.USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerAssignedEntityCodeP",
 							passToken);
@@ -4680,7 +4680,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentDocumentation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4767,7 +4767,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentDocumentation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_FUNCTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_FUNCTION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4825,7 +4825,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentDocumentation
 						"org.openhealthtools.mdht.uml.cda.consol.USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerFunctionCodeP");
 					if (passToken == null) {
 						// anticipate a reasonably healthy model
-						passToken = new java.util.ArrayList<Object>(3);
+						passToken = new java.util.ArrayList<>(3);
 						context.put(
 							"org.openhealthtools.mdht.uml.cda.consol.USRealmHeaderPatientGeneratedDocumentDocumentationOfServiceEventPerformerFunctionCodeP",
 							passToken);
@@ -4860,7 +4860,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentDocumentation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_FUNCTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_FUNCTION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -4947,7 +4947,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentDocumentation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER_ASSIGNED_ENTITY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5024,7 +5024,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentDocumentation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5101,7 +5101,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentDocumentation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT_PERFORMER__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5178,7 +5178,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentDocumentation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_US_REALM_HEADER_PATIENT_GENERATED_DOCUMENT_DOCUMENTATION_OF_SERVICE_EVENT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -5255,7 +5255,7 @@ public static boolean validateUSRealmHeaderPatientGeneratedDocumentDocumentation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/UnstructuredDocument2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/UnstructuredDocument2Operations.java
index 927bee8887..a08c94edc8 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/UnstructuredDocument2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/UnstructuredDocument2Operations.java
@@ -93,7 +93,7 @@ protected UnstructuredDocument2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_UNSTRUCTURED_DOCUMENT2_RECORD_TARGET__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UNSTRUCTURED_DOCUMENT2_RECORD_TARGET__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -160,7 +160,7 @@ public static boolean validateUnstructuredDocument2RecordTarget(UnstructuredDocu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_UNSTRUCTURED_DOCUMENT2_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UNSTRUCTURED_DOCUMENT2_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -226,7 +226,7 @@ public static boolean validateUnstructuredDocument2Custodian(UnstructuredDocumen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_UNSTRUCTURED_DOCUMENT2_COMPONENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UNSTRUCTURED_DOCUMENT2_COMPONENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -292,7 +292,7 @@ public static boolean validateUnstructuredDocument2Component(UnstructuredDocumen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT2_RECORD_TARGET_PATIENT_ROLE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT2_RECORD_TARGET_PATIENT_ROLE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -366,7 +366,7 @@ public static boolean validateUnstructuredDocument2RecordTargetPatientRoleId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT2_RECORD_TARGET_PATIENT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT2_RECORD_TARGET_PATIENT_ROLE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -439,7 +439,7 @@ public static boolean validateUnstructuredDocument2RecordTargetPatientRole(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT2_CUSTODIAN_ASSIGNED_CUSTODIAN_REPRESENTED_CUSTODIAN_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT2_CUSTODIAN_ASSIGNED_CUSTODIAN_REPRESENTED_CUSTODIAN_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -515,7 +515,7 @@ public static boolean validateUnstructuredDocument2CustodianAssignedCustodianRep
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT2_CUSTODIAN_ASSIGNED_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT2_CUSTODIAN_ASSIGNED_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -589,7 +589,7 @@ public static boolean validateUnstructuredDocument2CustodianAssignedCustodian(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT2_COMPONENT_NON_XML_BODY_ED_MEDIA_TYPE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT2_COMPONENT_NON_XML_BODY_ED_MEDIA_TYPE__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -663,7 +663,7 @@ public static boolean validateUnstructuredDocument2ComponentNonXMLBodyEDMediaTyp
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT2_COMPONENT_NON_XML_BODY_HAS_REFERENCE_OR_REPRESENTATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT2_COMPONENT_NON_XML_BODY_HAS_REFERENCE_OR_REPRESENTATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -738,7 +738,7 @@ public static boolean validateUnstructuredDocument2ComponentNonXMLBodyHasReferen
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT2_COMPONENT_NON_XML_BODY_MEDIA_TYPE_FILE_FORMATS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT2_COMPONENT_NON_XML_BODY_MEDIA_TYPE_FILE_FORMATS__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -812,7 +812,7 @@ public static boolean validateUnstructuredDocument2ComponentNonXMLBodyMediaTypeF
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT2_COMPONENT_NON_XML_BODY_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT2_COMPONENT_NON_XML_BODY_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -885,7 +885,7 @@ public static boolean validateUnstructuredDocument2ComponentNonXMLBodyText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT2_COMPONENT_NON_XML_BODY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT2_COMPONENT_NON_XML_BODY__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -958,7 +958,7 @@ public static boolean validateUnstructuredDocument2ComponentNonXMLBody(Unstructu
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_US_REALM_HEADER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/UnstructuredDocumentOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/UnstructuredDocumentOperations.java
index cd5d4efd01..f3d90b1b8b 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/UnstructuredDocumentOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/UnstructuredDocumentOperations.java
@@ -94,7 +94,7 @@ protected UnstructuredDocumentOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_UNSTRUCTURED_DOCUMENT_RECORD_TARGET__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UNSTRUCTURED_DOCUMENT_RECORD_TARGET__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -161,7 +161,7 @@ public static boolean validateUnstructuredDocumentRecordTarget(UnstructuredDocum
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_UNSTRUCTURED_DOCUMENT_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UNSTRUCTURED_DOCUMENT_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -226,7 +226,7 @@ public static boolean validateUnstructuredDocumentAuthor(UnstructuredDocument un
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_UNSTRUCTURED_DOCUMENT_COMPONENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UNSTRUCTURED_DOCUMENT_COMPONENT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -292,7 +292,7 @@ public static boolean validateUnstructuredDocumentComponent(UnstructuredDocument
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_UNSTRUCTURED_DOCUMENT_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_UNSTRUCTURED_DOCUMENT_CUSTODIAN__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -358,7 +358,7 @@ public static boolean validateUnstructuredDocumentCustodian(UnstructuredDocument
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE2_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE2_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -431,7 +431,7 @@ public static boolean validateUnstructuredDocumentRecordTargetPatientRole2Id(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_RECORD_TARGET_PATIENT_ROLE2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -504,7 +504,7 @@ public static boolean validateUnstructuredDocumentRecordTargetPatientRole2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR2_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR2_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -577,7 +577,7 @@ public static boolean validateUnstructuredDocumentAuthorAssignedAuthor2Addr(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR2_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR2_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -651,7 +651,7 @@ public static boolean validateUnstructuredDocumentAuthorAssignedAuthor2Telecom(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_AUTHOR_ASSIGNED_AUTHOR2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -724,7 +724,7 @@ public static boolean validateUnstructuredDocumentAuthorAssignedAuthor2(Unstruct
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_CUSTODIAN_ASSIGNED_CUSTODIAN3_CUSTODIAN_ORGANIZATION_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_CUSTODIAN_ASSIGNED_CUSTODIAN3_CUSTODIAN_ORGANIZATION_ADDR__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -799,7 +799,7 @@ public static boolean validateUnstructuredDocumentCustodianAssignedCustodian3Cus
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_CUSTODIAN_ASSIGNED_CUSTODIAN3_CUSTODIAN_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_CUSTODIAN_ASSIGNED_CUSTODIAN3_CUSTODIAN_ORGANIZATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -874,7 +874,7 @@ public static boolean validateUnstructuredDocumentCustodianAssignedCustodian3Cus
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_CUSTODIAN_ASSIGNED_CUSTODIAN3_CUSTODIAN_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_CUSTODIAN_ASSIGNED_CUSTODIAN3_CUSTODIAN_ORGANIZATION_NAME__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -949,7 +949,7 @@ public static boolean validateUnstructuredDocumentCustodianAssignedCustodian3Cus
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_CUSTODIAN_ASSIGNED_CUSTODIAN3_CUSTODIAN_ORGANIZATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_CUSTODIAN_ASSIGNED_CUSTODIAN3_CUSTODIAN_ORGANIZATION_TELECOM__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1024,7 +1024,7 @@ public static boolean validateUnstructuredDocumentCustodianAssignedCustodian3Cus
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_CUSTODIAN_ASSIGNED_CUSTODIAN3_CUSTODIAN_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_CUSTODIAN_ASSIGNED_CUSTODIAN3_CUSTODIAN_ORGANIZATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1099,7 +1099,7 @@ public static boolean validateUnstructuredDocumentCustodianAssignedCustodian3Cus
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_CUSTODIAN_ASSIGNED_CUSTODIAN2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_UNSTRUCTURED_DOCUMENT_CUSTODIAN_ASSIGNED_CUSTODIAN2__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1173,7 +1173,7 @@ public static boolean validateUnstructuredDocumentCustodianAssignedCustodian2(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_GENERAL_HEADER_CONSTRAINTS_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignObservation2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignObservation2Operations.java
index be51ca16e0..4fa324dfcc 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignObservation2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignObservation2Operations.java
@@ -86,7 +86,7 @@ protected VitalSignObservation2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -153,7 +153,7 @@ public static boolean validateVitalSignObservation2TemplateId(VitalSignObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_INTERPRETATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_INTERPRETATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -203,7 +203,7 @@ public static boolean validateVitalSignObservationInterpretationCodeP(VitalSignO
 					"org.openhealthtools.mdht.uml.cda.consol.VitalSignObservationInterpretationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.VitalSignObservationInterpretationCodeP", passToken);
 				}
@@ -234,7 +234,7 @@ public static boolean validateVitalSignObservationInterpretationCodeP(VitalSignO
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -312,7 +312,7 @@ public static boolean validateVitalSignObservation2AuthorParticipation(VitalSign
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -379,7 +379,7 @@ public static boolean validateVitalSignObservationTextReference(VitalSignObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -446,7 +446,7 @@ public static boolean validateVitalSignObservationReferenceValue(VitalSignObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -513,7 +513,7 @@ public static boolean validateVitalSignObservationTextReferenceValue(VitalSignOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -581,7 +581,7 @@ public static boolean validateVitalSignObservationEffectiveTime(VitalSignObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -646,7 +646,7 @@ public static boolean validateVitalSignObservationValue(VitalSignObservation2 vi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -713,7 +713,7 @@ public static boolean validateVitalSignObservationText(VitalSignObservation2 vit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_INTERPRETATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_INTERPRETATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -788,7 +788,7 @@ public static boolean validateVitalSignObservationInterpretationCode(VitalSignOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignObservationOperations.java
index 78ed055e59..1a4cf52d20 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignObservationOperations.java
@@ -93,7 +93,7 @@ protected VitalSignObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_TEXT_REFERENCE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -160,7 +160,7 @@ public static boolean validateVitalSignObservationTextReference(VitalSignObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -227,7 +227,7 @@ public static boolean validateVitalSignObservationReferenceValue(VitalSignObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_TEXT_REFERENCE_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -294,7 +294,7 @@ public static boolean validateVitalSignObservationTextReferenceValue(VitalSignOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -361,7 +361,7 @@ public static boolean validateVitalSignObservationTemplateId(VitalSignObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -427,7 +427,7 @@ public static boolean validateVitalSignObservationClassCode(VitalSignObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -493,7 +493,7 @@ public static boolean validateVitalSignObservationMoodCode(VitalSignObservation
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -558,7 +558,7 @@ public static boolean validateVitalSignObservationId(VitalSignObservation vitalS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -606,7 +606,7 @@ public static boolean validateVitalSignObservationCodeP(VitalSignObservation vit
 					"org.openhealthtools.mdht.uml.cda.consol.VitalSignObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.VitalSignObservationCodeP", passToken);
 				}
 				passToken.add(vitalSignObservation);
@@ -638,7 +638,7 @@ public static boolean validateVitalSignObservationCodeP(VitalSignObservation vit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -712,7 +712,7 @@ public static boolean validateVitalSignObservationCode(VitalSignObservation vita
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -779,7 +779,7 @@ public static boolean validateVitalSignObservationStatusCode(VitalSignObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -846,7 +846,7 @@ public static boolean validateVitalSignObservationStatusCodeP(VitalSignObservati
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -913,7 +913,7 @@ public static boolean validateVitalSignObservationEffectiveTime(VitalSignObserva
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -978,7 +978,7 @@ public static boolean validateVitalSignObservationValue(VitalSignObservation vit
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_INTERPRETATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_INTERPRETATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1045,7 +1045,7 @@ public static boolean validateVitalSignObservationInterpretationCode(VitalSignOb
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_METHOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1112,7 +1112,7 @@ public static boolean validateVitalSignObservationMethodCode(VitalSignObservatio
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_TARGET_SITE_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1179,7 +1179,7 @@ public static boolean validateVitalSignObservationTargetSiteCode(VitalSignObserv
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1244,7 +1244,7 @@ public static boolean validateVitalSignObservationText(VitalSignObservation vita
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGN_OBSERVATION_AUTHOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsOrganizer2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsOrganizer2Operations.java
index 9b3dce24b6..b079551137 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsOrganizer2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsOrganizer2Operations.java
@@ -86,7 +86,7 @@ protected VitalSignsOrganizer2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER2_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -180,7 +180,7 @@ public static boolean validateVitalSignsOrganizerCodeP(VitalSignsOrganizer2 vita
 					"org.openhealthtools.mdht.uml.cda.consol.VitalSignsOrganizerCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.VitalSignsOrganizerCodeP", passToken);
 				}
 				passToken.add(vitalSignsOrganizer2);
@@ -210,7 +210,7 @@ public static boolean validateVitalSignsOrganizerCodeP(VitalSignsOrganizer2 vita
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER2_AUTHOR_PARTICIPATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -279,7 +279,7 @@ public static boolean validateVitalSignsOrganizer2AuthorParticipation(VitalSigns
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_VITAL_SIGNS_ORGANIZER2_CD_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_VITAL_SIGNS_ORGANIZER2_CD_TRANSLATION__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -351,7 +351,7 @@ public static boolean validateVitalSignsOrganizer2CDTranslation(VitalSignsOrgani
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_VITAL_SIGNS_ORGANIZER2_CD_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<Query<?, ?, ?>>();
+	protected static ThreadLocal<Query<?, ?, ?>> VALIDATE_VITAL_SIGNS_ORGANIZER2_CD_TRANSLATION_P__DIAGNOSTIC_CHAIN_MAP__EOCL_QRY = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -451,7 +451,7 @@ public static EList<VitalSignObservation2> getConsolVitalSignObservation2s(
 		@SuppressWarnings("unchecked")
 		Collection<VitalSignObservation2> result = (Collection<VitalSignObservation2>) query.evaluate(
 			vitalSignsOrganizer2);
-		return new BasicEList.UnmodifiableEList<VitalSignObservation2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -473,7 +473,7 @@ public static EList<VitalSignObservation2> getConsolVitalSignObservation2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateVitalSignsOrganizerCode(VitalSignsOrganizer2, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Vital Signs Organizer Code</em>}' operation.
@@ -496,7 +496,7 @@ public static EList<VitalSignObservation2> getConsolVitalSignObservation2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -569,7 +569,7 @@ public static boolean validateVitalSignsOrganizerCode(VitalSignsOrganizer2 vital
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -636,7 +636,7 @@ public static boolean validateVitalSignsOrganizerEffectiveTime(VitalSignsOrganiz
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_VITAL_SIGN_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_VITAL_SIGN_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsOrganizerOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsOrganizerOperations.java
index ce52da6295..e544eb5295 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsOrganizerOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsOrganizerOperations.java
@@ -91,7 +91,7 @@ protected VitalSignsOrganizerOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -157,7 +157,7 @@ public static boolean validateVitalSignsOrganizerTemplateId(VitalSignsOrganizer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -223,7 +223,7 @@ public static boolean validateVitalSignsOrganizerClassCode(VitalSignsOrganizer v
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -289,7 +289,7 @@ public static boolean validateVitalSignsOrganizerMoodCode(VitalSignsOrganizer vi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -356,7 +356,7 @@ public static boolean validateVitalSignsOrganizerId(VitalSignsOrganizer vitalSig
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -421,7 +421,7 @@ public static boolean validateVitalSignsOrganizerCode(VitalSignsOrganizer vitalS
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -486,7 +486,7 @@ public static boolean validateVitalSignsOrganizerCodeP(VitalSignsOrganizer vital
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -536,7 +536,7 @@ public static boolean validateVitalSignsOrganizerStatusCodeP(VitalSignsOrganizer
 					"org.openhealthtools.mdht.uml.cda.consol.VitalSignsOrganizerStatusCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.VitalSignsOrganizerStatusCodeP", passToken);
 				}
 				passToken.add(vitalSignsOrganizer);
@@ -567,7 +567,7 @@ public static boolean validateVitalSignsOrganizerStatusCodeP(VitalSignsOrganizer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -641,7 +641,7 @@ public static boolean validateVitalSignsOrganizerStatusCode(VitalSignsOrganizer
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -708,7 +708,7 @@ public static boolean validateVitalSignsOrganizerEffectiveTime(VitalSignsOrganiz
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_VITAL_SIGN_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_ORGANIZER_VITAL_SIGN_OBSERVATION__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -801,7 +801,7 @@ public static EList<VitalSignObservation> getVitalSignObservations(VitalSignsOrg
 		@SuppressWarnings("unchecked")
 		Collection<VitalSignObservation> result = (Collection<VitalSignObservation>) query.evaluate(
 			vitalSignsOrganizer);
-		return new BasicEList.UnmodifiableEList<VitalSignObservation>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // VitalSignsOrganizerOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsSection2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsSection2Operations.java
index 47b1dadb33..1931e018ce 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsSection2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsSection2Operations.java
@@ -83,7 +83,7 @@ protected VitalSignsSection2Operations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION2_NULL_FLAVOR__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -149,7 +149,7 @@ public static boolean validateVitalSignsSection2NullFlavor(VitalSignsSection2 vi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION2_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -214,7 +214,7 @@ public static boolean validateVitalSignsSection2Title(VitalSignsSection2 vitalSi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION2_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -279,7 +279,7 @@ public static boolean validateVitalSignsSection2Text(VitalSignsSection2 vitalSig
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -346,7 +346,7 @@ public static boolean validateVitalSignsSectionEntriesOptionalTemplateId(VitalSi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -396,7 +396,7 @@ public static boolean validateVitalSignsSectionEntriesOptionalCodeP(VitalSignsSe
 					"org.openhealthtools.mdht.uml.cda.consol.VitalSignsSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.VitalSignsSectionEntriesOptionalCodeP", passToken);
 				}
@@ -429,7 +429,7 @@ public static boolean validateVitalSignsSectionEntriesOptionalCodeP(VitalSignsSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -504,7 +504,7 @@ public static boolean validateVitalSignsSectionEntriesOptionalCode(VitalSignsSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_VITAL_SIGNS_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_VITAL_SIGNS_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -599,7 +599,7 @@ public static EList<VitalSignsOrganizer2> getConsolVitalSignsOrganizer2s(VitalSi
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_VITAL_SIGNS_ORGANIZER2S__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<VitalSignsOrganizer2> result = (Collection<VitalSignsOrganizer2>) query.evaluate(vitalSignsSection2);
-		return new BasicEList.UnmodifiableEList<VitalSignsOrganizer2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // VitalSignsSection2Operations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsSectionEntriesOptional2Operations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsSectionEntriesOptional2Operations.java
index dfc66b3246..23f0aa28d9 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsSectionEntriesOptional2Operations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsSectionEntriesOptional2Operations.java
@@ -108,7 +108,7 @@ public static EList<VitalSignsOrganizer2> getConsolVitalSignsOrganizer2s(
 		@SuppressWarnings("unchecked")
 		Collection<VitalSignsOrganizer2> result = (Collection<VitalSignsOrganizer2>) query.evaluate(
 			vitalSignsSectionEntriesOptional2);
-		return new BasicEList.UnmodifiableEList<VitalSignsOrganizer2>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -130,7 +130,7 @@ public static EList<VitalSignsOrganizer2> getConsolVitalSignsOrganizer2s(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -200,7 +200,7 @@ public static boolean validateVitalSignsSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -253,7 +253,7 @@ public static boolean validateVitalSignsSectionEntriesOptionalCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.VitalSignsSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.VitalSignsSectionEntriesOptionalCodeP", passToken);
 				}
@@ -286,7 +286,7 @@ public static boolean validateVitalSignsSectionEntriesOptionalCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -365,7 +365,7 @@ public static boolean validateVitalSignsSectionEntriesOptionalCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_VITAL_SIGNS_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_VITAL_SIGNS_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsSectionEntriesOptionalOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsSectionEntriesOptionalOperations.java
index aa23719f13..577b3bbe74 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsSectionEntriesOptionalOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsSectionEntriesOptionalOperations.java
@@ -87,7 +87,7 @@ protected VitalSignsSectionEntriesOptionalOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -159,7 +159,7 @@ public static boolean validateVitalSignsSectionEntriesOptionalTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -229,7 +229,7 @@ public static boolean validateVitalSignsSectionEntriesOptionalCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -348,7 +348,7 @@ public static boolean validateVitalSignsSectionEntriesOptionalText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * The cached OCL expression body for the '{@link #validateVitalSignsSectionEntriesOptionalText(VitalSignsSectionEntriesOptional, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Validate Vital Signs Section Entries Optional Text</em>}' operation.
@@ -369,7 +369,7 @@ public static boolean validateVitalSignsSectionEntriesOptionalText(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -439,7 +439,7 @@ public static boolean validateVitalSignsSectionEntriesOptionalTitle(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_VITAL_SIGNS_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_VITAL_SIGNS_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -536,7 +536,7 @@ public static EList<VitalSignsOrganizer> getVitalSignsOrganizers(
 		@SuppressWarnings("unchecked")
 		Collection<VitalSignsOrganizer> result = (Collection<VitalSignsOrganizer>) query.evaluate(
 			vitalSignsSectionEntriesOptional);
-		return new BasicEList.UnmodifiableEList<VitalSignsOrganizer>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 } // VitalSignsSectionEntriesOptionalOperations
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsSectionOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsSectionOperations.java
index 2c5e43ebee..cffd1353c8 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsSectionOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/VitalSignsSectionOperations.java
@@ -86,7 +86,7 @@ protected VitalSignsSectionOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_TEXT__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,7 +151,7 @@ public static boolean validateVitalSignsSectionText(VitalSignsSection vitalSigns
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_VITAL_SIGNS_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_VITAL_SIGNS_ORGANIZER__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -244,7 +244,7 @@ public static EList<VitalSignsOrganizer> getConsolVitalSignsOrganizers(VitalSign
 		OCL.Query query = EOCL_ENV.get().createQuery(GET_CONSOL_VITAL_SIGNS_ORGANIZERS__EOCL_QRY);
 		@SuppressWarnings("unchecked")
 		Collection<VitalSignsOrganizer> result = (Collection<VitalSignsOrganizer>) query.evaluate(vitalSignsSection);
-		return new BasicEList.UnmodifiableEList<VitalSignsOrganizer>(result.size(), result.toArray());
+		return new BasicEList.UnmodifiableEList<>(result.size(), result.toArray());
 	}
 
 	/**
@@ -266,7 +266,7 @@ public static EList<VitalSignsOrganizer> getConsolVitalSignsOrganizers(VitalSign
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -333,7 +333,7 @@ public static boolean validateVitalSignsSectionEntriesOptionalTemplateId(VitalSi
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -383,7 +383,7 @@ public static boolean validateVitalSignsSectionEntriesOptionalCodeP(VitalSignsSe
 					"org.openhealthtools.mdht.uml.cda.consol.VitalSignsSectionEntriesOptionalCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put(
 						"org.openhealthtools.mdht.uml.cda.consol.VitalSignsSectionEntriesOptionalCodeP", passToken);
 				}
@@ -416,7 +416,7 @@ public static boolean validateVitalSignsSectionEntriesOptionalCodeP(VitalSignsSe
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -491,7 +491,7 @@ public static boolean validateVitalSignsSectionEntriesOptionalCode(VitalSignsSec
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_VITAL_SIGNS_SECTION_ENTRIES_OPTIONAL_TITLE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/WoundCharacteristicOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/WoundCharacteristicOperations.java
index a7fd28e520..b884a4c022 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/WoundCharacteristicOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/WoundCharacteristicOperations.java
@@ -78,7 +78,7 @@ protected WoundCharacteristicOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -144,7 +144,7 @@ public static boolean validateWoundCharacteristicTemplateId(WoundCharacteristic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -210,7 +210,7 @@ public static boolean validateWoundCharacteristicClassCode(WoundCharacteristic w
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -275,7 +275,7 @@ public static boolean validateWoundCharacteristicMoodCode(WoundCharacteristic wo
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -340,7 +340,7 @@ public static boolean validateWoundCharacteristicId(WoundCharacteristic woundCha
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -388,7 +388,7 @@ public static boolean validateWoundCharacteristicCodeP(WoundCharacteristic wound
 					"org.openhealthtools.mdht.uml.cda.consol.WoundCharacteristicCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.WoundCharacteristicCodeP", passToken);
 				}
 				passToken.add(woundCharacteristic);
@@ -420,7 +420,7 @@ public static boolean validateWoundCharacteristicCodeP(WoundCharacteristic wound
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -494,7 +494,7 @@ public static boolean validateWoundCharacteristicCode(WoundCharacteristic woundC
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -560,7 +560,7 @@ public static boolean validateWoundCharacteristicStatusCode(WoundCharacteristic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -627,7 +627,7 @@ public static boolean validateWoundCharacteristicStatusCodeP(WoundCharacteristic
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -696,7 +696,7 @@ public static boolean validateWoundCharacteristicEffectiveTime(WoundCharacterist
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -761,7 +761,7 @@ public static boolean validateWoundCharacteristicValue(WoundCharacteristic wound
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_CHARACTERISTIC_VALUE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/WoundMeasurementObservationOperations.java b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/WoundMeasurementObservationOperations.java
index 24ad184729..141a798da8 100644
--- a/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/WoundMeasurementObservationOperations.java
+++ b/generated/org.openhealthtools.mdht.uml.cda.consol2/src/org/openhealthtools/mdht/uml/cda/consol/operations/WoundMeasurementObservationOperations.java
@@ -81,7 +81,7 @@ protected WoundMeasurementObservationOperations() {
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_TEMPLATE_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -150,7 +150,7 @@ public static boolean validateWoundMeasurementObservationTemplateId(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_CLASS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -219,7 +219,7 @@ public static boolean validateWoundMeasurementObservationClassCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_MOOD_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -288,7 +288,7 @@ public static boolean validateWoundMeasurementObservationMoodCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_ID__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -354,7 +354,7 @@ public static boolean validateWoundMeasurementObservationId(WoundMeasurementObse
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -405,7 +405,7 @@ public static boolean validateWoundMeasurementObservationCodeP(
 					"org.openhealthtools.mdht.uml.cda.consol.WoundMeasurementObservationCodeP");
 				if (passToken == null) {
 					// anticipate a reasonably healthy model
-					passToken = new java.util.ArrayList<Object>(3);
+					passToken = new java.util.ArrayList<>(3);
 					context.put("org.openhealthtools.mdht.uml.cda.consol.WoundMeasurementObservationCodeP", passToken);
 				}
 				passToken.add(woundMeasurementObservation);
@@ -437,7 +437,7 @@ public static boolean validateWoundMeasurementObservationCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -514,7 +514,7 @@ public static boolean validateWoundMeasurementObservationCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_STATUS_CODE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -583,7 +583,7 @@ public static boolean validateWoundMeasurementObservationStatusCode(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_STATUS_CODE_P__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -652,7 +652,7 @@ public static boolean validateWoundMeasurementObservationStatusCodeP(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_EFFECTIVE_TIME__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -722,7 +722,7 @@ public static boolean validateWoundMeasurementObservationEffectiveTime(
 	 * @ordered
 	 */
 
-	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<Constraint>();
+	protected static ThreadLocal<Constraint> VALIDATE_WOUND_MEASUREMENT_OBSERVATION_VALUE__DIAGNOSTIC_CHAIN_MAP__EOCL_INV = new ThreadLocal<>();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/models/org.openhealthtools.mdht.uml.cda.consol2.model/model/.controlled/consol-UDI.uml b/models/org.openhealthtools.mdht.uml.cda.consol2.model/model/.controlled/consol-UDI.uml
index a42cd19fa1..f688a06463 100644
--- a/models/org.openhealthtools.mdht.uml.cda.consol2.model/model/.controlled/consol-UDI.uml
+++ b/models/org.openhealthtools.mdht.uml.cda.consol2.model/model/.controlled/consol-UDI.uml
@@ -368,7 +368,7 @@
       <redefinedProperty href="pathmap://CDA_MODEL/cda.uml#_WEYp4Eo8Ed6c3qsAxlFHaQ"/>
     </ownedAttribute>
     <ownedAttribute xmi:id="_aduUIS0AEeuxZ80rBBFFIQ" name="value" visibility="private" aggregation="composite">
-      <type xmi:type="uml:Class" href="pathmap://DATATYPES_MODEL/datatypes.uml#_EaTNsDxaEd6JwqSGecoePg"/>
+      <type xmi:type="uml:Class" href="pathmap://DATATYPES_MODEL/datatypes.uml#_CowXkDxaEd6JwqSGecoePg"/>
       <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_osECIC0AEeuxZ80rBBFFIQ" value="1"/>
       <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_osDbEC0AEeuxZ80rBBFFIQ" value="1"/>
       <subsettedProperty href="pathmap://CDA_MODEL/cda.uml#_tRpv0Eo-Ed6c3qsAxlFHaQ"/>
diff --git a/tests/org.openhealthtools.mdht.uml.cda.consol2.tests/src/test/java/org/openhealthtools/mdht/uml/cda/consol/tests/LotOrBatchNumberObservationTest.java b/tests/org.openhealthtools.mdht.uml.cda.consol2.tests/src/test/java/org/openhealthtools/mdht/uml/cda/consol/tests/LotOrBatchNumberObservationTest.java
index 0594a7620c..856780c530 100644
--- a/tests/org.openhealthtools.mdht.uml.cda.consol2.tests/src/test/java/org/openhealthtools/mdht/uml/cda/consol/tests/LotOrBatchNumberObservationTest.java
+++ b/tests/org.openhealthtools.mdht.uml.cda.consol2.tests/src/test/java/org/openhealthtools/mdht/uml/cda/consol/tests/LotOrBatchNumberObservationTest.java
@@ -172,7 +172,7 @@ protected void updateToFail(LotOrBatchNumberObservation target) {
 			@Override
 			protected void updateToPass(LotOrBatchNumberObservation target) {
 				target.init();
-				target.getValues().add(DatatypesFactory.eINSTANCE.createST("LOTNUMBER"));
+				target.getValues().add(DatatypesFactory.eINSTANCE.createED("LOTNUMBER"));
 
 			}
 
diff --git a/tests/org.openhealthtools.mdht.uml.cda.consol2.tests/src/test/java/org/openhealthtools/mdht/uml/cda/consol/tests/ResultObservation2Test.java b/tests/org.openhealthtools.mdht.uml.cda.consol2.tests/src/test/java/org/openhealthtools/mdht/uml/cda/consol/tests/ResultObservation2Test.java
index 653efe9ca4..3e30d06a3b 100644
--- a/tests/org.openhealthtools.mdht.uml.cda.consol2.tests/src/test/java/org/openhealthtools/mdht/uml/cda/consol/tests/ResultObservation2Test.java
+++ b/tests/org.openhealthtools.mdht.uml.cda.consol2.tests/src/test/java/org/openhealthtools/mdht/uml/cda/consol/tests/ResultObservation2Test.java
@@ -262,7 +262,7 @@ protected void updateToFail(ResultObservation2 target) {
 			@Override
 			protected void updateToPass(ResultObservation2 target) {
 				target.getReferenceRanges().get(0).getObservationRange().setValue(
-					DatatypesFactory.eINSTANCE.createCD());
+					DatatypesFactory.eINSTANCE.createIVL_REAL());
 			}
 
 			@Override